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

luci-app-https-dns-proxy: bugfix: layout issues on theme-openwrt-2020

Browse source 
Signed-off-by: Stan Grishin <stangri@melmac.net>
This commit is contained in:
Stan Grishin 2021-03-08 10:41:51 +00:00
parent 25df4114ec
commit c3849327f9
4 changed files with 32 additions and 33 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
applications/luci-app-https-dns-proxy/luasrc/model/cbi/https-dns-proxy.lua
View file

@ -88,7 +88,7 @@ else
end end
la = la or "127.0.0.1" la = la or "127.0.0.1"
lp = lp or n + 5053 lp = lp or n + 5053
packageStatus = packageStatus .. translatef("Running: %s DoH at %s:%s", getProviderName(url), la, lp) .. "\n" packageStatus = packageStatus .. translatef("%s DoH at %s:%s", getProviderName(url), la, lp) .. "\n"
else else
break break
end end
@ -107,17 +107,10 @@ m = Map("https-dns-proxy", translate("DNS HTTPS Proxy Settings"))
h = m:section(TypedSection, "_dummy", translatef("Service Status [%s %s]", packageName, packageVersion)) h = m:section(TypedSection, "_dummy", translatef("Service Status [%s %s]", packageName, packageVersion))
h.template = "cbi/nullsection" h.template = "cbi/nullsection"
ss = h:option(DummyValue, "_dummy", translate("Service Status")) ss = h:option(DummyValue, "_dummy", translate("Service Status"))
if packageStatusCode == -1 then
ss.template = packageName .. "/status" ss.template = packageName .. "/status"
ss.value = packageStatus ss.value = packageStatus
else if packageStatusCode ~= -1 then
if packageStatusCode == 0 then buttons = h:option(DummyValue, "_dummy", translate("Service Control"))
ss.template = packageName .. "/status"
else
ss.template = packageName .. "/status-textarea"
end
ss.value = packageStatus
buttons = h:option(DummyValue, "_dummy")
buttons.template = packageName .. "/buttons" buttons.template = packageName .. "/buttons"
end end

4
applications/luci-app-https-dns-proxy/luasrc/view/https-dns-proxy/buttons.htm
View file

@ -36,7 +36,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)" />
@ -58,7 +58,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>

4
applications/luci-app-https-dns-proxy/luasrc/view/https-dns-proxy/status.htm
View file

@ -5,6 +5,8 @@ This is free software, licensed under the Apache License, Version 2.0
<%+cbi/valueheader%> <%+cbi/valueheader%>
<input name="status" id="status" type="text" class="cbi-input-text" style="outline:none;border:none;box-shadow:none;background:transparent;font-weight:bold;line-height:30px;height:30px;width:50em;" value="<%=self:cfgvalue(section)%>" disabled="disabled" /> <div style="font-weight:bold;">
<%=self:cfgvalue(section):gsub('\n', '<br />' )%>
</div>
<%+cbi/valuefooter%> <%+cbi/valuefooter%>

40
applications/luci-app-https-dns-proxy/po/templates/https-dns-proxy.pot
View file

