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

Merge pull request #4890 from stangri/19.07-luci-app-vpn-policy-routing

Browse source 
[19.07] luci-app-vpn-policy-routing: bugfix: template layout on theme-openwrt-2020
This commit is contained in:
Stan Grishin 2021-03-09 20:34:56 -08:00 committed by GitHub
commit 193f40d30c
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
5 changed files with 15 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
applications/luci-app-vpn-policy-routing/luasrc/model/cbi/vpn-policy-routing.lua
View file

@ -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)) h = m:section(NamedSection, "config", packageName, translatef("Service Status [%s %s]", packageName, packageVersion))
status = h:option(DummyValue, "_dummy", translate("Service Status")) status = h:option(DummyValue, "_dummy", translate("Service Status"))
status.template = "vpn-policy-routing/status-service" status.template = "vpn-policy-routing/status"
status.value = statusText status.value = statusText
if serviceRunning and serviceGateways and serviceGateways ~= "" then if serviceRunning and serviceGateways and serviceGateways ~= "" then
gateways = h:option(DummyValue, "_dummy", translate("Service Gateways")) gateways = h:option(DummyValue, "_dummy", translate("Service Gateways"))
@ -150,7 +150,7 @@ if serviceWarnings and serviceWarnings ~= "" then
warnings.value = serviceWarnings warnings.value = serviceWarnings
end end
if packageVersion ~= "" then if packageVersion ~= "" then
buttons = h:option(DummyValue, "_dummy") buttons = h:option(DummyValue, "_dummy", translate("Service Control"))
buttons.template = packageName .. "/buttons" buttons.template = packageName .. "/buttons"
end end

4
applications/luci-app-vpn-policy-routing/luasrc/view/vpn-policy-routing/buttons.htm
View file

@ -38,7 +38,7 @@
end end
-%> -%>
<div class="cbi-value"><label class="cbi-value-title">Service Control</label> <%+cbi/valueheader%>
<div class="cbi-value-field"> <div class="cbi-value-field">
<input type="button" class="btn cbi-button cbi-button-apply" id="btn_start" name="start" value="<%:Start%>" <input type="button" class="btn cbi-button cbi-button-apply" id="btn_start" name="start" value="<%:Start%>"
onclick="button_action(this)" /> onclick="button_action(this)" />
@ -60,7 +60,7 @@
onclick="button_action(this)" /> onclick="button_action(this)" />
<span id="btn_disable_spinner" class="btn_spinner"></span> <span id="btn_disable_spinner" class="btn_spinner"></span>
</div> </div>
</div> <%+cbi/valuefooter%>
<%-if not btn_start_status then%> <%-if not btn_start_status then%>
<script type="text/javascript">document.getElementById("btn_start").disabled = true;</script> <script type="text/javascript">document.getElementById("btn_start").disabled = true;</script>

8
applications/luci-app-vpn-policy-routing/luasrc/view/vpn-policy-routing/status-gateways.htm
View file

@ -5,10 +5,10 @@ This is free software, licensed under the Apache License, Version 2.0
<%+cbi/valueheader%> <%+cbi/valueheader%>
<textarea rows="<%=select(2, self:cfgvalue(section):gsub('\n', '\n'))%>" <div style="font-weight:bold;">
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;" <%=self:cfgvalue(section):gsub('\n', '<br />' )%>
disabled="disabled"><%=self:cfgvalue(section):gsub('\n', '\n')%> </div>
</textarea> <br />
<div> <div>
<%- local readmeURL = "https://docs.openwrt.melmac.net/vpn-policy-routing/" -%> <%- local readmeURL = "https://docs.openwrt.melmac.net/vpn-policy-routing/" -%>

4
applications/luci-app-vpn-policy-routing/luasrc/view/vpn-policy-routing/status.htm
View file

@ -5,6 +5,8 @@ This is free software, licensed under the Apache License, Version 2.0
<%+cbi/valueheader%> <%+cbi/valueheader%>
<%=self:cfgvalue(section):gsub('\n', '<br/>' )%> <div style="font-weight:bold;">
<%=self:cfgvalue(section):gsub('\n', '<br />' )%>
</div>
<%+cbi/valuefooter%> <%+cbi/valuefooter%>

4
applications/luci-app-vpn-policy-routing/po/templates/vpn-policy-routing.pot
View file

@ -253,6 +253,10 @@ msgstr ""
msgid "Select Append for -A and Insert for -I." msgid "Select Append for -A and Insert for -I."
msgstr "" msgstr ""
#: applications/luci-app-vpn-policy-routing/luasrc/model/cbi/vpn-policy-routing.lua:153
msgid "Service Control"
msgstr ""
#: applications/luci-app-vpn-policy-routing/luasrc/model/cbi/vpn-policy-routing.lua:143 #: applications/luci-app-vpn-policy-routing/luasrc/model/cbi/vpn-policy-routing.lua:143
msgid "Service Errors" msgid "Service Errors"
msgstr "" msgstr ""