Difuse/luci
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

luci-app-adblock: "final" fixes

Browse source 
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>
This commit is contained in:
Dirk Brenken 2018-07-31 09:21:44 +02:00
parent b7ed444cbb
commit b8f8394681
2 changed files with 8 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua
View file

@ -3,7 +3,6 @@
local fs = require("nixio.fs") local fs = require("nixio.fs")
local uci = require("luci.model.uci").cursor() local uci = require("luci.model.uci").cursor()
local sys = require("luci.sys")
local util = require("luci.util") local util = require("luci.util")
local dump = util.ubus("network.interface", "dump", {}) local dump = util.ubus("network.interface", "dump", {})
@ -13,10 +12,6 @@ m = Map("adblock", translate("Adblock"),
.. "<a href=\"%s\" target=\"_blank\">" .. "<a href=\"%s\" target=\"_blank\">"
.. "check the online documentation</a>", "https://github.com/openwrt/packages/blob/master/net/adblock/files/README.md")) .. "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 -- Main adblock options
s = m:section(NamedSection, "global", "adblock") s = m:section(NamedSection, "global", "adblock")

6
applications/luci-app-adblock/luasrc/view/adblock/runtime.htm
View file

@ -6,7 +6,7 @@ This is free software, licensed under the Apache License, Version 2.0
<style type="text/css"> <style type="text/css">
.runtime .runtime
{ {
color: #0069d6; color: #37c;
font-weight: bold; font-weight: bold;
display: inline-block; display: inline-block;
width: 100%; width: 100%;
@ -20,7 +20,9 @@ This is free software, licensed under the Apache License, Version 2.0
{ {
var view = document.getElementById("value_1"); var view = document.getElementById("value_1");
var btn1 = document.getElementById("btn1"); var btn1 = document.getElementById("btn1");
var btn1_running = document.getElementById("btn1_running");
var btn2 = document.getElementById("btn2"); var btn2 = document.getElementById("btn2");
var btn2_running = document.getElementById("btn2_running");
var input = json.data.adblock_status; var input = json.data.adblock_status;
view.innerHTML = input || "-"; view.innerHTML = input || "-";
@ -126,7 +128,7 @@ This is free software, licensed under the Apache License, Version 2.0
btn2.value = "<%:Refresh%>"; btn2.value = "<%:Refresh%>";
btn2.name = "do_refresh"; btn2.name = "do_refresh";
btn1.disabled = true; btn1.disabled = true;
btn2.disabled = false; btn2.disabled = true;
return; return;
} }
status_update(json_info) status_update(json_info)