From 5bf31bb1ae2b8192080ebc317fec1dfeaf337e76 Mon Sep 17 00:00:00 2001
From: Stan Grishin <stangri@melmac.net>
Date: Sun, 29 Mar 2020 05:22:21 +0000
Subject: luci-app-simple-adblock: better status/error display

Signed-off-by: Stan Grishin <stangri@melmac.net>
---
 .../luasrc/view/simple-adblock/buttons.htm         | 69 ++++++++++++++++++++++
 .../luasrc/view/simple-adblock/css.htm             |  9 +++
 .../luasrc/view/simple-adblock/error.htm           | 13 ++++
 .../luasrc/view/simple-adblock/js.htm              | 59 ++++++++++++++++++
 4 files changed, 150 insertions(+)
 create mode 100644 applications/luci-app-simple-adblock/luasrc/view/simple-adblock/buttons.htm
 create mode 100644 applications/luci-app-simple-adblock/luasrc/view/simple-adblock/css.htm
 create mode 100644 applications/luci-app-simple-adblock/luasrc/view/simple-adblock/error.htm
 create mode 100644 applications/luci-app-simple-adblock/luasrc/view/simple-adblock/js.htm

(limited to 'applications/luci-app-simple-adblock/luasrc/view/simple-adblock')

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
new file mode 100644
index 0000000000..08b725cf7f
--- /dev/null
+++ b/applications/luci-app-simple-adblock/luasrc/view/simple-adblock/buttons.htm
@@ -0,0 +1,69 @@
+<%#
+	Copyright 2019 Stan Grishin <stangri@melmac.net>
+-%>
+
+<%-
+	local packageName = "simple-adblock"
+	local enabledFlag = luci.model.uci.cursor():get(packageName, "config", "enabled")
+	if nixio.fs.access("/var/run/" .. packageName .. ".json") then
+		tmpfs = luci.jsonc.parse(luci.util.trim(luci.sys.exec("cat /var/run/" .. packageName .. ".json")))
+	end
+	local tmpfsVersion, tmpfsStatus, tmpfsMessage, tmpfsError, tmpfsStats = "", "Stopped"
+	if tmpfs and tmpfs['data'] then
+		if tmpfs['data']['status'] and tmpfs['data']['status'] ~= "" then
+			tmpfsStatus = tmpfs['data']['status']
+		end
+		if tmpfs['data']['message'] and tmpfs['data']['message'] ~= "" then
+			tmpfsMessage = tmpfs['data']['message']
+		end
+		if tmpfs['data']['error'] and tmpfs['data']['error'] ~= "" then
+			tmpfsError = tmpfs['data']['error']
+		end
+		if tmpfs['data']['stats'] and tmpfs['data']['stats'] ~= "" then
+			tmpfsStats = tmpfs['data']['stats']
+		end
+		if tmpfs['data']['version'] and tmpfs['data']['version'] ~= "" then
+			tmpfsVersion = " (" .. packageName .. " " .. tmpfs['data']['version'] .. ")"
+		end
+	end
+	if tmpfsStatus == "Stopped" then
+		btn_start_style = "cbi-button cbi-button-apply important"
+		btn_action_style = "cbi-button cbi-button-apply important"
+		btn_stop_style = "cbi-button cbi-button-reset -disabled"
+	else
+		btn_start_style = "cbi-button cbi-button-apply -disabled"
+		btn_action_style = "cbi-button cbi-button-apply important"
+		btn_stop_style = "cbi-button cbi-button-reset important"
+	end
+	if enabledFlag ~= "1" then
+		btn_start_style = "cbi-button cbi-button-apply -disabled"
+		btn_action_style = "cbi-button cbi-button-apply -disabled"
+		btn_enable_style = "cbi-button cbi-button-apply important"
+		btn_disable_style = "cbi-button cbi-button-reset -disabled"
+	else
+		btn_enable_style = "cbi-button cbi-button-apply -disabled"
+		btn_disable_style = "cbi-button cbi-button-reset important"
+	end
+-%>
+
+<%+simple-adblock/css%>
+<%+simple-adblock/js%>
+
+<div class="cbi-value"><label class="cbi-value-title">Service Control</label>
+	<div class="cbi-value-field">
+		<input type="button" class="<%=btn_start_style%>" 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_action_style%>" 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_stop_style%>" 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_enable_style%>" 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_disable_style%>" id="btn_disable" name="disable" value="<%:Disable%>" onclick="button_action(this)"  />
+		<span id="btn_disable_spinner" class="btn_spinner"></span>
+	</div>
+</div>
diff --git a/applications/luci-app-simple-adblock/luasrc/view/simple-adblock/css.htm b/applications/luci-app-simple-adblock/luasrc/view/simple-adblock/css.htm
new file mode 100644
index 0000000000..6fb3d51d3b
--- /dev/null
+++ b/applications/luci-app-simple-adblock/luasrc/view/simple-adblock/css.htm
@@ -0,0 +1,9 @@
+<style type="text/css">
+	.btn_spinner
+	{
+		display: inline-block;
+		width: 0px;
+		height: 16px;
+		margin: 0 0px;
+	}
+</style>
diff --git a/applications/luci-app-simple-adblock/luasrc/view/simple-adblock/error.htm b/applications/luci-app-simple-adblock/luasrc/view/simple-adblock/error.htm
new file mode 100644
index 0000000000..4ab2e11291
--- /dev/null
+++ b/applications/luci-app-simple-adblock/luasrc/view/simple-adblock/error.htm
@@ -0,0 +1,13 @@
+<%#
+Copyright 2017-2019 Stan Grishin (stangri@melmac.net)
+This is free software, licensed under the Apache License, Version 2.0
+-%>
+
+<%+cbi/valueheader%>
+
+<textarea rows="<%=select(2, self:cfgvalue(section):gsub('\n', '\n'))%>"
+	style="border:none;box-shadow:none;background:transparent;font-weight:bold;line-height:20px;width:50em;padding:none;margin:6px;resize:none;overflow:hidden;"
+	disabled="disabled"><%=self:cfgvalue(section):gsub('\n', '\n')%>
+</textarea>
+
+<%+cbi/valuefooter%>
diff --git a/applications/luci-app-simple-adblock/luasrc/view/simple-adblock/js.htm b/applications/luci-app-simple-adblock/luasrc/view/simple-adblock/js.htm
new file mode 100644
index 0000000000..51198293f5
--- /dev/null
+++ b/applications/luci-app-simple-adblock/luasrc/view/simple-adblock/js.htm
@@ -0,0 +1,59 @@
+<script type="text/javascript">
+//<![CDATA[
+ function button_action(action) {
+	var xhr = new XHR(false);
+	var btn_start = document.getElementById("btn_start");
+	var btn_action = document.getElementById("btn_action");
+	var btn_stop = document.getElementById("btn_stop");
+	var btn_enable = document.getElementById("btn_enable");
+	var btn_disable = document.getElementById("btn_disable");
+	var btn_spinner;
+	switch (action.name) {
+		case "start":
+			btn_spinner = document.getElementById("btn_start_spinner");
+			break;
+		case "action":
+			btn_spinner = document.getElementById("btn_action_spinner");
+			break;
+		case "stop":
+			btn_spinner = document.getElementById("btn_stop_spinner");
+			break;
+		case "enable":
+			btn_spinner = document.getElementById("btn_enable_spinner");
+			break;
+		case "disable":
+			btn_spinner = document.getElementById("btn_disable_spinner");
+			break;
+	}
+	btn_start.disabled = true;
+	btn_action.disabled = true;
+	btn_stop.disabled = true;
+	btn_enable.disabled = true;
+	btn_disable.disabled = true;
+	spinner(btn_spinner, 1);
+	xhr.get('<%=luci.dispatcher.build_url("admin", "services", "simple-adblock", "action")%>/' + action.name, null,
+		function (x) {
+			if (!x) {
+				return;
+			}
+			btn_start.disabled = false;
+			btn_action.disabled = false;
+			btn_stop.disabled = false;
+			btn_enable.disabled = false;
+			btn_disable.disabled = false;
+			spinner(btn_spinner, 0);
+			location.reload();
+		 });
+}
+function spinner(element, state) {
+	if (state === 1) {
+		element.style.width = "16px";
+		element.innerHTML = '<img src="<%=resource%>/icons/loading.gif" alt="<%:Loading%>" width="16" height="16" style="vertical-align:middle" />';
+	}
+	else {
+		element.style.width = "0px";
+		element.innerHTML = '';
+	}
+}
+//]]>
+</script>
\ No newline at end of file
-- 
cgit v1.2.3