luci-base: fix empty reply format in ubus gateway fallback code

[project/luci.git] / applications / luci-app-simple-adblock / luasrc / view / simple-adblock / buttons.htm

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 131112c8a78b955cde990c815c80d8bd4594a2ca..c8d4e5e8a624777daf17dd5f82f60ebe45a502cc 100644 (file)
--- 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>
-               &nbsp;
-               &nbsp;
-               &nbsp;
-               &nbsp;
-               <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>
+       &#160;
+       &#160;
+       &#160;
+       &#160;
+       <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%>