luci-app-adblock: sync with adblock 3.5.3

* small fixes & cosmetics

Signed-off-by: Dirk Brenken <dev@brenken.org>

diff --git a/applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua b/applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua
index 3f39622920a3e6013d63f34b9785302f3e89d341..353aa6ac92535fbc31636c12edc5dbb87bc0d674 100644 (file)
--- a/applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua
+++ b/applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua
@@ -171,7 +171,7 @@ bl.template = "adblock/blocklist"
 name = bl:option(Flag, "enabled", translate("Enabled"))
 name.rmempty = false
 
-ssl = bl:option(DummyValue, "adb_src", translate("SSL req."))
+ssl = bl:option(DummyValue, "adb_src", translate("SSL req."))
 function ssl.cfgvalue(self, section)
        local source = self.map:get(section, "adb_src")
        if source and source:match("https://") then
@@ -183,7 +183,7 @@ end
 
 des = bl:option(DummyValue, "adb_src_desc", translate("Description"))
 
-cat = bl:option(DynamicList, "adb_src_cat", translate("Categories"))
+cat = bl:option(DynamicList, "adb_src_cat", translate("Archive Categories"))
 cat.datatype = "uciname"
 cat.optional = true
 

diff --git a/applications/luci-app-adblock/luasrc/view/adblock/blocklist.htm b/applications/luci-app-adblock/luasrc/view/adblock/blocklist.htm
index 424a72f6fd3995e0606c7ab1babe14d7112eb79d..e75c89b82053a3a82bb85143fd8338b9cbf322f4 100644 (file)
--- a/applications/luci-app-adblock/luasrc/view/adblock/blocklist.htm
+++ b/applications/luci-app-adblock/luasrc/view/adblock/blocklist.htm
@@ -22,25 +22,31 @@ end
 -%>
 
 <style type="text/css">
-table.cbi-section-table th,
-table.cbi-section-table td,
+.table.cbi-section-table .th,
+.table.cbi-section-table .td,
 .cbi-section-table-cell,
-.cbi-section-table-row,
-.cbi-input-text
+.cbi-section-table-row
 {
        text-align:left;
        vertical-align:top;
        margin-right:auto;
        margin-left:0px;
+       padding-left:2px;
+       line-height:20px;
+       height:20px;
+}
+.table.cbi-section-table input
+{
+       width:7em;
 }
 .cbi-input-text
 {
+       text-align:left;
+       padding-left:2px;
        outline:none;
        box-shadow:none;
        background:transparent;
-       padding-left:2px;
-       line-height:25px;
-       height:25px;
+       height:20px;
        width:10em;
 }
 </style>

diff --git a/applications/luci-app-adblock/luasrc/view/adblock/query.htm b/applications/luci-app-adblock/luasrc/view/adblock/query.htm
index 8bbc92664d14e7309e776d242fdccebc6527d36e..8bbed3a53ee93db7063c1715ae72d9c1436cda61 100644 (file)
--- a/applications/luci-app-adblock/luasrc/view/adblock/query.htm
+++ b/applications/luci-app-adblock/luasrc/view/adblock/query.htm
@@ -35,7 +35,7 @@ This is free software, licensed under the Apache License, Version 2.0
                                        else
                                        {
                                                input.style.display = 'none';
-                                               output.innerHTML = '<span class="error"><%:Invalid domain specified!%></span>';
+                                               output.innerHTML = '<span class="error"><%:Blocklist not found!%></span>';
                                        }
                                }
                        );