diff options
author | Stan Grishin <stangri@melmac.ca> | 2023-07-28 23:26:59 +0000 |
---|---|---|
committer | Stan Grishin <stangri@melmac.ca> | 2023-07-28 23:30:24 +0000 |
commit | 8001cc5f2fce4b54fccca46157d42cbfca9f5894 (patch) | |
tree | 6bf2c4f1478c073474dd52e1bfa50ee18e5fb365 /applications/luci-app-simple-adblock/htdocs/luci-static/resources | |
parent | 68a671d2dabde5a776d377fd3fd1abf1c3ab30e3 (diff) |
luci-app-simple-adblock: bugfix: unsupported DNS options display
* bugfix: move the break tag in front of the unsupported DNS options to pretty up
the output
* use pkg.Name in RPCD calls
* slightly change the version display in WebUI to make it consistent with other
packages
Signed-off-by: Stan Grishin <stangri@melmac.ca>
Diffstat (limited to 'applications/luci-app-simple-adblock/htdocs/luci-static/resources')
2 files changed, 5 insertions, 5 deletions
diff --git a/applications/luci-app-simple-adblock/htdocs/luci-static/resources/simple-adblock/status.js b/applications/luci-app-simple-adblock/htdocs/luci-static/resources/simple-adblock/status.js index c57de633b4..6c5ef19c11 100644 --- a/applications/luci-app-simple-adblock/htdocs/luci-static/resources/simple-adblock/status.js +++ b/applications/luci-app-simple-adblock/htdocs/luci-static/resources/simple-adblock/status.js @@ -79,7 +79,7 @@ var RPC = { var status = baseclass.extend({ render: function () { return Promise.all([ - L.resolveDefault(getInitStatus(), {}), + L.resolveDefault(getInitStatus(pkg.Name), {}), ]).then(function (data) { var replyStatus = data[0]; var text =""; @@ -103,7 +103,7 @@ var status = baseclass.extend({ var header = E('h2', {}, _("Simple AdBlock - Status")) var statusTitle = E('label', { class: 'cbi-value-title' }, _("Service Status")); if (reply.version) { - text += _("Version: %s").format(reply.version) + " - "; + text += _("Version %s").format(reply.version) + " - "; switch (reply.status) { case 'statusSuccess': text += statusTable[reply.status] + "."; diff --git a/applications/luci-app-simple-adblock/htdocs/luci-static/resources/view/simple-adblock/overview.js b/applications/luci-app-simple-adblock/htdocs/luci-static/resources/view/simple-adblock/overview.js index 8dd94cc1cf..c0066dd100 100644 --- a/applications/luci-app-simple-adblock/htdocs/luci-static/resources/view/simple-adblock/overview.js +++ b/applications/luci-app-simple-adblock/htdocs/luci-static/resources/view/simple-adblock/overview.js @@ -21,7 +21,7 @@ return view.extend({ render: function () { return Promise.all([ - L.resolveDefault(adb.getPlatformSupport(), {}), + L.resolveDefault(adb.getPlatformSupport(pkg.Name), {}), ]).then(function (data) { var replyPlatform = data[0]; var status, m, s, o; @@ -71,10 +71,10 @@ return view.extend({ } else { if (!(replyPlatform[pkg.Name].dnsmasq_ipset_support)) { - text += _("Please note that %s is not supported on this system.").format("<i>dnsmasq.ipset</i>") + "<br />"; + text += "<br />" + _("Please note that %s is not supported on this system.").format("<i>dnsmasq.ipset</i>"); } if (!(replyPlatform[pkg.Name].dnsmasq_nftset_support)) { - text += _("Please note that %s is not supported on this system.").format("<i>dnsmasq.nftset</i>") + "<br />"; + text += "<br />" + _("Please note that %s is not supported on this system.").format("<i>dnsmasq.nftset</i>"); } } if (!(replyPlatform[pkg.Name].unbound_installed)) { |