diff options
| author | Dirk Brenken <dev@brenken.org> | 2018-05-14 22:09:31 +0200 |
|---|---|---|
| committer | Dirk Brenken <dev@brenken.org> | 2018-05-15 08:00:02 +0200 |
| commit | 55f251b01f22a8e5179f0f6767d1be44c745239e (patch) | |
| tree | 0c96d48cd9ceeb3e293c8c2604a10d9260da08d3 /applications/luci-app-adblock/luasrc/view | |
| parent | 3aae6ce82ef385d2c77a2c2073d231797bef4c13 (diff) | |
luci-app-adblock: sync with adblock 3.5.2
* archive sub-categories (shalla & ut_capitole) are now configurable
via LuCI CBI template
* small bugfixes & enhancements
Signed-off-by: Dirk Brenken <dev@brenken.org>
Diffstat (limited to 'applications/luci-app-adblock/luasrc/view')
| -rw-r--r-- | applications/luci-app-adblock/luasrc/view/adblock/blocklist.htm | 35 |
1 files changed, 21 insertions, 14 deletions
diff --git a/applications/luci-app-adblock/luasrc/view/adblock/blocklist.htm b/applications/luci-app-adblock/luasrc/view/adblock/blocklist.htm index aae64075ff..b4b62db5f4 100644 --- a/applications/luci-app-adblock/luasrc/view/adblock/blocklist.htm +++ b/applications/luci-app-adblock/luasrc/view/adblock/blocklist.htm @@ -22,15 +22,27 @@ end -%> <style type="text/css"> -<!-- +table.cbi-section-table th, +table.cbi-section-table td, .cbi-section-table-cell, -.cbi-section-table-row +.cbi-section-table-row, +.cbi-input-text { text-align:left; + vertical-align:top; margin-right:auto; margin-left:0px; } ---> +.cbi-input-text +{ + outline:none; + box-shadow:none; + background:transparent; + padding-left:2px; + line-height:25px; + height:25px; + width:10em; +} </style> <fieldset class="cbi-section" id="cbi-<%=self.config%>-<%=self.sectiontype%>"> @@ -39,7 +51,6 @@ end <%- end %> <div class="cbi-section-descr"><%=self.description%></div> <div class="cbi-section-node"> - <%- local count = 0 -%> <table class="cbi-section-table"> <tr class="cbi-section-table-titles"> <%- if self.sectionhead then -%> @@ -51,7 +62,7 @@ end <th class="cbi-section-table-cell"<%=width(k)%>> <%-=k.title-%> </th> - <%- count = count + 1; end; -%> + <%- end -%> </tr> <%- local isempty = true for i, k in ipairs(self:cfgsections()) do @@ -60,19 +71,15 @@ end scope = { valueheader = "cbi/cell_valueheader", valuefooter = "cbi/cell_valuefooter" } -%> <tr class="cbi-section-table-row" id="cbi-<%=self.config%>-<%=section%>"> - <th><%=k%></th> + <th><%=k%></th> <%- for k, node in ipairs(self.children) do - if not node.optional then - node:render(section, scope or {}) - end + node:render(section, scope or {}) end + if not scope.cbid:match("adb_src_cat") then -%> - </tr> - <%- end -%> - <%- if isempty then -%> - <tr class="cbi-section-table-row"> - <td colspan="<%=count%>"><em><br /><%:This section contains no values yet%></em></td> + <td class="cbi-value-field"> </td> + <%- end -%> </tr> <%- end -%> </table> |