luci-app-adblock: "final" fixes

during intense testing with different browsers (Chrome/Firefox/partly IE
in a VM) I found & fixed some more minor things:

* remove needless hook & include from overview page
* fix possible JS error in Runtime Information
* Align CSS color with "LuCI standard"

Signed-off-by: Dirk Brenken <dev@brenken.org>
(cherry picked from commit b8f83946816702ba3b73c9573c266a2fdae6e615)

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 3bf739291433f202ff9f1a9401bb985b49d8e27d..2ecaaab726adde0a3273ef468b953d574cdf75a7 100644 (file)
--- a/applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua
+++ b/applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua
@@ -3,7 +3,6 @@
 
 local fs   = require("nixio.fs")
 local uci  = require("luci.model.uci").cursor()
-local sys  = require("luci.sys")
 local util = require("luci.util")
 local dump = util.ubus("network.interface", "dump", {})
 
@@ -13,10 +12,6 @@ m = Map("adblock", translate("Adblock"),
        .. "<a href=\"%s\" target=\"_blank\">"
        .. "check the online documentation</a>", "https://github.com/openwrt/packages/blob/master/net/adblock/files/README.md"))
 
-function m.on_apply(self)
-       luci.sys.call("/etc/init.d/adblock reload >/dev/null 2>&1")
-end
-
 -- Main adblock options
 
 s = m:section(NamedSection, "global", "adblock")

diff --git a/applications/luci-app-adblock/luasrc/view/adblock/runtime.htm b/applications/luci-app-adblock/luasrc/view/adblock/runtime.htm
index 05cdde73b91f1ec8891f431009c2d19fb32596ee..3f4d6425925a63dd86264a09c76c23f524cb3b26 100644 (file)
--- a/applications/luci-app-adblock/luasrc/view/adblock/runtime.htm
+++ b/applications/luci-app-adblock/luasrc/view/adblock/runtime.htm
@@ -6,7 +6,7 @@ This is free software, licensed under the Apache License, Version 2.0
 <style type="text/css">
 .runtime
 {
-       color: #0069d6;
+       color: #37c;
        font-weight: bold;
        display: inline-block;
        width: 100%;
@@ -18,10 +18,12 @@ This is free software, licensed under the Apache License, Version 2.0
 //<![CDATA[
        function status_update(json)
        {
-                       var view  = document.getElementById("value_1");
-                       var btn1  = document.getElementById("btn1");
-                       var btn2  = document.getElementById("btn2");
-                       var input = json.data.adblock_status;
+                       var view         = document.getElementById("value_1");
+                       var btn1         = document.getElementById("btn1");
+                       var btn1_running = document.getElementById("btn1_running");
+                       var btn2         = document.getElementById("btn2");
+                       var btn2_running = document.getElementById("btn2_running");
+                       var input        = json.data.adblock_status;
 
                        view.innerHTML = input || "-";
                        if (input === "enabled")
@@ -126,7 +128,7 @@ This is free software, licensed under the Apache License, Version 2.0
                        btn2.value = "<%:Refresh%>";
                        btn2.name  = "do_refresh";
                        btn1.disabled = true;
-                       btn2.disabled = false;
+                       btn2.disabled = true;
                        return;
                }
                status_update(json_info)