diff options
Diffstat (limited to 'applications')
5 files changed, 9 insertions, 8 deletions
diff --git a/applications/luci-app-adblock/luasrc/controller/adblock.lua b/applications/luci-app-adblock/luasrc/controller/adblock.lua index 03b9fc20eb..efa99b5b89 100644 --- a/applications/luci-app-adblock/luasrc/controller/adblock.lua +++ b/applications/luci-app-adblock/luasrc/controller/adblock.lua @@ -5,7 +5,7 @@ module("luci.controller.adblock", package.seeall) local fs = require("nixio.fs") local util = require("luci.util") -local template = require("luci.template") +local templ = require("luci.template") local i18n = require("luci.i18n") function index() @@ -19,17 +19,13 @@ function index() entry({"admin", "services", "adblock", "advanced", "blacklist"}, cbi("adblock/blacklist_tab"), _("Edit Blacklist"), 110).leaf = true entry({"admin", "services", "adblock", "advanced", "whitelist"}, cbi("adblock/whitelist_tab"), _("Edit Whitelist"), 120).leaf = true entry({"admin", "services", "adblock", "advanced", "configuration"}, cbi("adblock/configuration_tab"), _("Edit Configuration"), 130).leaf = true - entry({"admin", "services", "adblock", "advanced", "query"}, call("query"), _("Query domains"), 140).leaf = true + entry({"admin", "services", "adblock", "advanced", "query"}, template("adblock/query"), _("Query domains"), 140).leaf = true entry({"admin", "services", "adblock", "advanced", "result"}, call("queryData"), nil, 150).leaf = true end function logread() local logfile = util.trim(util.exec("logread -e 'adblock'")) - template.render("adblock/logread", {title = i18n.translate("Adblock Logfile"), content = logfile}) -end - -function query() - template.render("adblock/query", {title = i18n.translate("Adblock Domain Query")}) + templ.render("adblock/logread", {title = i18n.translate("Adblock Logfile"), content = logfile}) end function queryData(domain) diff --git a/applications/luci-app-adblock/luasrc/model/cbi/adblock/blacklist_tab.lua b/applications/luci-app-adblock/luasrc/model/cbi/adblock/blacklist_tab.lua index 59cd1e80fa..ef70100e4f 100644 --- a/applications/luci-app-adblock/luasrc/model/cbi/adblock/blacklist_tab.lua +++ b/applications/luci-app-adblock/luasrc/model/cbi/adblock/blacklist_tab.lua @@ -25,6 +25,7 @@ end m = SimpleForm("input", nil) m:append(Template("adblock/config_css")) +m.submit = translate("Save") m.reset = false s = m:section(SimpleSection, nil, diff --git a/applications/luci-app-adblock/luasrc/model/cbi/adblock/configuration_tab.lua b/applications/luci-app-adblock/luasrc/model/cbi/adblock/configuration_tab.lua index 1607f1440a..1d89485e79 100644 --- a/applications/luci-app-adblock/luasrc/model/cbi/adblock/configuration_tab.lua +++ b/applications/luci-app-adblock/luasrc/model/cbi/adblock/configuration_tab.lua @@ -14,6 +14,7 @@ end m = SimpleForm("input", nil) m:append(Template("adblock/config_css")) +m.submit = translate("Save") m.reset = false s = m:section(SimpleSection, nil, 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 68f9c8897e..aa57014879 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 @@ -21,6 +21,8 @@ if parse ~= nil then dnspath = "/var/lib/unbound" elseif backend == "named" then dnspath = "/var/lib/bind" + elseif backend == "kresd" then + dnspath = "/tmp/kresd" end end end @@ -180,7 +182,7 @@ e2 = e:option(Flag, "adb_forcesrt", translate("Force Overall Sort"), e2.default = e2.disabled e2.rmempty = false -e3 = e:option(Flag, "adb_manmode", translate("Manual mode"), +e3 = e:option(Flag, "adb_manmode", translate("Manual / Backup mode"), translate("Do not automatically update blocklists during startup, use blocklist backups instead.")) e3.default = e3.disabled e3.rmempty = false diff --git a/applications/luci-app-adblock/luasrc/model/cbi/adblock/whitelist_tab.lua b/applications/luci-app-adblock/luasrc/model/cbi/adblock/whitelist_tab.lua index 10a593859f..a3659eb469 100644 --- a/applications/luci-app-adblock/luasrc/model/cbi/adblock/whitelist_tab.lua +++ b/applications/luci-app-adblock/luasrc/model/cbi/adblock/whitelist_tab.lua @@ -24,6 +24,7 @@ end m = SimpleForm("input", nil) m:append(Template("adblock/config_css")) +m.submit = translate("Save") m.reset = false s = m:section(SimpleSection, nil, |