diff options
| author | Stan Grishin <stangri@melmac.ca> | 2022-08-19 21:49:35 +0000 |
|---|---|---|
| committer | Stan Grishin <stangri@melmac.ca> | 2022-08-19 21:49:43 +0000 |
| commit | 9b71a35428e0ddbf0347c8ba62da2f4168ddb21b (patch) | |
| tree | 0fecd9d8419fcf5b830efba5b0a304541fc192c1 /applications/luci-app-simple-adblock/luasrc/view/simple-adblock | |
| parent | f34839c7a667b5deffd978a25bcf39e0436380e1 (diff) | |
luci-app-simple-adblock: update to 1.9.0-1
* Support for (upcoming) dnsmasq nftset
Depends on https://github.com/openwrt/packages/pull/19212
Signed-off-by: Stan Grishin <stangri@melmac.ca>
Diffstat (limited to 'applications/luci-app-simple-adblock/luasrc/view/simple-adblock')
| -rw-r--r-- | applications/luci-app-simple-adblock/luasrc/view/simple-adblock/buttons.htm | 49 |
1 files changed, 24 insertions, 25 deletions
diff --git a/applications/luci-app-simple-adblock/luasrc/view/simple-adblock/buttons.htm b/applications/luci-app-simple-adblock/luasrc/view/simple-adblock/buttons.htm index 64df62142a..c8d4e5e8a6 100644 --- a/applications/luci-app-simple-adblock/luasrc/view/simple-adblock/buttons.htm +++ b/applications/luci-app-simple-adblock/luasrc/view/simple-adblock/buttons.htm @@ -1,4 +1,4 @@ -<%# Copyright 2020 Stan Grishin <stangri@melmac.net> -%> +<%# Copyright 2020 Stan Grishin <stangri@melmac.ca> -%> <%+simple-adblock/css%> <%+simple-adblock/js%> @@ -7,8 +7,9 @@ local packageName = "simple-adblock" local serviceRunning, serviceEnabled = false, false; local tmpfs, tmpfsStatus; - if nixio.fs.access("/var/run/" .. packageName .. ".json") then - tmpfs = luci.jsonc.parse(luci.util.trim(luci.sys.exec("cat /var/run/" .. packageName .. ".json"))) + local jsonStatusFile = "/var/run/" .. packageName .. "/" .. packageName .. ".json" + if nixio.fs.access(jsonStatusFile) then + tmpfs = luci.jsonc.parse(luci.util.trim(luci.sys.exec("cat " .. jsonStatusFile))) if tmpfs and tmpfs['data'] and tmpfs['data']['status'] then tmpfsStatus = tmpfs['data']['status'] end @@ -48,27 +49,25 @@ -%> <%+cbi/valueheader%> - <div class="cbi-value-field"> - <input type="button" class="btn cbi-button cbi-button-apply" id="btn_start" name="start" value="<%:Start%>" - onclick="button_action(this)" /> - <span id="btn_start_spinner" class="btn_spinner"></span> - <input type="button" class="btn cbi-button cbi-button-apply" id="btn_action" name="action" value="<%:Force Re-Download%>" - onclick="button_action(this)" /> - <span id="btn_action_spinner" class="btn_spinner"></span> - <input type="button" class="btn cbi-button cbi-button-reset" id="btn_stop" name="stop" value="<%:Stop%>" - onclick="button_action(this)" /> - <span id="btn_stop_spinner" class="btn_spinner"></span> -   -   -   -   - <input type="button" class="btn cbi-button cbi-button-apply" id="btn_enable" name="enable" value="<%:Enable%>" - onclick="button_action(this)" /> - <span id="btn_enable_spinner" class="btn_spinner"></span> - <input type="button" class="btn cbi-button cbi-button-reset" id="btn_disable" name="disable" value="<%:Disable%>" - onclick="button_action(this)" /> - <span id="btn_disable_spinner" class="btn_spinner"></span> - </div> + <input type="button" class="btn cbi-button cbi-button-apply" id="btn_start" name="start" value="<%:Start%>" + onclick="button_action(this)" /> + <span id="btn_start_spinner" class="btn_spinner"></span> + <input type="button" class="btn cbi-button cbi-button-apply" id="btn_action" name="action" value="<%:Force Re-Download%>" + onclick="button_action(this)" /> + <span id="btn_action_spinner" class="btn_spinner"></span> + <input type="button" class="btn cbi-button cbi-button-reset" id="btn_stop" name="stop" value="<%:Stop%>" + onclick="button_action(this)" /> + <span id="btn_stop_spinner" class="btn_spinner"></span> +   +   +   +   + <input type="button" class="btn cbi-button cbi-button-apply" id="btn_enable" name="enable" value="<%:Enable%>" + onclick="button_action(this)" /> + <span id="btn_enable_spinner" class="btn_spinner"></span> + <input type="button" class="btn cbi-button cbi-button-reset" id="btn_disable" name="disable" value="<%:Disable%>" + onclick="button_action(this)" /> + <span id="btn_disable_spinner" class="btn_spinner"></span> <%+cbi/valuefooter%> <%-if not btn_start_status then%> @@ -85,4 +84,4 @@ <%-end%> <%-if not btn_disable_status then%> <script type="text/javascript">document.getElementById("btn_disable").disabled = true;</script> -<%-end%>
\ No newline at end of file +<%-end%> |