luci-app-simple-adblock: bugfix: template layout on theme-openwrt-2020

Signed-off-by: Stan Grishin <stangri@melmac.net>

diff --git a/applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua b/applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua
index dfe3b8a365baea5215284e4176a4c6754781c0a9..b60123e5d587fdcc74e00d555139e89db1dd9719 100644 (file)
--- a/applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua
+++ b/applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua
@@ -195,7 +195,7 @@ else
                ss = h:option(DummyValue, "_dummy", translate("Service Status"))
                ss.template = "simple-adblock/status"
                if tmpfsStatus == "statusSuccess" then
-                       ss.value = translatef("%s is blocking %s domains (with %s).", packageVersion, getFileLines(outputFile), targetDNS)
+                       ss.value = translatef("Blocking %s domains (with %s).", getFileLines(outputFile), targetDNS)
                else
                        ss.value = statusTable[tmpfsStatus]
                end
@@ -206,7 +206,7 @@ else
                end
                if tmpfsError then
                        es = h:option(DummyValue, "_dummy", translate("Collected Errors"))
-                       es.template = "simple-adblock/error"
+                       es.template = "simple-adblock/status"
                        es.value = ""
                        local err, e, url
                        for err in tmpfsError:gmatch("[%p%w]+") do
@@ -220,7 +220,7 @@ else
                end
        end
        if packageVersion ~= "" then
-               buttons = h:option(DummyValue, "_dummy")
+               buttons = h:option(DummyValue, "_dummy", translate("Service Control"))
                buttons.template = packageName .. "/buttons"
        end
 end

diff --git a/applications/luci-app-simple-adblock/luasrc/view/simple-adblock/buttons.htm b/applications/luci-app-simple-adblock/luasrc/view/simple-adblock/buttons.htm
index 74eb5e8394838b35406a5e95e24aff6f143be7d2..131112c8a78b955cde990c815c80d8bd4594a2ca 100644 (file)
--- a/applications/luci-app-simple-adblock/luasrc/view/simple-adblock/buttons.htm
+++ b/applications/luci-app-simple-adblock/luasrc/view/simple-adblock/buttons.htm
@@ -47,7 +47,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)" />
@@ -69,7 +69,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-simple-adblock/luasrc/view/simple-adblock/status.htm b/applications/luci-app-simple-adblock/luasrc/view/simple-adblock/status.htm
index c4534284058219e001a1751b457a71a072fc1031..b02c7faa8250c0edcceba3b6baf4738903e6ec65 100644 (file)
--- a/applications/luci-app-simple-adblock/luasrc/view/simple-adblock/status.htm
+++ b/applications/luci-app-simple-adblock/luasrc/view/simple-adblock/status.htm
@@ -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%>

diff --git a/applications/luci-app-simple-adblock/po/templates/simple-adblock.pot b/applications/luci-app-simple-adblock/po/templates/simple-adblock.pot
index 4a2b29b1c7f120a42f4b22dd38bb33adac61ed0b..93193918d85cc9dc28299170bd4e47a0cbb0ae07 100644 (file)
--- a/applications/luci-app-simple-adblock/po/templates/simple-adblock.pot
+++ b/applications/luci-app-simple-adblock/po/templates/simple-adblock.pot
@@ -9,10 +9,6 @@ msgstr ""
 msgid "%s Error: %s %s"
 msgstr ""
 
-#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:198
-msgid "%s is blocking %s domains (with %s)."
-msgstr ""
-
 #: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:129
 msgid "%s is not installed or not found"
 msgstr ""
@@ -66,6 +62,10 @@ msgstr ""
 msgid "Blocked Hosts URLs"
 msgstr ""
 
+#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:198
+msgid "Blocking %s domains (with %s)."
+msgstr ""
+
 #: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:188
 msgid "Cache file containing %s domains found."
 msgstr ""
@@ -185,6 +185,10 @@ msgstr ""
 msgid "Forces Router DNS use on local devices, also known as DNS Hijacking."
 msgstr ""
 
+#: applications/luci-app-simple-adblock/root/usr/share/rpcd/acl.d/luci-app-simple-adblock.json:3
+msgid "Grant UCI and file access for luci-app-simple-adblock"
+msgstr ""
+
 #: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:293
 msgid "IPv6 Support"
 msgstr ""
@@ -265,6 +269,10 @@ msgstr ""
 msgid "Run service after set delay on boot."
 msgstr ""
 
+#: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:223
+msgid "Service Control"
+msgstr ""
+
 #: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:172
 #: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:182
 #: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:195