diff options
Diffstat (limited to 'applications/luci-app-simple-adblock/htdocs/luci-static/resources')
2 files changed, 15 insertions, 5 deletions
diff --git a/applications/luci-app-simple-adblock/htdocs/luci-static/resources/simple-adblock/status.js b/applications/luci-app-simple-adblock/htdocs/luci-static/resources/simple-adblock/status.js index 2bc49556c7..c57de633b4 100644 --- a/applications/luci-app-simple-adblock/htdocs/luci-static/resources/simple-adblock/status.js +++ b/applications/luci-app-simple-adblock/htdocs/luci-static/resources/simple-adblock/status.js @@ -170,14 +170,13 @@ var status = baseclass.extend({ var errorsDiv = []; if (reply.errors && reply.errors.length) { var errorTable = { - errorConfigValidationFail: _("Config (%s) validation failure!").format('/etc/config/' + pkg.Name), + errorConfigValidationFail: _("config (%s) validation failure!").format('/etc/config/' + pkg.Name), errorServiceDisabled: _("%s is currently disabled").format(pkg.Name), errorNoDnsmasqIpset: _("dnsmasq ipset support is enabled, but dnsmasq is either not installed or installed dnsmasq does not support ipset"), errorNoIpset: _("dnsmasq ipset support is enabled, but ipset is either not installed or installed ipset does not support '%s' type").format("hash:net"), errorNoDnsmasqNftset: _("dnsmasq nft set support is enabled, but dnsmasq is either not installed or installed dnsmasq does not support nft set"), errorNoNft: _("dnsmasq nft sets support is enabled, but nft is not installed"), - errorMkdirFail: _("Unable to create directory for '%s'"), - errorNoWanGateway: _("The %s service failed to discover WAN gateway!").format(pkg.Name), + errorNoWanGateway: _("the %s failed to discover WAN gateway").format(pkg.Name), errorOutputDirCreate: _("failed to create directory for %s file"), errorOutputFileCreate: _("failed to create '%s' file").format(outputFile), errorFailDNSReload: _("failed to restart/reload DNS resolver"), @@ -284,9 +283,9 @@ var status = baseclass.extend({ btn_stop.disabled = true; break; default: - btn_start.disabled = true; + btn_start.disabled = false; btn_action.disabled = true; - btn_stop.disabled = true; + btn_stop.disabled = false; btn_enable.disabled = true; btn_disable.disabled = true; break; diff --git a/applications/luci-app-simple-adblock/htdocs/luci-static/resources/view/simple-adblock/overview.js b/applications/luci-app-simple-adblock/htdocs/luci-static/resources/view/simple-adblock/overview.js index dd311cd497..8dd94cc1cf 100644 --- a/applications/luci-app-simple-adblock/htdocs/luci-static/resources/view/simple-adblock/overview.js +++ b/applications/luci-app-simple-adblock/htdocs/luci-static/resources/view/simple-adblock/overview.js @@ -136,6 +136,13 @@ return view.extend({ o.value("1", _("Store compressed cache")); o.default = ("0", _("Do not store compressed cache")); + o = s.taboption("tab_advanced", form.Value, "compressed_cache_dir", _("Directory for compressed cache file"), + _("Directory for compressed cache file of block-list in the persistent memory.")); + o.datatype = 'string'; + o.rmempty = true; + o.default = ("/etc"); + o.depends('compressed_cache', '1'); + o = s.taboption("tab_advanced", form.ListValue, "debug", _("Enable Debugging"), _("Enables debug output to /tmp/simple-adblock.log.")); o.value("0", _("Disable Debugging")); @@ -157,6 +164,10 @@ return view.extend({ _("URLs to lists of domains to be allowed.")); o.depends('dnsmasq_config_file_url', ''); o.addremove = true; + o = s.option(form.DynamicList, "blocked_adblockplus_url", _("Blocked AdBlockPlus-style URLs"), + _("URLs to lists of AdBlockPlus-style formatted domains to be blocked.")); + o.depends('dnsmasq_config_file_url', ''); + o.addremove = true; o = s.option(form.DynamicList, "blocked_domain", _("Blocked Domains"), _("Individual domains to be blocked.")); o.depends('dnsmasq_config_file_url', ''); |