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

luci-app-adblock: sync with adblock 3.5.3

Browse source 
* small fixes & cosmetics

Signed-off-by: Dirk Brenken <dev@brenken.org>
This commit is contained in:
Dirk Brenken 2018-06-07 21:14:06 +02:00
parent 7be3f0400c
commit a561d3045c
3 changed files with 16 additions and 10 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&#160;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("Categories")) cat = bl:option(DynamicList, "adb_src_cat", translate("Archive&#160;Categories"))
cat.datatype = "uciname" cat.datatype = "uciname"
cat.optional = true cat.optional = true

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

@ -22,25 +22,31 @@ end
-%> -%>
<style type="text/css"> <style type="text/css">
table.cbi-section-table th, .table.cbi-section-table .th,
table.cbi-section-table td, .table.cbi-section-table .td,
.cbi-section-table-cell, .cbi-section-table-cell,
.cbi-section-table-row, .cbi-section-table-row
.cbi-input-text
{ {
text-align:left; text-align:left;
vertical-align:top; vertical-align:top;
margin-right:auto; margin-right:auto;
margin-left:0px; margin-left:0px;
padding-left:2px;
line-height:20px;
height:20px;
}
.table.cbi-section-table input
{
width:7em;
} }
.cbi-input-text .cbi-input-text
{ {
text-align:left;
padding-left:2px;
outline:none; outline:none;
box-shadow:none; box-shadow:none;
background:transparent; background:transparent;
padding-left:2px; height:20px;
line-height:25px;
height:25px;
width:10em; width:10em;
} }
</style> </style>

2
applications/luci-app-adblock/luasrc/view/adblock/query.htm
View file

@ -35,7 +35,7 @@ This is free software, licensed under the Apache License, Version 2.0
else else
{ {
input.style.display = 'none'; input.style.display = 'none';
output.innerHTML = '<span class="error"><%:Invalid domain specified!%></span>'; output.innerHTML = '<span class="error"><%:Blocklist not found!%></span>';
} }
} }
); );