luci-base: fix colspans calculation in tblsection 1697/head
authorFlorian Eckert <fe@dev.tdt.de>
Wed, 14 Mar 2018 15:03:55 +0000 (16:03 +0100)
committerFlorian Eckert <fe@dev.tdt.de>
Tue, 27 Mar 2018 08:39:55 +0000 (10:39 +0200)
Signed-off-by: Florian Eckert <fe@dev.tdt.de>
modules/luci-base/luasrc/view/cbi/tblsection.htm

index 26d13f9..3cb8756 100644 (file)
@@ -35,7 +35,7 @@ end
                                <%- else -%>
                                        <th>&#160;</th>
                                <%- end -%>
                                <%- else -%>
                                        <th>&#160;</th>
                                <%- end -%>
-                       <%- end -%>
+                       <%- count = count +1; end -%>
                        <%- for i, k in pairs(self.children) do if not k.optional then -%>
                                <th class="cbi-section-table-cell"<%=width(k)%>>
                                <%- if k.titleref then -%><a title="<%=self.titledesc or translate('Go to relevant configuration page')%>" class="cbi-title-ref" href="<%=k.titleref%>"><%- end -%>
                        <%- for i, k in pairs(self.children) do if not k.optional then -%>
                                <th class="cbi-section-table-cell"<%=width(k)%>>
                                <%- if k.titleref then -%><a title="<%=self.titledesc or translate('Go to relevant configuration page')%>" class="cbi-title-ref" href="<%=k.titleref%>"><%- end -%>
@@ -44,7 +44,7 @@ end
                                </th>
                        <%- count = count + 1; end; end; if self.sortable then -%>
                                <th class="cbi-section-table-cell"><%:Sort%></th>
                                </th>
                        <%- count = count + 1; end; end; if self.sortable then -%>
                                <th class="cbi-section-table-cell"><%:Sort%></th>
-                       <%- end; if self.extedit or self.addremove then -%>
+                       <%- count = count + 1; end; if self.extedit or self.addremove then -%>
                                <th class="cbi-section-table-cell">&#160;</th>
                        <%- count = count + 1; end -%>
                        </tr>
                                <th class="cbi-section-table-cell">&#160;</th>
                        <%- count = count + 1; end -%>
                        </tr>