diff options
Diffstat (limited to 'applications/luci-app-vpn-policy-routing/luasrc')
4 files changed, 11 insertions, 9 deletions
diff --git a/applications/luci-app-vpn-policy-routing/luasrc/model/cbi/vpn-policy-routing.lua b/applications/luci-app-vpn-policy-routing/luasrc/model/cbi/vpn-policy-routing.lua index 8be8df7b96..82d90e9bf8 100644 --- a/applications/luci-app-vpn-policy-routing/luasrc/model/cbi/vpn-policy-routing.lua +++ b/applications/luci-app-vpn-policy-routing/luasrc/model/cbi/vpn-policy-routing.lua @@ -132,7 +132,7 @@ m = Map("vpn-policy-routing", translate("VPN and WAN Policy-Based Routing")) h = m:section(NamedSection, "config", packageName, translatef("Service Status [%s %s]", packageName, packageVersion)) status = h:option(DummyValue, "_dummy", translate("Service Status")) -status.template = "vpn-policy-routing/status-service" +status.template = "vpn-policy-routing/status" status.value = statusText if serviceRunning and serviceGateways and serviceGateways ~= "" then gateways = h:option(DummyValue, "_dummy", translate("Service Gateways")) @@ -150,7 +150,7 @@ if serviceWarnings and serviceWarnings ~= "" then warnings.value = serviceWarnings end if packageVersion ~= "" then - buttons = h:option(DummyValue, "_dummy") + buttons = h:option(DummyValue, "_dummy", translate("Service Control")) buttons.template = packageName .. "/buttons" end diff --git a/applications/luci-app-vpn-policy-routing/luasrc/view/vpn-policy-routing/buttons.htm b/applications/luci-app-vpn-policy-routing/luasrc/view/vpn-policy-routing/buttons.htm index b1ec6fbf97..8a64698b6c 100644 --- a/applications/luci-app-vpn-policy-routing/luasrc/view/vpn-policy-routing/buttons.htm +++ b/applications/luci-app-vpn-policy-routing/luasrc/view/vpn-policy-routing/buttons.htm @@ -38,7 +38,7 @@ end -%> -<div class="cbi-value"><label class="cbi-value-title">Service Control</label> +<%+cbi/valueheader%> <div class="cbi-value-field"> <input type="button" class="btn cbi-button cbi-button-apply" id="btn_start" name="start" value="<%:Start%>" onclick="button_action(this)" /> @@ -60,7 +60,7 @@ onclick="button_action(this)" /> <span id="btn_disable_spinner" class="btn_spinner"></span> </div> -</div> +<%+cbi/valuefooter%> <%-if not btn_start_status then%> <script type="text/javascript">document.getElementById("btn_start").disabled = true;</script> diff --git a/applications/luci-app-vpn-policy-routing/luasrc/view/vpn-policy-routing/status-gateways.htm b/applications/luci-app-vpn-policy-routing/luasrc/view/vpn-policy-routing/status-gateways.htm index 65f3e5d7c6..377cfeeaac 100644 --- a/applications/luci-app-vpn-policy-routing/luasrc/view/vpn-policy-routing/status-gateways.htm +++ b/applications/luci-app-vpn-policy-routing/luasrc/view/vpn-policy-routing/status-gateways.htm @@ -5,10 +5,10 @@ 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="outline:none;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> +<div style="font-weight:bold;"> + <%=self:cfgvalue(section):gsub('\n', '<br />' )%> +</div> +<br /> <div> <%- local readmeURL = "https://docs.openwrt.melmac.net/vpn-policy-routing/" -%> diff --git a/applications/luci-app-vpn-policy-routing/luasrc/view/vpn-policy-routing/status.htm b/applications/luci-app-vpn-policy-routing/luasrc/view/vpn-policy-routing/status.htm index e74206853a..4a93564614 100644 --- a/applications/luci-app-vpn-policy-routing/luasrc/view/vpn-policy-routing/status.htm +++ b/applications/luci-app-vpn-policy-routing/luasrc/view/vpn-policy-routing/status.htm @@ -5,6 +5,8 @@ This is free software, licensed under the Apache License, Version 2.0 <%+cbi/valueheader%> -<%=self:cfgvalue(section):gsub('\n', '<br/>' )%> +<div style="font-weight:bold;"> + <%=self:cfgvalue(section):gsub('\n', '<br />' )%> +</div> <%+cbi/valuefooter%> |