From 55f251b01f22a8e5179f0f6767d1be44c745239e Mon Sep 17 00:00:00 2001 From: Dirk Brenken Date: Mon, 14 May 2018 22:09:31 +0200 Subject: luci-app-adblock: sync with adblock 3.5.2 * archive sub-categories (shalla & ut_capitole) are now configurable via LuCI CBI template * small bugfixes & enhancements Signed-off-by: Dirk Brenken --- .../luasrc/model/cbi/adblock/overview_tab.lua | 19 ++++++------------- 1 file changed, 6 insertions(+), 13 deletions(-) (limited to 'applications/luci-app-adblock/luasrc/model/cbi') 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 ec5a75cefc..3f39622920 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 @@ -9,16 +9,6 @@ local dump = util.ubus("network.interface", "dump", {}) local json = require("luci.jsonc") local adbinput = uci:get("adblock", "global", "adb_rtfile") or "/tmp/adb_runtime.json" -if not uci:get("adblock", "extra") then - m = SimpleForm("", nil, translate("Please update your adblock config file to use this package.
") - .. translatef("During opkg package installation use the '--force-maintainer' option to overwrite the pre-existing config file or download a fresh default config from " - .. "" - .. "here", "https://raw.githubusercontent.com/openwrt/packages/master/net/adblock/files/adblock.conf")) - m.submit = false - m.reset = false - return m -end - m = Map("adblock", translate("Adblock"), translate("Configuration of the adblock package to block ad/abuse domains by using DNS. ") .. translatef("For further information " @@ -175,9 +165,7 @@ end -- Blocklist table bl = m:section(TypedSection, "source", translate("Blocklist Sources"), - translate("Available blocklist sources. ") - .. translate("List URLs and Shallalist category selections are configurable in the 'Advanced' section.
") - .. translate("Caution: To prevent OOM exceptions on low memory devices with less than 64 MB free RAM, please do not select more than five blocklist sources!")) + translate("Caution: To prevent OOM exceptions on low memory devices with less than 64 MB free RAM, please only select a few of them!")) bl.template = "adblock/blocklist" name = bl:option(Flag, "enabled", translate("Enabled")) @@ -192,8 +180,13 @@ function ssl.cfgvalue(self, section) return translate("No") end end + des = bl:option(DummyValue, "adb_src_desc", translate("Description")) +cat = bl:option(DynamicList, "adb_src_cat", translate("Categories")) +cat.datatype = "uciname" +cat.optional = true + -- Extra options e = m:section(NamedSection, "extra", "adblock", translate("Extra Options"), -- cgit v1.2.3