Difuse/luci
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge pull request #1867 from dibdot/adblock

Browse source 
luci-app-adblock: partly revert last commit
This commit is contained in:
Dirk Brenken 2018-06-08 09:45:57 +02:00 committed by GitHub
commit 81c66069c8
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 6 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua
View file

@ -171,7 +171,7 @@ bl.template = "adblock/blocklist"
name = bl:option(Flag, "enabled", translate("Enabled")) name = bl:option(Flag, "enabled", translate("Enabled"))
name.rmempty = false 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) function ssl.cfgvalue(self, section)
local source = self.map:get(section, "adb_src") local source = self.map:get(section, "adb_src")
if source and source:match("https://") then if source and source:match("https://") then
@ -183,7 +183,7 @@ end
des = bl:option(DummyValue, "adb_src_desc", translate("Description")) des = bl:option(DummyValue, "adb_src_desc", translate("Description"))
cat = bl:option(DynamicList, "adb_src_cat", translate("Archive Categories")) cat = bl:option(DynamicList, "adb_src_cat", translate("Archive Categories"))
cat.datatype = "uciname" cat.datatype = "uciname"
cat.optional = true cat.optional = true

4
applications/luci-app-adblock/luasrc/view/adblock/blocklist.htm
View file

@ -35,6 +35,10 @@ end
line-height:20px; line-height:20px;
height:20px; height:20px;
} }
.table.cbi-section-table .th
{
white-space:nowrap;
}
.table.cbi-section-table input .table.cbi-section-table input
{ {
width:7em; width:7em;