Merge pageactions

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

diff --git a/libs/cbi/luasrc/view/cbi/nsection.htm b/libs/cbi/luasrc/view/cbi/nsection.htm
index a999e47..d766464 100644 (file)
--- a/libs/cbi/luasrc/view/cbi/nsection.htm
+++ b/libs/cbi/luasrc/view/cbi/nsection.htm
@@ -14,9 +14,13 @@ $Id$
 -%>
 
 <% if self:cfgvalue(self.section) then section = self.section %>
-       <div class="cbi-section" id="cbi-<%=self.config%>-<%=section%>">
-               <h2><%=self.title%></h2>
-               <div class="cbi-section-descr"><%=self.description%></div>
+       <fieldset class="cbi-section" id="cbi-<%=self.config%>-<%=section%>">
+               <% if self.title and #self.title > 0 then -%>
+                       <legend><%=self.title%></legend>
+               <%- end %>
+               <% if self.description and #self.description > 0 then -%>
+                       <div class="cbi-section-descr"><%=self.description%></div>
+               <%- end %>
                <% if self.addremove then -%>
                        <div class="cbi-section-remove right">
                                <input type="submit" name="cbi.rns.<%=self.config%>.<%=section%>" value="<%:cbi_del%>" />
@@ -26,11 +30,16 @@ $Id$
                        <%+cbi/ucisection%>
                </div>
                <br />
-       </div>
+       </fieldset>
 <% elseif self.addremove then %>
-       <div class="cbi-section" id="cbi-<%=self.config%>-<%=self.section%>">
-               <h2><%=self.title%></h2>
+       <% if self.template_addremove then include(self.template_addremove) else -%>
+       <fieldset class="cbi-section" id="cbi-<%=self.config%>-<%=self.section%>">
+               <% if self.title and #self.title > 0 then -%>
+                       <legend><%=self.title%></legend>
+               <%- end %>
                <div class="cbi-section-descr"><%=self.description%></div>
-               <input type="submit" name="cbi.cns.<%=self.config%>.<%=self.section%>" value="<%:cbi_add%>" />
-       </div>
+               <input type="submit" class="cbi-button-add" name="cbi.cns.<%=self.config%>.<%=self.section%>" value="<%:cbi_add%>" />
+       </fieldset>
+       <%- end %>
 <% end %>
+<!-- /nsection -->