Merge pull request #1863 from dibdot/adblock

luci-app-adblock: sync with adblock 3.5.3

3 files changed, 16 insertions, 10 deletions

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 3f3962292..353aa6ac9 100644
--- 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 424a72f6f..e75c89b82 100644
--- 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 8bbc92664..8bbed3a53 100644
--- 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>';
 					}
 				}
 			);