modules/admin-full: Rewrote route configuration page

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

diff --git a/libs/cbi/luasrc/view/cbi/tblsection.htm b/libs/cbi/luasrc/view/cbi/tblsection.htm
index cfee09f..d03d6f4 100644 (file)
--- a/libs/cbi/luasrc/view/cbi/tblsection.htm
+++ b/libs/cbi/luasrc/view/cbi/tblsection.htm
@@ -21,8 +21,10 @@ end
 -%>
 
 <!-- tblsection -->
-<div class="cbi-section" id="cbi-<%=self.config%>-<%=self.sectiontype%>">
-       <h2><%=self.title%></h2>
+<fieldset class="cbi-section" id="cbi-<%=self.config%>-<%=self.sectiontype%>">
+       <% if self.title and #self.title > 0 then -%>
+               <legend><%=self.title%></legend>
+       <%- end %>
        <div class="cbi-section-descr"><%=self.description%></div>
        <div class="cbi-section-node">
                <%- local count = 0 -%>
@@ -31,20 +33,24 @@ end
                        <%- if not self.anonymous then -%>
                                <th>&nbsp;</th>
                        <%- end -%>
-                       <%- for i, k in pairs(self.children) do -%>
-                               <th class="cbi-section-table-cell"><%=k.title%></th>
-                       <%- count = count + 1; end; if self.extedit or self.addremove then -%>
+                       <%- for i, k in pairs(self.children) do if not k.optional then -%>
+                               <th class="cbi-section-table-cell">
+                               <%- if k.titleref then -%><a title="<%=self.titledesc or translate('cbi_gorel')%>" class="cbi-title-ref" href="<%=k.titleref%>"><%- end -%>
+                                       <%-=k.title-%>
+                               <%- if k.titleref then -%></a><%- end -%>
+                               </th>
+                       <%- count = count + 1; end; end; if self.extedit or self.addremove then -%>
                                <th class="cbi-section-table-cell">&nbsp;</th>
                        <%- count = count + 1; end -%>
                        </tr>
                        <tr class="cbi-section-table-descr">
                        <%- if not self.anonymous then -%>
-                               <th>&nbsp;</th>
+                               <th></th>
                        <%- end -%>
-                       <%- for i, k in pairs(self.children) do -%>
+                       <%- for i, k in pairs(self.children) do if not k.optional then -%>
                                <th class="cbi-section-table-cell"><%=k.description%></th>
-                       <%- end; if self.extedit or self.addremove then -%>
-                               <th class="cbi-section-table-cell">&nbsp;</th>
+                       <%- end; end; if self.extedit or self.addremove then -%>
+                               <th class="cbi-section-table-cell"></th>
                        <%- end -%>
                        </tr>
                        <%- local isempty = true
@@ -53,15 +59,24 @@ end
                                        isempty = false
                                        scope = { valueheader = "cbi/cell_valueheader", valuefooter = "cbi/cell_valuefooter" }
                        -%>
-                       <tr class="cbi-section-table-row<% if self.extedit then %> cbi-rowstyle-<%=rowstyle()%><% end %>" id="cbi-<%=self.config%>-<%=section%>">
+                       <tr class="cbi-section-table-row<% if self.extedit or self.rowcolors then %> cbi-rowstyle-<%=rowstyle()%><% end %>" id="cbi-<%=self.config%>-<%=section%>">
                                <% if not self.anonymous then -%>
                                        <th><h3><%=k%></h3></th>
                                <%- end %>
-                               <%-+cbi/ucisection-%>
+
+
+                               <%-
+                                       for k, node in ipairs(self.children) do
+                                               if not node.optional then
+                                                       node:render(section, scope or {})
+                                               end
+                                       end
+                               -%>
+
                                <%- if self.extedit or self.addremove then -%>
                                        <td class="cbi-section-table-cell">
                                                <%- if self.extedit then -%>
-                                                       <a href="<%=self.extedit:format(section)%>"><img style="border: none" src="<%=resource%>/cbi/edit.gif" alt="<%:edit%>" /></a>
+                                                       <a href="<%=self.extedit:format(section)%>" title="<%:edit%>"><img style="border: none" src="<%=resource%>/cbi/edit.gif" alt="<%:edit%>" /></a>
                                                <%- end; if self.addremove then %>
                                                        <input type="image" value="<%:cbi_del%>" name="cbi.rts.<%=self.config%>.<%=k%>" alt="<%:cbi_del%>" title="<%:cbi_del%>" src="<%=resource%>/cbi/remove.gif" />
                                                <%- end -%>
@@ -77,7 +92,6 @@ end
                        <%- end -%>
                </table>
                        <%- if self.addremove then -%>
-                       <br />
                        <div class="cbi-section-table-row">
                                <td colspan="<%=count%>" class="cbi-section-table-optionals">
                                        <div class="cbi-section-create">
@@ -96,5 +110,5 @@ end
                        </div>
                        <%- end -%>
        </div>
-</div>
+</fieldset>
 <!-- /tblsection -->