From: Stan Grishin Date: Mon, 8 Mar 2021 10:42:18 +0000 (+0000) Subject: luci-app-https-dns-proxy: bugfix: layout issues on theme-openwrt-2020 X-Git-Url: http://git.openwrt.org/?a=commitdiff_plain;h=8d6189614d38be5a5b7d837fab2246a01f32300e;p=project%2Fluci.git luci-app-https-dns-proxy: bugfix: layout issues on theme-openwrt-2020 Signed-off-by: Stan Grishin --- diff --git a/applications/luci-app-https-dns-proxy/luasrc/model/cbi/https-dns-proxy.lua b/applications/luci-app-https-dns-proxy/luasrc/model/cbi/https-dns-proxy.lua index 98fabf86ae..620c8d6c88 100644 --- a/applications/luci-app-https-dns-proxy/luasrc/model/cbi/https-dns-proxy.lua +++ b/applications/luci-app-https-dns-proxy/luasrc/model/cbi/https-dns-proxy.lua @@ -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 diff --git a/applications/luci-app-https-dns-proxy/luasrc/view/https-dns-proxy/buttons.htm b/applications/luci-app-https-dns-proxy/luasrc/view/https-dns-proxy/buttons.htm index c5164d7292..9cfd25e50e 100644 --- a/applications/luci-app-https-dns-proxy/luasrc/view/https-dns-proxy/buttons.htm +++ b/applications/luci-app-https-dns-proxy/luasrc/view/https-dns-proxy/buttons.htm @@ -36,7 +36,7 @@ end -%> -
+<%+cbi/valueheader%>
@@ -58,7 +58,7 @@ onclick="button_action(this)" />
-
+<%+cbi/valuefooter%> <%-if not btn_start_status then%> diff --git a/applications/luci-app-https-dns-proxy/luasrc/view/https-dns-proxy/status.htm b/applications/luci-app-https-dns-proxy/luasrc/view/https-dns-proxy/status.htm index c453428405..b02c7faa82 100644 --- a/applications/luci-app-https-dns-proxy/luasrc/view/https-dns-proxy/status.htm +++ b/applications/luci-app-https-dns-proxy/luasrc/view/https-dns-proxy/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', '
' )%> +
<%+cbi/valuefooter%> diff --git a/applications/luci-app-https-dns-proxy/po/templates/https-dns-proxy.pot b/applications/luci-app-https-dns-proxy/po/templates/https-dns-proxy.pot index adf088c7cc..4bec3aa904 100644 --- a/applications/luci-app-https-dns-proxy/po/templates/https-dns-proxy.pot +++ b/applications/luci-app-https-dns-proxy/po/templates/https-dns-proxy.pot @@ -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 ""