diff options
Diffstat (limited to 'applications/luci-app-adblock/htdocs')
| -rw-r--r-- | applications/luci-app-adblock/htdocs/luci-static/resources/view/adblock/dnsreport.js | 12 | ||||
| -rw-r--r-- | applications/luci-app-adblock/htdocs/luci-static/resources/view/adblock/overview.js | 25 |
2 files changed, 29 insertions, 8 deletions
diff --git a/applications/luci-app-adblock/htdocs/luci-static/resources/view/adblock/dnsreport.js b/applications/luci-app-adblock/htdocs/luci-static/resources/view/adblock/dnsreport.js index b85abd0238..fdd358038c 100644 --- a/applications/luci-app-adblock/htdocs/luci-static/resources/view/adblock/dnsreport.js +++ b/applications/luci-app-adblock/htdocs/luci-static/resources/view/adblock/dnsreport.js @@ -228,13 +228,17 @@ return view.extend({ b_cnt = content.data.top_domains[i].count; } if (content.data.top_domains[i]) { - b_addr = '<a href="https://duckduckgo.com/?q=' + encodeURIComponent(content.data.top_domains[i].address) + '&k1=-1&km=l&kh=1" target="_blank" title="Search this domain">' + content.data.top_domains[i].address + '</a>'; + //[!CDATA[ + b_addr = '<a href="https://duckduckgo.com/?q=' + encodeURIComponent(content.data.top_domains[i].address) + '&k1=-1&km=l&kh=1" target="_blank" title="Search this domain">' + content.data.top_domains[i].address + '</a>'; + //]]> } if (content.data.top_blocked[i]) { c_cnt = content.data.top_blocked[i].count; } if (content.data.top_blocked[i]) { - c_addr = '<a href="https://duckduckgo.com/?q=' + encodeURIComponent(content.data.top_blocked[i].address) + '&k1=-1&km=l&kh=1" target="_blank" title="Search this domain">' + content.data.top_blocked[i].address + '</a>'; + //[!CDATA[ + c_addr = '<a href="https://duckduckgo.com/?q=' + encodeURIComponent(content.data.top_blocked[i].address) + '&k1=-1&km=l&kh=1" target="_blank" title="Search this domain">' + content.data.top_blocked[i].address + '</a>'; + //]]> } rows_top.push([ a_cnt, @@ -285,7 +289,9 @@ return view.extend({ content.data.requests[i].date, content.data.requests[i].time, content.data.requests[i].client, - '<a href="https://duckduckgo.com/?q=' + encodeURIComponent(content.data.requests[i].domain) + '&k1=-1&km=l&kh=1" target="_blank" title="Search this domain">' + content.data.requests[i].domain + '</a>', + //[!CDATA[ + '<a href="https://duckduckgo.com/?q=' + encodeURIComponent(content.data.requests[i].domain) + '&k1=-1&km=l&kh=1" target="_blank" title="Search this domain">' + content.data.requests[i].domain + '</a>', + //]]> content.data.requests[i].rc, button ]); diff --git a/applications/luci-app-adblock/htdocs/luci-static/resources/view/adblock/overview.js b/applications/luci-app-adblock/htdocs/luci-static/resources/view/adblock/overview.js index 565ae54bfb..146f24a57c 100644 --- a/applications/luci-app-adblock/htdocs/luci-static/resources/view/adblock/overview.js +++ b/applications/luci-app-adblock/htdocs/luci-static/resources/view/adblock/overview.js @@ -290,12 +290,25 @@ return view.extend({ o.nocreate = true; o.rmempty = true; - o = s.taboption('general', form.Flag, 'adb_forcedns', _('Force Local DNS'), _('Redirect all DNS queries from \'lan\' zone to the local DNS resolver, applies to UDP and TCP protocol.')); + o = s.taboption('general', form.Flag, 'adb_forcedns', _('Force Local DNS'), _('Redirect all DNS queries from specified zones to the local DNS resolver, applies to UDP and TCP protocol.')); o.rmempty = false; - o = s.taboption('general', form.Value, 'adb_portlist', _('Local DNS Ports'), _('Space separated list of DNS-related firewall ports which should be forced locally.')); + o = s.taboption('general', widgets.ZoneSelect, 'adb_zonelist', _('Forced Zones'), _('Firewall source zones that should be forced locally.')); o.depends('adb_forcedns', '1'); - o.placeholder = '53 853 5353'; + o.unspecified = true; + o.multiple = true; + o.nocreate = true; + o.rmempty = true; + + o = s.taboption('general', form.DynamicList, 'adb_portlist', _('Forced Ports'), _('Firewall ports that should be forced locally.')); + o.depends('adb_forcedns', '1'); + o.unspecified = true; + o.multiple = true; + o.nocreate = false; + o.datatype = 'port'; + o.value('53'); + o.value('853'); + o.value('5353'); o.rmempty = true; o = s.taboption('general', form.Flag, 'adb_safesearch', _('Enable SafeSearch'), _('Enforcing SafeSearch for google, bing, duckduckgo, yandex, youtube and pixabay.')); @@ -368,11 +381,12 @@ return view.extend({ o.rmempty = true; o = s.taboption('additional', form.ListValue, 'adb_fetchutil', _('Download Utility'), _('List of supported and fully pre-configured download utilities.')); + o.value('', _('- unspecified -')); o.value('uclient-fetch'); o.value('wget'); o.value('curl'); o.value('aria2c'); - o.rmempty = false; + o.rmempty = true; o = s.taboption('additional', form.Value, 'adb_fetchparm', _('Download Parameters'), _('Special config options for the selected download utility.')) o.rmempty = true; @@ -382,12 +396,13 @@ return view.extend({ */ o = s.taboption('adv_dns', form.ListValue, 'adb_dns', _('DNS Backend'), _('List of supported DNS backends with their default list directory. \ To overwrite the default path use the \'DNS Directory\' option.')); + o.value('', _('- unspecified -')); o.value('dnsmasq', _('dnsmasq (/tmp/dnsmasq.d)')); o.value('unbound', _('unbound (/var/lib/unbound)')); o.value('named', _('named (/var/lib/bind)')); o.value('kresd', _('kresd (/etc/kresd)')); o.value('raw', _('raw (/tmp)')); - o.rmempty = false; + o.rmempty = true; o = s.taboption('adv_dns', form.Value, 'adb_dnsdir', _('DNS Directory'), _('Target directory for the generated blocklist \'adb_list.overall\'.')); o.placeholder = '/tmp'; |