From a9ae30067386a0464ed4514bccee4e7ced0df5d7 Mon Sep 17 00:00:00 2001 From: Dirk Brenken Date: Tue, 28 Mar 2017 20:05:03 +0200 Subject: [PATCH] luci-app-adblock: fix XHTML/HTML5 markup * fix XHTML parsing errors in openwrt theme * tested with openwrt, bootstrap & material theme Signed-off-by: Dirk Brenken --- .../luci-app-adblock/luasrc/model/cbi/adblock/blacklist_tab.lua | 2 +- .../luci-app-adblock/luasrc/model/cbi/adblock/whitelist_tab.lua | 2 +- applications/luci-app-adblock/luasrc/view/adblock/runtime.htm | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/applications/luci-app-adblock/luasrc/model/cbi/adblock/blacklist_tab.lua b/applications/luci-app-adblock/luasrc/model/cbi/adblock/blacklist_tab.lua index fc6b812d1..efe40e09e 100644 --- a/applications/luci-app-adblock/luasrc/model/cbi/adblock/blacklist_tab.lua +++ b/applications/luci-app-adblock/luasrc/model/cbi/adblock/blacklist_tab.lua @@ -17,7 +17,7 @@ m = SimpleForm("input", nil) s = m:section(SimpleSection, nil, translatef("This form allows you to modify the content of the adblock blacklist (%s).
", adbinput) - .. translate("Please add only one domain per line. Comments introduced with '#' are allowed - ip addresses, wildcards & regex are not.")) + .. translate("Please add only one domain per line. Comments introduced with '#' are allowed - ip addresses, wildcards and regex are not.")) f = s:option(TextValue, "data") f.rmempty = true diff --git a/applications/luci-app-adblock/luasrc/model/cbi/adblock/whitelist_tab.lua b/applications/luci-app-adblock/luasrc/model/cbi/adblock/whitelist_tab.lua index 955969e1f..6c4dee467 100644 --- a/applications/luci-app-adblock/luasrc/model/cbi/adblock/whitelist_tab.lua +++ b/applications/luci-app-adblock/luasrc/model/cbi/adblock/whitelist_tab.lua @@ -17,7 +17,7 @@ m = SimpleForm("input", nil) s = m:section(SimpleSection, nil, translatef("This form allows you to modify the content of the adblock whitelist (%s).
", adbinput) - .. translate("Please add only one domain per line. Comments introduced with '#' are allowed - ip addresses, wildcards & regex are not.")) + .. translate("Please add only one domain per line. Comments introduced with '#' are allowed - ip addresses, wildcards and regex are not.")) f = s:option(TextValue, "data") f.rmempty = true diff --git a/applications/luci-app-adblock/luasrc/view/adblock/runtime.htm b/applications/luci-app-adblock/luasrc/view/adblock/runtime.htm index bb55d233f..4a90d4196 100644 --- a/applications/luci-app-adblock/luasrc/view/adblock/runtime.htm +++ b/applications/luci-app-adblock/luasrc/view/adblock/runtime.htm @@ -6,6 +6,6 @@ This is free software, licensed under the Apache License, Version 2.0 <%+cbi/valueheader%> - + <%+cbi/valuefooter%> -- 2.11.0