libs/cbi: auto-hide apply messages and make title and description optional for Map...

[project/luci.git] / libs / cbi / luasrc / view / cbi / simpleform.htm

diff --git a/libs/cbi/luasrc/view/cbi/simpleform.htm b/libs/cbi/luasrc/view/cbi/simpleform.htm
index e167a6e..9c40f82 100644 (file)
--- a/libs/cbi/luasrc/view/cbi/simpleform.htm
+++ b/libs/cbi/luasrc/view/cbi/simpleform.htm
@@ -20,8 +20,8 @@ $Id$
        </div>
 <% end %>
        <div class="cbi-map" id="cbi-<%=self.config%>">
-               <h2><a id="content" name="content"><%=self.title%></a></h2>
-               <div class="cbi-map-descr"><%=self.description%></div>
+               <% if self.title and #self.title > 0 then %><h2><a id="content" name="content"><%=self.title%></a></h2><% end %>
+               <% if self.description and #self.description > 0 then %><div class="cbi-map-descr"><%=self.description%></div><% end %>
                <% self:render_children() %>
                <br />
        </div>
@@ -33,14 +33,31 @@ $Id$
 <%- end %>     
 <% if not self.embedded then %>
        <div>
+<%-
+       if type(self.hidden) == "table" then
+               for k, v in pairs(self.hidden) do
+-%>
+       <input type="hidden" id="<%=k%>" name="<%=k%>" value="<%=pcdata(v)%>" />
+<%-
+               end
+       end
+%>
+<%- if self.flow and self.flow.skip then %>
+       <input class="cbi-button cbi-button-skip" type="submit" name="cbi.skip" value="<%:Skip%>" />
+<% end %>
 <%- if self.submit ~= false then %>
-               <input class="cbi-button-save" type="submit" value="
-       <%- if not self.submit then -%><%-:submit-%><%-else-%><%=self.submit%><%end-%>
+       <input class="cbi-button-save" type="submit" value="
+               <%- if not self.submit then -%><%-:Submit-%><%-else-%><%=self.submit%><%end-%>
        " />
 <% end %>
 <%- if self.reset ~= false then %>
-               <input class="cbi-button-reset" type="reset" value="
-       <%- if not self.reset then -%><%-:reset-%><%-else-%><%=self.reset%><%end-%>
+       <input class="cbi-button-reset" type="reset" value="
+               <%- if not self.reset then -%><%-:Reset-%><%-else-%><%=self.reset%><%end-%>
+       " />
+<% end %>
+<%- if self.cancel ~= false and self.on_cancel then %>
+       <input class="cbi-button-reset" type="submit" name="cbi.cancel" value="
+               <%- if not self.cancel then -%><%-:Cancel-%><%-else-%><%=self.cancel%><%end-%>
        " />
 <% end %>
                <script type="text/javascript">cbi_d_update();</script>