diff options
| author | Florian Eckert <fe@dev.tdt.de> | 2019-10-10 23:03:53 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-10-10 23:03:53 +0200 |
| commit | b489aae226e6baaffb7cdf7073ea1870bec110e9 (patch) | |
| tree | 4ddafe40623c72bf5ac992334d620d30ce1cd9ce /applications | |
| parent | dd6818e188b2d07337479c079749f2f538926d79 (diff) | |
| parent | 70d87f6e9e70d1ce38096ef29e9dafde82e275e4 (diff) | |
Merge pull request #3169 from stangri/master-luci-app-simple-adblock
luci-app-simple-adblock: bugfix: fix invalid <br> entries
Diffstat (limited to 'applications')
3 files changed, 9 insertions, 10 deletions
diff --git a/applications/luci-app-simple-adblock/Makefile b/applications/luci-app-simple-adblock/Makefile index b7d1a79fbc..a46abb821e 100644 --- a/applications/luci-app-simple-adblock/Makefile +++ b/applications/luci-app-simple-adblock/Makefile @@ -10,7 +10,7 @@ LUCI_TITLE:=Simple Adblock Web UI LUCI_DESCRIPTION:=Provides Web UI for simple-adblock service. LUCI_DEPENDS:=+luci-mod-admin-full +simple-adblock LUCI_PKGARCH:=all -PKG_RELEASE:=37 +PKG_RELEASE:=38 include ../../luci.mk diff --git a/applications/luci-app-simple-adblock/luasrc/controller/simple-adblock.lua b/applications/luci-app-simple-adblock/luasrc/controller/simple-adblock.lua index 98f69ac968..acfea5bf38 100644 --- a/applications/luci-app-simple-adblock/luasrc/controller/simple-adblock.lua +++ b/applications/luci-app-simple-adblock/luasrc/controller/simple-adblock.lua @@ -1,7 +1,6 @@ module("luci.controller.simple-adblock", package.seeall) function index() - if not nixio.fs.access("/etc/config/simple-adblock") then - return + if nixio.fs.access("/etc/config/simple-adblock") then + entry({"admin", "services", "simple-adblock"}, cbi("simple-adblock"), _("Simple AdBlock")) end - entry({"admin", "services", "simple-adblock"}, cbi("simple-adblock"), _("Simple AdBlock")) end 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 f4153355d6..9f392a20c7 100644 --- a/applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua +++ b/applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua @@ -187,15 +187,15 @@ local dns_descr = translate("Pick the DNS resolution option to create the adbloc .. translate("README") .. [[</a>]] .. " " .. translate("for details.") if not checkDnsmasq then - dns_descr = dns_descr .. "</br>" .. translate("Please note that") .. " <i>dnsmasq.addnhosts</i> " .. translate("is not supported on this system.") - dns_descr = dns_descr .. "</br>" .. translate("Please note that") .. " <i>dnsmasq.conf</i> " .. translate("is not supported on this system.") - dns_descr = dns_descr .. "</br>" .. translate("Please note that") .. " <i>dnsmasq.ipset</i> " .. translate("is not supported on this system.") - dns_descr = dns_descr .. "</br>" .. translate("Please note that") .. " <i>dnsmasq.servers</i> " .. translate("is not supported on this system.") + dns_descr = dns_descr .. "<br />" .. translate("Please note that") .. " <i>dnsmasq.addnhosts</i> " .. translate("is not supported on this system.") + dns_descr = dns_descr .. "<br />" .. translate("Please note that") .. " <i>dnsmasq.conf</i> " .. translate("is not supported on this system.") + dns_descr = dns_descr .. "<br />" .. translate("Please note that") .. " <i>dnsmasq.ipset</i> " .. translate("is not supported on this system.") + dns_descr = dns_descr .. "<br />" .. translate("Please note that") .. " <i>dnsmasq.servers</i> " .. translate("is not supported on this system.") elseif not checkDnsmasqIpset then - dns_descr = dns_descr .. "</br>" .. translate("Please note that") .. " <i>dnsmasq.ipset</i> " .. translate("is not supported on this system.") + dns_descr = dns_descr .. "<br />" .. translate("Please note that") .. " <i>dnsmasq.ipset</i> " .. translate("is not supported on this system.") end if not checkUnbound then - dns_descr = dns_descr .. "</br>" .. translate("Please note that") .. " <i>unbound.adb_list</i> " .. translate("is not supported on this system.") + dns_descr = dns_descr .. "<br />" .. translate("Please note that") .. " <i>unbound.adb_list</i> " .. translate("is not supported on this system.") end dns = s:taboption("advanced", ListValue, "dns", translate("DNS Service"), dns_descr) |