diff options
| author | Hannu Nyman <hannu.nyman@iki.fi> | 2017-03-28 21:12:27 +0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-03-28 21:12:27 +0300 |
| commit | 3dc08a354b4f5212fdaf54764729a025a14167cf (patch) | |
| tree | ab06285faab4135f276e608791cdefce062c4c73 | |
| parent | 8504fd64fc71a2c8e9ae8a7a6bfd71f648fd2782 (diff) | |
| parent | a9ae30067386a0464ed4514bccee4e7ced0df5d7 (diff) | |
Merge pull request #1088 from dibdot/luci-app-adblock
luci-app-adblock: fix XHTML/HTML5 markup
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).<br />", 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).<br />", 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%> -<input name="runtime" id="runtime" type="text" class="cbi-input-text" style="border: none; box-shadow: none; background-color: #ffffff; color: #0069d6;" value="<%=self:cfgvalue(section)%>" disabled /> +<input name="runtime" id="runtime" type="text" class="cbi-input-text" style="border: none; box-shadow: none; background-color: #ffffff; color: #0069d6;" value="<%=self:cfgvalue(section)%>" disabled="disabled" /> <%+cbi/valuefooter%> |