From b27d5e0a900ec29edd4a22a19a6e6be78872c8bc Mon Sep 17 00:00:00 2001 From: Stan Grishin Date: Fri, 3 Apr 2020 12:32:47 +0000 Subject: [PATCH] luci-app-vpnbypass: better service control & buttons styling Signed-off-by: Stan Grishin --- applications/luci-app-vpnbypass/Makefile | 4 +- .../luasrc/controller/vpnbypass.lua | 9 +-- .../luasrc/model/cbi/vpnbypass.lua | 45 +++++++---- .../luasrc/view/vpnbypass/buttons.htm | 80 ++++++++++++------- .../luasrc/view/vpnbypass/js.htm | 36 ++++----- .../luasrc/view/vpnbypass/status-textarea.htm | 4 +- .../po/templates/vpnbypass.pot | 46 ++++++++++- .../root/etc/uci-defaults/40_luci-vpnbypass | 9 +-- 8 files changed, 151 insertions(+), 82 deletions(-) diff --git a/applications/luci-app-vpnbypass/Makefile b/applications/luci-app-vpnbypass/Makefile index 1bf076f0a..cfcafec05 100644 --- a/applications/luci-app-vpnbypass/Makefile +++ b/applications/luci-app-vpnbypass/Makefile @@ -8,9 +8,9 @@ PKG_MAINTAINER:=Stan Grishin LUCI_TITLE:=VPN Bypass Web UI LUCI_DESCRIPTION:=Provides Web UI for VPNBypass service. -LUCI_DEPENDS:=+luci-mod-admin-full +vpnbypass +LUCI_DEPENDS:=+luci-compat +luci-mod-admin-full +vpnbypass LUCI_PKGARCH:=all -PKG_RELEASE:=13 +PKG_RELEASE:=16 include ../../luci.mk diff --git a/applications/luci-app-vpnbypass/luasrc/controller/vpnbypass.lua b/applications/luci-app-vpnbypass/luasrc/controller/vpnbypass.lua index dac02d84d..77753020d 100644 --- a/applications/luci-app-vpnbypass/luasrc/controller/vpnbypass.lua +++ b/applications/luci-app-vpnbypass/luasrc/controller/vpnbypass.lua @@ -1,10 +1,9 @@ module("luci.controller.vpnbypass", package.seeall) function index() if nixio.fs.access("/etc/config/vpnbypass") then - local node = "services" - if luci.dispatcher.lookup("admin/vpn") then node = "vpn" end - entry({"admin", node, "vpnbypass"}, cbi("vpnbypass"), _("VPN Bypass")) - entry({"admin", node, "vpnbypass", "action"}, call("vpnbypass_action"), nil).leaf = true + entry({"admin", "vpn"}, firstchild(), _("VPN"), 60).dependent=false + entry({"admin", "vpn", "vpnbypass"}, cbi("vpnbypass"), _("VPN Bypass")) + entry({"admin", "vpn", "vpnbypass", "action"}, call("vpnbypass_action"), nil).leaf = true end end @@ -13,7 +12,7 @@ function vpnbypass_action(name) if name == "start" then luci.sys.init.start(packageName) elseif name == "action" then - luci.util.exec("/etc/init.d/" .. packageName .. " reload >/dev/null 2>&1") + luci.util.exec("/etc/init.d/" .. packageName .. " restart >/dev/null 2>&1") luci.util.exec("/etc/init.d/dnsmasq restart >/dev/null 2>&1") elseif name == "stop" then luci.sys.init.stop(packageName) diff --git a/applications/luci-app-vpnbypass/luasrc/model/cbi/vpnbypass.lua b/applications/luci-app-vpnbypass/luasrc/model/cbi/vpnbypass.lua index 08054dc48..0afdd7b0e 100644 --- a/applications/luci-app-vpnbypass/luasrc/model/cbi/vpnbypass.lua +++ b/applications/luci-app-vpnbypass/luasrc/model/cbi/vpnbypass.lua @@ -4,27 +4,42 @@ local sys = require "luci.sys" local util = require "luci.util" local packageName = "vpnbypass" -local tmpfsVersion = tostring(util.trim(sys.exec("opkg list-installed " .. packageName .. " | awk '{print $3}'"))) -if not tmpfsVersion or tmpfsVersion == "" then - tmpfsStatusCode = -1 - tmpfsVersion = "" - tmpfsStatus = packageName .. " " .. translate("is not installed or not found") +local packageVersion, statusText = nil, nil +packageVersion = tostring(util.trim(sys.exec("opkg list-installed " .. packageName .. " | awk '{print $3}'"))) +if not packageVersion or packageVersion == "" then + packageVersion = "" + statusText = packageName .. " " .. translate("is not installed or not found") else - tmpfsVersion = " [" .. packageName .. " " .. tmpfsVersion .. "]" + packageVersion = " [" .. packageName .. " " .. packageVersion .. "]" end -local tmpfsStatus = "Stopped" -if sys.call("iptables -t mangle -L | grep -q VPNBYPASS") == 0 then - tmpfsStatus = "Running" + +local serviceRunning, serviceEnabled = false, false +if uci:get(packageName, "config", "enabled") == "1" then + serviceEnabled = true +end +if sys.call("iptables -t mangle -L | grep -q " .. packageName:upper()) == 0 then + serviceRunning = true +end + +if serviceRunning then + statusText = translate("Running") +else + statusText = translate("Stopped") + if not serviceEnabled then + statusText = statusText .. " (" .. translate("disabled") .. ")" + end end m = Map("vpnbypass", translate("VPN Bypass Settings")) -h = m:section(NamedSection, "config", packageName, translate("Service Status") .. tmpfsVersion) +h = m:section(NamedSection, "config", packageName, translate("Service Status") .. packageVersion) ss = h:option(DummyValue, "_dummy", translate("Service Status")) ss.template = packageName .. "/status" -ss.value = tmpfsStatus -buttons = h:option(DummyValue, "_dummy") -buttons.template = packageName .. "/buttons" +ss.value = statusText +if packageVersion ~= "" then + buttons = h:option(DummyValue, "_dummy") + buttons.template = packageName .. "/buttons" +end s = m:section(NamedSection, "config", "vpnbypass", translate("VPN Bypass Rules")) -- Local Ports @@ -60,9 +75,9 @@ d = Map("dhcp") s4 = d:section(TypedSection, "dnsmasq") s4.anonymous = true di = s4:option(DynamicList, "ipset", translate("Domains to Bypass"), - translate("Domains to be accessed directly (outside of the VPN tunnel), see ") + translate("Domains to be accessed directly (outside of the VPN tunnel), see ") .. [[]] - .. translate("README") .. [[ ]] .. translate("for syntax")) + .. translate("README") .. [[ ]] .. translate("for syntax")) function d.on_after_commit(map) util.exec("/etc/init.d/dnsmasq restart >/dev/null 2>&1") end diff --git a/applications/luci-app-vpnbypass/luasrc/view/vpnbypass/buttons.htm b/applications/luci-app-vpnbypass/luasrc/view/vpnbypass/buttons.htm index 9f79b9b77..c1f4d8279 100644 --- a/applications/luci-app-vpnbypass/luasrc/view/vpnbypass/buttons.htm +++ b/applications/luci-app-vpnbypass/luasrc/view/vpnbypass/buttons.htm @@ -1,53 +1,77 @@ -<%# - Copyright 2019 Stan Grishin --%> +<%# Copyright 2020 Stan Grishin -%> + +<%+vpnbypass/css%> +<%+vpnbypass/js%> <%- local packageName = "vpnbypass" - local tmpfsStatus = "Stopped" - local enabledFlag = luci.model.uci.cursor():get(packageName, "config", "enabled") + local serviceRunning, serviceEnabled = false, false; if luci.sys.call("iptables -t mangle -L | grep -q " .. packageName:upper()) == 0 then - tmpfsStatus = "Running" + serviceRunning = true + end + if luci.model.uci.cursor():get(packageName, "config", "enabled") == "1" then + serviceEnabled = true 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" + if serviceEnabled then + btn_start_status = true + btn_action_status = true + btn_stop_status = true + btn_enable_status = false + btn_disable_status = true 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" + btn_start_status = false + btn_action_status = false + btn_stop_status = false + btn_enable_status = true + btn_disable_status = false 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" + if serviceRunning then + btn_start_status = false + btn_action_status = true + btn_stop_status = true else - btn_enable_style = "cbi-button cbi-button-apply -disabled" - btn_disable_style = "cbi-button cbi-button-reset important" + btn_action_status = false + btn_stop_status = false end -%> -<%+vpnbypass/css%> -<%+vpnbypass/js%> -
- + - + - +         - + - +
+ +<%-if not btn_start_status then%> + +<%-end%> +<%-if not btn_action_status then%> + +<%-end%> +<%-if not btn_stop_status then%> + +<%-end%> +<%-if not btn_enable_status then%> + +<%-end%> +<%-if not btn_disable_status then%> + +<%-end%> \ No newline at end of file diff --git a/applications/luci-app-vpnbypass/luasrc/view/vpnbypass/js.htm b/applications/luci-app-vpnbypass/luasrc/view/vpnbypass/js.htm index 8e47a9759..e8c076f50 100644 --- a/applications/luci-app-vpnbypass/luasrc/view/vpnbypass/js.htm +++ b/applications/luci-app-vpnbypass/luasrc/view/vpnbypass/js.htm @@ -1,14 +1,12 @@ -<%- if luci.dispatcher.lookup("admin/vpn") then node = "vpn" else node = "services" end -%> -