From 03ae05549d4dc3fd705a110192ad84bf144298c0 Mon Sep 17 00:00:00 2001 From: Dirk Brenken Date: Tue, 4 Apr 2017 14:11:41 +0200 Subject: [PATCH] luci-app-adblock: sync with adblock 2.5.1 * made buttons translatable * accept empty values for interface trigger input field * replace 'url' with 'luci.dispatcher.build_url' Signed-off-by: Dirk Brenken --- .../luasrc/model/cbi/adblock/overview_tab.lua | 8 ++++---- .../luci-app-adblock/luasrc/view/adblock/query.htm | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) 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 7919b7151..b8318fe99 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 @@ -30,14 +30,14 @@ if data.adblock == nil then btn.inputstyle = nil btn.disabled = true elseif dnsFile1 ~= "" or dnsFile2 ~= "" then - btn.inputtitle = "Suspend adblock" + btn.inputtitle = translate("Suspend adblock") btn.inputstyle = "reset" btn.disabled = false function btn.write() luci.sys.call("/etc/init.d/adblock suspend >/dev/null 2>&1") end else - btn.inputtitle = "Resume adblock" + btn.inputtitle = translate("Resume adblock") btn.inputstyle = "apply" btn.disabled = false function btn.write() @@ -51,8 +51,8 @@ o2.rmempty = false o3 = s:option(Value, "adb_iface", translate("Restrict interface reload trigger to certain interface(s)"), translate("Space separated list of interfaces that trigger a reload action. ".. - "To disable reload trigger at all set it to 'false'.")) -o3.rmempty =false + "To disable reload trigger at all remove all entries.")) +o3.rmempty =true -- Runtime information diff --git a/applications/luci-app-adblock/luasrc/view/adblock/query.htm b/applications/luci-app-adblock/luasrc/view/adblock/query.htm index be606301e..5e064af85 100644 --- a/applications/luci-app-adblock/luasrc/view/adblock/query.htm +++ b/applications/luci-app-adblock/luasrc/view/adblock/query.htm @@ -25,7 +25,7 @@ This is free software, licensed under the Apache License, Version 2.0 ; input.parentNode.style.display = 'block'; input.style.display = 'inline'; - stxhr.post('<%=url('admin/services/adblock/advanced/result/')%>' + domain, { token: '<%=token%>' }, + stxhr.post('<%=luci.dispatcher.build_url('admin/services/adblock/advanced/result/')%>' + domain, { token: '<%=token%>' }, function(x) { if (x.responseText) -- 2.25.1