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

luci-app-simple-adblock: bugfix: unsupported DNS options display

Browse source 
* 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>
This commit is contained in:
Stan Grishin 2023-07-28 23:26:59 +00:00
parent 68a671d2da
commit 8001cc5f2f
4 changed files with 7 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
applications/luci-app-simple-adblock/Makefile
View file

@ -5,7 +5,7 @@ include $(TOPDIR)/rules.mk
PKG_LICENSE:=GPL-3.0-or-later PKG_LICENSE:=GPL-3.0-or-later
PKG_MAINTAINER:=Stan Grishin <stangri@melmac.ca> PKG_MAINTAINER:=Stan Grishin <stangri@melmac.ca>
PKG_VERSION:=1.9.5-1 PKG_VERSION:=1.9.5-3
LUCI_TITLE:=Simple Adblock Web UI LUCI_TITLE:=Simple Adblock Web UI
LUCI_DESCRIPTION:=Provides Web UI for simple-adblock service. LUCI_DESCRIPTION:=Provides Web UI for simple-adblock service.

4
applications/luci-app-simple-adblock/htdocs/luci-static/resources/simple-adblock/status.js
View file

@ -79,7 +79,7 @@ var RPC = {
var status = baseclass.extend({ var status = baseclass.extend({
render: function () { render: function () {
return Promise.all([ return Promise.all([
L.resolveDefault(getInitStatus(), {}), L.resolveDefault(getInitStatus(pkg.Name), {}),
]).then(function (data) { ]).then(function (data) {
var replyStatus = data[0]; var replyStatus = data[0];
var text =""; var text ="";
@ -103,7 +103,7 @@ var status = baseclass.extend({
var header = E('h2', {}, _("Simple AdBlock - Status")) var header = E('h2', {}, _("Simple AdBlock - Status"))
var statusTitle = E('label', { class: 'cbi-value-title' }, _("Service Status")); var statusTitle = E('label', { class: 'cbi-value-title' }, _("Service Status"));
if (reply.version) { if (reply.version) {
text += _("Version: %s").format(reply.version) + " - "; text += _("Version %s").format(reply.version) + " - ";
switch (reply.status) { switch (reply.status) {
case 'statusSuccess': case 'statusSuccess':
text += statusTable[reply.status] + "."; text += statusTable[reply.status] + ".";

6
applications/luci-app-simple-adblock/htdocs/luci-static/resources/view/simple-adblock/overview.js
View file

@ -21,7 +21,7 @@ return view.extend({
render: function () { render: function () {
return Promise.all([ return Promise.all([
L.resolveDefault(adb.getPlatformSupport(), {}), L.resolveDefault(adb.getPlatformSupport(pkg.Name), {}),
]).then(function (data) { ]).then(function (data) {
var replyPlatform = data[0]; var replyPlatform = data[0];
var status, m, s, o; var status, m, s, o;
@ -71,10 +71,10 @@ return view.extend({
} }
else { else {
if (!(replyPlatform[pkg.Name].dnsmasq_ipset_support)) { 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)) { 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)) { if (!(replyPlatform[pkg.Name].unbound_installed)) {

2
applications/luci-app-simple-adblock/po/templates/simple-adblock.pot
View file

@ -391,7 +391,7 @@ msgid "Verbose output"
msgstr "" msgstr ""
#: applications/luci-app-simple-adblock/htdocs/luci-static/resources/simple-adblock/status.js:106 #: applications/luci-app-simple-adblock/htdocs/luci-static/resources/simple-adblock/status.js:106
msgid "Version: %s" msgid "Version %s"
msgstr "" msgstr ""
#: applications/luci-app-simple-adblock/htdocs/luci-static/resources/simple-adblock/status.js:98 #: applications/luci-app-simple-adblock/htdocs/luci-static/resources/simple-adblock/status.js:98