@ -1,6 +1,10 @@
msgid "" msgid ""
msgstr "Content-Type: text/plain; charset=UTF-8" msgstr "Content-Type: text/plain; charset=UTF-8"
#: applications/luci-app-https-dns-proxy/luasrc/model/cbi/https-dns-proxy.lua:91
msgid "%s DoH at %s:%s"
msgstr ""
#: applications/luci-app-https-dns-proxy/luasrc/model/cbi/https-dns-proxy.lua:72 #: applications/luci-app-https-dns-proxy/luasrc/model/cbi/https-dns-proxy.lua:72
msgid "%s is not installed or not found" msgid "%s is not installed or not found"
msgstr "" msgstr ""
@ -53,7 +57,7 @@ msgstr ""
msgid "Cloudflare (Security Protection)" msgid "Cloudflare (Security Protection)"
msgstr "" msgstr ""
#: applications/luci-app-https-dns-proxy/luasrc/model/cbi/https-dns-proxy.lua:124 #: applications/luci-app-https-dns-proxy/luasrc/model/cbi/https-dns-proxy.lua:117
msgid "Configuration" msgid "Configuration"
msgstr "" msgstr ""
@ -81,7 +85,7 @@ msgstr ""
msgid "DNSPod.cn Public DNS" msgid "DNSPod.cn Public DNS"
msgstr "" msgstr ""
#: applications/luci-app-https-dns-proxy/luasrc/model/cbi/https-dns-proxy.lua:191 #: applications/luci-app-https-dns-proxy/luasrc/model/cbi/https-dns-proxy.lua:184
msgid "DSCP Codepoint" msgid "DSCP Codepoint"
msgstr "" msgstr ""
@ -93,7 +97,7 @@ msgstr ""
msgid "Disable" msgid "Disable"
msgstr "" msgstr ""
#: applications/luci-app-https-dns-proxy/luasrc/model/cbi/https-dns-proxy.lua:132 #: applications/luci-app-https-dns-proxy/luasrc/model/cbi/https-dns-proxy.lua:125
msgid "Do not update configs" msgid "Do not update configs"
msgstr "" msgstr ""
@ -105,15 +109,15 @@ msgstr ""
msgid "For more information on different options check" msgid "For more information on different options check"
msgstr "" msgstr ""
#: applications/luci-app-https-dns-proxy/luasrc/model/cbi/https-dns-proxy.lua:134 #: applications/luci-app-https-dns-proxy/luasrc/model/cbi/https-dns-proxy.lua:127
msgid "Force Router DNS" msgid "Force Router DNS"
msgstr "" msgstr ""
#: applications/luci-app-https-dns-proxy/luasrc/model/cbi/https-dns-proxy.lua:136 #: applications/luci-app-https-dns-proxy/luasrc/model/cbi/https-dns-proxy.lua:129
msgid "Force Router DNS server to all local devices" msgid "Force Router DNS server to all local devices"
msgstr "" msgstr ""
#: applications/luci-app-https-dns-proxy/luasrc/model/cbi/https-dns-proxy.lua:134 #: applications/luci-app-https-dns-proxy/luasrc/model/cbi/https-dns-proxy.lua:127
msgid "Forces Router DNS use on local devices, also known as DNS Hijacking." msgid "Forces Router DNS use on local devices, also known as DNS Hijacking."
msgstr "" msgstr ""
@ -129,18 +133,18 @@ msgstr ""
msgid "IDNet.net (UK)" msgid "IDNet.net (UK)"
msgstr "" msgstr ""
#: applications/luci-app-https-dns-proxy/luasrc/model/cbi/https-dns-proxy.lua:125 #: applications/luci-app-https-dns-proxy/luasrc/model/cbi/https-dns-proxy.lua:118
msgid "" msgid ""
"If update option is selected, the 'DNS forwardings' section of %sDHCP and DNS" "If update option is selected, the 'DNS forwardings' section of %sDHCP and DNS"
"%s will be automatically updated to use selected DoH providers (%smore " "%s will be automatically updated to use selected DoH providers (%smore "
"information%s)." "information%s)."
msgstr "" msgstr ""
#: applications/luci-app-https-dns-proxy/luasrc/model/cbi/https-dns-proxy.lua:140 #: applications/luci-app-https-dns-proxy/luasrc/model/cbi/https-dns-proxy.lua:133
msgid "Instances" msgid "Instances"
msgstr "" msgstr ""
#: applications/luci-app-https-dns-proxy/luasrc/model/cbi/https-dns-proxy.lua:135 #: applications/luci-app-https-dns-proxy/luasrc/model/cbi/https-dns-proxy.lua:128
msgid "Let local devices use their own DNS servers if set" msgid "Let local devices use their own DNS servers if set"
msgstr "" msgstr ""
@ -152,11 +156,11 @@ msgstr ""
msgid "LibreDNS (No Ads)" msgid "LibreDNS (No Ads)"
msgstr "" msgstr ""
#: applications/luci-app-https-dns-proxy/luasrc/model/cbi/https-dns-proxy.lua:174 #: applications/luci-app-https-dns-proxy/luasrc/model/cbi/https-dns-proxy.lua:167
msgid "Listen Address" msgid "Listen Address"
msgstr "" msgstr ""
#: applications/luci-app-https-dns-proxy/luasrc/model/cbi/https-dns-proxy.lua:187 #: applications/luci-app-https-dns-proxy/luasrc/model/cbi/https-dns-proxy.lua:180
msgid "Listen Port" msgid "Listen Port"
msgstr "" msgstr ""
@ -180,7 +184,7 @@ msgstr ""
msgid "OpenDNS (Family Shield)" msgid "OpenDNS (Family Shield)"
msgstr "" msgstr ""
#: applications/luci-app-https-dns-proxy/luasrc/model/cbi/https-dns-proxy.lua:195 #: applications/luci-app-https-dns-proxy/luasrc/model/cbi/https-dns-proxy.lua:188
msgid "Proxy Server" msgid "Proxy Server"
msgstr "" msgstr ""
@ -208,12 +212,12 @@ msgstr ""
msgid "Reload" msgid "Reload"
msgstr "" msgstr ""
#: applications/luci-app-https-dns-proxy/luasrc/model/cbi/https-dns-proxy.lua:147 #: applications/luci-app-https-dns-proxy/luasrc/model/cbi/https-dns-proxy.lua:140
msgid "Resolver" msgid "Resolver"
msgstr "" msgstr ""
#: applications/luci-app-https-dns-proxy/luasrc/model/cbi/https-dns-proxy.lua:91 #: applications/luci-app-https-dns-proxy/luasrc/model/cbi/https-dns-proxy.lua:113
msgid "Running: %s DoH at %s:%s" msgid "Service Control"
msgstr "" msgstr ""
#: applications/luci-app-https-dns-proxy/luasrc/model/cbi/https-dns-proxy.lua:109 #: applications/luci-app-https-dns-proxy/luasrc/model/cbi/https-dns-proxy.lua:109
@ -240,15 +244,15 @@ msgstr ""
msgid "Unknown Provider" msgid "Unknown Provider"
msgstr "" msgstr ""
#: applications/luci-app-https-dns-proxy/luasrc/model/cbi/https-dns-proxy.lua:129 #: applications/luci-app-https-dns-proxy/luasrc/model/cbi/https-dns-proxy.lua:122
msgid "Update %s config" msgid "Update %s config"
msgstr "" msgstr ""
#: applications/luci-app-https-dns-proxy/luasrc/model/cbi/https-dns-proxy.lua:125 #: applications/luci-app-https-dns-proxy/luasrc/model/cbi/https-dns-proxy.lua:118
msgid "Update DNSMASQ Config on Start/Stop" msgid "Update DNSMASQ Config on Start/Stop"
msgstr "" msgstr ""
#: applications/luci-app-https-dns-proxy/luasrc/model/cbi/https-dns-proxy.lua:126 #: applications/luci-app-https-dns-proxy/luasrc/model/cbi/https-dns-proxy.lua:119
msgid "Update all configs" msgid "Update all configs"
msgstr "" msgstr ""