luci-app-vpnbypass: better service control & buttons styling

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

diff --git a/applications/luci-app-vpnbypass/luasrc/view/vpnbypass/buttons.htm b/applications/luci-app-vpnbypass/luasrc/view/vpnbypass/buttons.htm
index baabb8f2a7f855b75b328b232da571ebb3c51d45..c1f4d8279e0095ec087c6e7fcbd9ca96d0bbce61 100644 (file)
--- 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 <stangri@melmac.net>
--%>
+<%# Copyright 2020 Stan Grishin <stangri@melmac.net> -%>
+
+<%+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%>
-
 <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)" />
+               <input type="button" class="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_action_style%>" id="btn_action" name="action" value="<%:Reload%>" onclick="button_action(this)" />
+               <input type="button" class="cbi-button cbi-button-apply" id="btn_action" name="action" value="<%:Restart%>"
+                       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)"  />
+               <input type="button" class="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_enable_style%>" id="btn_enable" name="enable" value="<%:Enable%>" onclick="button_action(this)"  />
+               <input type="button" class="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_disable_style%>" id="btn_disable" name="disable" value="<%:Disable%>" onclick="button_action(this)"  />
+               <input type="button" class="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>
 </div>
+
+<%-if not btn_start_status then%>
+<script type="text/javascript">document.getElementById("btn_start").disabled = true;</script>
+<%-end%>
+<%-if not btn_action_status then%>
+<script type="text/javascript">document.getElementById("btn_action").disabled = true;</script>
+<%-end%>
+<%-if not btn_stop_status then%>
+<script type="text/javascript">document.getElementById("btn_stop").disabled = true;</script>
+<%-end%>
+<%-if not btn_enable_status then%>
+<script type="text/javascript">document.getElementById("btn_enable").disabled = true;</script>
+<%-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