From: Dirk Brenken <dev@brenken.org>
Date: Tue, 25 Apr 2017 21:17:08 +0000 (+0200)
Subject: luci-app-adblock: sync with 2.6.1
X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=refs%2Fpull%2F1124%2Fhead;p=project%2Fluci.git

luci-app-adblock: sync with 2.6.1

* add two new extra options
* cosmetics

Signed-off-by: Dirk Brenken <dev@brenken.org>
---

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 7945aa154e..d540c77d10 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
@@ -13,6 +13,7 @@ end
 
 m = SimpleForm("input", nil)
 m:append(Template("adblock/config_css"))
+m.reset = false
 
 s = m:section(SimpleSection, nil,
 	translatef("This form allows you to modify the content of the adblock blacklist (%s).<br />", adbinput)
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 ec88e5fbc0..1b83c949e1 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
@@ -12,6 +12,7 @@ end
 
 m = SimpleForm("input", nil)
 m:append(Template("adblock/config_css"))
+m.reset = false
 
 s = m:section(SimpleSection, nil,
 	translate("This form allows you to modify the content of the main adblock configuration file (/etc/config/adblock)."))
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 fbc09b1847..46eeeb3d64 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
@@ -17,6 +17,7 @@ m = Map("adblock", translate("Adblock"),
 	.. translate("see online documentation")
 	.. [[</a>]]
 	.. translate("."))
+m.reset = false
 
 -- Main adblock options
 
@@ -137,16 +138,27 @@ end
 
 des = bl:option(DummyValue, "adb_src_desc", translate("Description"))
 
--- Backup options
+-- Extra options
 
-s = m:section(NamedSection, "global", "adblock", translate("Backup options"))
+e = m:section(NamedSection, "global", "adblock", translate("Extra options"),
+	translate("Options for further tweaking in case the defaults are not suitable for you."))
 
-o5 = s:option(Flag, "adb_backup", translate("Enable blocklist backup"))
-o5.default = o5.disabled
-o5.rmempty = false
+e1 = e:option(Flag, "adb_forcedns", translate("Force local DNS"),
+	translate("Redirect all DNS queries to the local resolver."))
+e1.default = e1.disabled
+e1.rmempty = false
 
-o6 = s:option(Value, "adb_backupdir", translate("Backup directory"))
-o6.datatype = "directory"
-o6.rmempty = false
+e2 = e:option(Flag, "adb_forcesrt", translate("Force Overall Sort"),
+	translate("Enable memory intense overall sort / duplicate removal on low memory devices (< 64 MB RAM)"))
+e2.default = e2.disabled
+e2.rmempty = false
+
+e3 = e:option(Flag, "adb_backup", translate("Enable blocklist backup"))
+e3.default = e3.disabled
+e3.rmempty = false
+
+e4 = e:option(Value, "adb_backupdir", translate("Backup directory"))
+e4.datatype = "directory"
+e4.rmempty = false
 
 return m
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 9e087a6c4b..23c99a9778 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
@@ -13,6 +13,7 @@ end
 
 m = SimpleForm("input", nil)
 m:append(Template("adblock/config_css"))
+m.reset = false
 
 s = m:section(SimpleSection, nil,
 	translatef("This form allows you to modify the content of the adblock whitelist (%s).<br />", adbinput)