summaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorDirk Brenken <dev@brenken.org>2018-06-08 09:45:57 +0200
committerGitHub <noreply@github.com>2018-06-08 09:45:57 +0200
commit81c66069c80dc4b9d899769fb194116b3fff3eaf (patch)
treeb183432c1961313b41c0a413622405c3ac3618fb
parent74be6f39748a4f441e54e6bdfc768306a3c8b91f (diff)
parent45c2059c15b8f4c524eea736a6ef7f41fbf77092 (diff)
Merge pull request #1867 from dibdot/adblock
luci-app-adblock: partly revert last commit
-rw-r--r--applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua4
-rw-r--r--applications/luci-app-adblock/luasrc/view/adblock/blocklist.htm4
2 files changed, 6 insertions, 2 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 353aa6ac9..da783e336 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&#160;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("Archive&#160;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 e75c89b82..81622e9bc 100644
--- a/applications/luci-app-adblock/luasrc/view/adblock/blocklist.htm
+++ b/applications/luci-app-adblock/luasrc/view/adblock/blocklist.htm
@@ -35,6 +35,10 @@ end
line-height:20px;
height:20px;
}
+.table.cbi-section-table .th
+{
+ white-space:nowrap;
+}
.table.cbi-section-table input
{
width:7em;