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

Merge pull request #4884 from stangri/19.07-luci-app-https-dns-proxy

Browse source 
[19.07] luci-app-https-dns-proxy: bugfix: layout issues on theme-openwrt-2020
This commit is contained in:
Stan Grishin 2021-03-09 20:35:34 -08:00 committed by GitHub
commit 310f532e26
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 36 additions and 33 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -88,7 +88,7 @@ else
end
la = la or "127.0.0.1"
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
break
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.template = "cbi/nullsection"
ss = h:option(DummyValue, "_dummy", translate("Service Status"))
if packageStatusCode == -1 then
ss.template = packageName .. "/status"
ss.value = packageStatus
else
if packageStatusCode == 0 then
ss.template = packageName .. "/status"
else
ss.template = packageName .. "/status-textarea"
end
ss.value = packageStatus
buttons = h:option(DummyValue, "_dummy")
ss.template = packageName .. "/status"
ss.value = packageStatus
if packageStatusCode ~= -1 then
buttons = h:option(DummyValue, "_dummy", translate("Service Control"))
buttons.template = packageName .. "/buttons"
end

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

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

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%>
<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%>

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

@ -1,6 +1,10 @@
msgid ""
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
msgid "%s is not installed or not found"
msgstr ""
@ -53,7 +57,7 @@ msgstr ""
msgid "Cloudflare (Security Protection)"
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"
msgstr ""
@ -81,7 +85,7 @@ msgstr ""
msgid "DNSPod.cn Public DNS"
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"
msgstr ""
@ -93,7 +97,7 @@ msgstr ""
msgid "Disable"
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"
msgstr ""
@ -105,15 +109,15 @@ msgstr ""
msgid "For more information on different options check"
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"
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"
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."
msgstr ""
@ -121,22 +125,26 @@ msgstr ""
msgid "Google"
msgstr ""
#: applications/luci-app-https-dns-proxy/root/usr/share/rpcd/acl.d/luci-app-https-dns-proxy.json:3
msgid "Grant UCI and file access for luci-app-https-dns-proxy"
msgstr ""
#: applications/luci-app-https-dns-proxy/luasrc/https-dns-proxy/providers/net.idnet.doh.lua:3
msgid "IDNet.net (UK)"
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 ""
"If update option is selected, the 'DNS forwardings' section of %sDHCP and DNS"
"%s will be automatically updated to use selected DoH providers (%smore "
"information%s)."
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"
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"
msgstr ""
@ -148,11 +156,11 @@ msgstr ""
msgid "LibreDNS (No Ads)"
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"
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"
msgstr ""
@ -176,7 +184,7 @@ msgstr ""
msgid "OpenDNS (Family Shield)"
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"
msgstr ""
@ -204,12 +212,12 @@ msgstr ""
msgid "Reload"
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"
msgstr ""
#: applications/luci-app-https-dns-proxy/luasrc/model/cbi/https-dns-proxy.lua:91
msgid "Running: %s DoH at %s:%s"
#: applications/luci-app-https-dns-proxy/luasrc/model/cbi/https-dns-proxy.lua:113
msgid "Service Control"
msgstr ""
#: applications/luci-app-https-dns-proxy/luasrc/model/cbi/https-dns-proxy.lua:109
@ -236,15 +244,15 @@ msgstr ""
msgid "Unknown Provider"
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"
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"
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"
msgstr ""