diff options
14 files changed, 44 insertions, 44 deletions
diff --git a/applications/luci-livestats/luasrc/controller/livestats.lua b/applications/luci-livestats/luasrc/controller/livestats.lua index 39b74dc18e..b476962526 100644 --- a/applications/luci-livestats/luasrc/controller/livestats.lua +++ b/applications/luci-livestats/luasrc/controller/livestats.lua @@ -20,10 +20,10 @@ function index() luci.i18n.loadc("livestats") entry( {"admin", "status", "wifistat"}, template("livestats/wireless"), luci.i18n.translate("Realtime Wireless Status"), 90 ).i18n = "livestats" - entry( {"admin", "status", "trafstat"}, template("livestats/traffic"), luci.i18n.translate("livestats_stat_traffic"), 91 ).i18n = "livestats" - entry( {"admin", "status", "loadavg"}, template("livestats/loadavg"), luci.i18n.translate("livestats_stat_loadavg"), 92 ).i18n = "livestats" + entry( {"admin", "status", "trafstat"}, template("livestats/traffic"), luci.i18n.translate("Realtime Traffic Status"), 91 ).i18n = "livestats" + entry( {"admin", "status", "loadavg"}, template("livestats/loadavg"), luci.i18n.translate("Realtime Load Status"), 92 ).i18n = "livestats" entry( {"mini", "network", "wifistat"}, template("livestats/wireless"), luci.i18n.translate("Realtime Wireless Status"), 90 ).i18n = "livestats" - entry( {"mini", "network", "trafstat"}, template("livestats/traffic"), luci.i18n.translate("livestats_stat_traffic"), 91 ).i18n = "livestats" - entry( {"mini", "system", "loadavg"}, template("livestats/loadavg"), luci.i18n.translate("livestats_stat_loadavg"), 92 ).i18n = "livestats" + entry( {"mini", "network", "trafstat"}, template("livestats/traffic"), luci.i18n.translate("Realtime Traffic Status"), 91 ).i18n = "livestats" + entry( {"mini", "system", "loadavg"}, template("livestats/loadavg"), luci.i18n.translate("Realtime Load Status"), 92 ).i18n = "livestats" end diff --git a/libs/cbi/luasrc/view/cbi/ucisection.htm b/libs/cbi/luasrc/view/cbi/ucisection.htm index aef770e17a..fa083c68f4 100644 --- a/libs/cbi/luasrc/view/cbi/ucisection.htm +++ b/libs/cbi/luasrc/view/cbi/ucisection.htm @@ -50,12 +50,12 @@ $Id$ <%- end -%> - }, '', '<%-:cbi_manual-%>'); + }, '', '<%-: -- custom -- -%>'); </script> <% end %> <% else %> <select id="cbi.opt.<%=self.config%>.<%=section%>" name="cbi.opt.<%=self.config%>.<%=section%>"> - <option><%:-- Additional Field --%></option> + <option><%: -- Additional Field -- %></option> <% for key, val in pairs(self.optionals[section]) do -%> <option id="cbi-<%=self.config.."-"..section.."-"..val.option%>" value="<%=val.option%>"><%=striptags(val.title)%></option> <%- end %> diff --git a/libs/cbi/luasrc/view/cbi/value.htm b/libs/cbi/luasrc/view/cbi/value.htm index de083e62cf..e8592cfdbc 100644 --- a/libs/cbi/luasrc/view/cbi/value.htm +++ b/libs/cbi/luasrc/view/cbi/value.htm @@ -31,7 +31,7 @@ $Id$ <%- if self.combobox_manual then -%> <%-=self.combobox_manual-%> <%- else -%> - <%-:cbi_manual-%> + <%-: -- custom -- -%> <%- end -%>'); </script> <% end -%> diff --git a/modules/admin-full/luasrc/model/cbi/admin_system/fstab.lua b/modules/admin-full/luasrc/model/cbi/admin_system/fstab.lua index e55c44c885..a70174d395 100644 --- a/modules/admin-full/luasrc/model/cbi/admin_system/fstab.lua +++ b/modules/admin-full/luasrc/model/cbi/admin_system/fstab.lua @@ -71,7 +71,7 @@ end mount:option(Value, "target", translate("Mount Point")) mount:option(Value, "fstype", translate("Filesystem"), translate("The filesystem that was used to format the memory (<abbr title=\"for example\">e.g.</abbr> <samp><abbr title=\"Third Extended Filesystem\">ext3</abbr></samp>)")) -mount:option(Value, "options", translate("Options"), translatef("see \'%s\' manpage"%s' manpage", "mount")) +mount:option(Value, "options", translate("Options"), translate("See \"mount\" manpage for details")) swap = m:section(TypedSection, "swap", "SWAP", translate("If your physical memory is insufficient unused data can be temporarily swapped to a swap-device resulting in a higher amount of usable <abbr title=\"Random Access Memory\">RAM</abbr>. Be aware that swapping data is a very slow process as the swap-device cannot be accessed with the high datarates of the <abbr title=\"Random Access Memory\">RAM</abbr>.")) diff --git a/modules/admin-full/luasrc/view/admin_status/routes.htm b/modules/admin-full/luasrc/view/admin_status/routes.htm index dcfb4ec62a..f859196719 100644 --- a/modules/admin-full/luasrc/view/admin_status/routes.htm +++ b/modules/admin-full/luasrc/view/admin_status/routes.htm @@ -26,7 +26,7 @@ $Id$ <div class="cbi-map" id="cbi-network"> <h2><a id="content" name="content"><%:Routes%></a></h2> - <div class="cbi-map-descr"><%:a_n_routes1%></div> + <div class="cbi-map-descr"><%:The following rules are currently active on this system.%></div> <fieldset class="cbi-section" id="cbi-table-table"> <legend><%_Active <abbr title="Internet Protocol Version 4">IPv4</abbr>-Routes%></legend> diff --git a/modules/admin-full/luasrc/view/admin_system/upgrade.htm b/modules/admin-full/luasrc/view/admin_system/upgrade.htm index ddf4fda456..1083a16188 100644 --- a/modules/admin-full/luasrc/view/admin_system/upgrade.htm +++ b/modules/admin-full/luasrc/view/admin_system/upgrade.htm @@ -46,7 +46,7 @@ $Id$ </div> </form> <% else %> - <div class="error"><%:Sorry. + <div class="error"><%_ Sorry. OpenWrt does not support a system upgrade on this platform.<br /> You need to manually flash your device. %></div> <% end %> diff --git a/themes/fledermaus/luasrc/view/themes/fledermaus/header.htm b/themes/fledermaus/luasrc/view/themes/fledermaus/header.htm index 6377381b47..b35bb71a2e 100644 --- a/themes/fledermaus/luasrc/view/themes/fledermaus/header.htm +++ b/themes/fledermaus/luasrc/view/themes/fledermaus/header.htm @@ -43,7 +43,7 @@ require("luci.http").prepare_content("text/html") <% if node and node.css then %><link rel="stylesheet" type="text/css" href="<%=resource%>/<%=node.css%>" /><% end %> <meta http-equiv="content-type" content="application/xhtml+xml; charset=utf-8" /> <meta http-equiv="content-script-type" content="text/javascript" /> - <title><%=striptags( hostname .. ( (node and node.title) and ' - ' .. node.title or '')) %> - LuCI</title> + <title><%=striptags( hostname .. ( (node and node.title) and ' - ' .. pcdata(node.title) or '')) %> - LuCI</title> <!--[if lt IE 7]> <script type="text/javascript"> @@ -76,7 +76,7 @@ for k,v in pairs(request) do if c.nodes and c.nodes[v] then c = c.nodes[v] url = url .. "/" .. v - %><a href="<%=url%>"><%=c.title or v%></a> <% if k ~= #request then %>» <% end + %><a href="<%=url%>"><%=pcdata(c.title or v)%></a> <% if k ~= #request then %>» <% end end end %> @@ -110,7 +110,7 @@ local function submenu(prefix, node) href = (nnode.query) and href .. luci.http.build_querystring(nnode.query) or href %> <li> - <span<% if nnode._menu_selected then %> class="active"<%end%>><a href="<%=luci.util.pcdata(href)%>"><%=nnode.title%></a></span> + <span<% if nnode._menu_selected then %> class="active"<%end%>><a href="<%=pcdata(href)%>"><%=pcdata(nnode.title)%></a></span> <%- submenu(prefix .. v.name .. "/", nnode) %> </li> <%- end %> @@ -133,7 +133,7 @@ if cattree and cattree.nodes then if not node.hidden and node.title and node.target then local href = controller.."/"..category.."/"..k.name href = (k.query) and href .. luci.http.build_querystring(k.query) or href %> - <div<% if node._menu_selected then %> class="preactive"<%end%>><a href="<%=href%>"><%=node.title%></a> + <div<% if node._menu_selected then %> class="preactive"<%end%>><a href="<%=href%>"><%=pcdata(node.title)%></a> <%submenu("/" .. category .. "/" .. k.name .. "/", node)%> </div> <% end @@ -145,7 +145,7 @@ end <ul><% for k,node in pairs(tree.nodes) do if node.title and not node.hidden then %> - <li<% if request[1] == k then %> class="active"<%end%>><a href="<%=controller%>/<%=k%>"><%=node.title%></a></li> + <li<% if request[1] == k then %> class="active"<%end%>><a href="<%=controller%>/<%=k%>"><%=pcdata(node.title)%></a></li> <% end end%> </ul> diff --git a/themes/freifunk-bno/luasrc/view/themes/freifunk-bno/header.htm b/themes/freifunk-bno/luasrc/view/themes/freifunk-bno/header.htm index 94d7f0eec7..88e35ca1d4 100644 --- a/themes/freifunk-bno/luasrc/view/themes/freifunk-bno/header.htm +++ b/themes/freifunk-bno/luasrc/view/themes/freifunk-bno/header.htm @@ -44,7 +44,7 @@ require("luci.http").prepare_content("text/html") <link rel="shortcut icon" href="<%=media%>/images/favicon.ico" /> <meta http-equiv="content-type" content="application/xhtml+xml; charset=utf-8" /> <meta http-equiv="content-script-type" content="text/javascript" /> - <title><%=striptags( hostname .. ( (node and node.title) and ' - ' .. node.title or '')) %> - LuCI</title> + <title><%=striptags( hostname .. ( (node and node.title) and ' - ' .. pcdata(node.title) or '')) %> - LuCI</title> <!--[if lt IE 7]> <script type="text/javascript"> @@ -92,7 +92,7 @@ for k,v in pairs(request) do if c.nodes and c.nodes[v] then c = c.nodes[v] url = url .. "/" .. v - %><a href="<%=url%>"><%=c.title or v%></a> <% if k ~= #request then %>» <% end + %><a href="<%=url%>"><%=pcdata(c.title or v)%></a> <% if k ~= #request then %>» <% end end end %> @@ -126,7 +126,7 @@ local function submenu(prefix, node) href = (nnode.query) and href .. luci.http.build_querystring(nnode.query) or href %> <li> - <span<% if nnode._menu_selected then %> class="active"<%end%>><a href="<%=luci.util.pcdata(href)%>"><%=nnode.title%></a></span> + <span<% if nnode._menu_selected then %> class="active"<%end%>><a href="<%=luci.util.pcdata(href)%>"><%=pcdata(nnode.title)%></a></span> <%- submenu(prefix .. v.name .. "/", nnode) %> </li> <%- end %> @@ -149,7 +149,7 @@ if cattree and cattree.nodes then if not node.hidden and node.title and node.target then local href = controller.."/"..category.."/"..k.name href = (k.query) and href .. luci.http.build_querystring(k.query) or href %> - <div<% if node._menu_selected then %> class="preactive"<%end%>><a href="<%=href%>"><%=node.title%></a> + <div<% if node._menu_selected then %> class="preactive"<%end%>><a href="<%=href%>"><%=pcdata(node.title)%></a> <%submenu("/" .. category .. "/" .. k.name .. "/", node)%> </div> <% end @@ -161,7 +161,7 @@ end <ul><% for k,node in pairs(tree.nodes) do if node.title and not node.hidden then %> - <li<% if request[1] == k then %> class="active"<%end%>><a href="<%=controller%>/<%=k%>"><%=node.title%></a></li> + <li<% if request[1] == k then %> class="active"<%end%>><a href="<%=controller%>/<%=k%>"><%=pcdata(node.title)%></a></li> <% end end%> </ul> diff --git a/themes/freifunk-hannover/luasrc/view/themes/freifunk-hannover/header.htm b/themes/freifunk-hannover/luasrc/view/themes/freifunk-hannover/header.htm index 06aae3b598..bdd17ac4a4 100644 --- a/themes/freifunk-hannover/luasrc/view/themes/freifunk-hannover/header.htm +++ b/themes/freifunk-hannover/luasrc/view/themes/freifunk-hannover/header.htm @@ -49,7 +49,7 @@ require("luci.http").prepare_content("application/xhtml+xml") <script type="text/javascript" src="<%=resource%>/VarType.js"></script> <script type="text/javascript" src="<%=resource%>/XHTML1.js"></script> <script type="text/javascript" src="<%=resource%>/Dropdowns.js"></script> -<title><%=striptags( hostname .. ( (node and node.title) and ' - ' .. node.title or '')) %> - LuCI</title> +<title><%=striptags( hostname .. ( (node and node.title) and ' - ' .. pcdata(node.title) or '')) %> - LuCI</title> </head> <body class="lang_<%=luci.i18n.context.lang%>"> @@ -96,7 +96,7 @@ local function submenu(prefix, node) local href = controller .. prefix .. v.name .. "/" href = (nnode.query) and href .. luci.http.build_querystring(nnode.query) or href %> -<li><a<% if nnode._menu_selected then %> class="active"<%end%> href="<%=luci.util.pcdata(href)%>"><%=nnode.title%></a><%- +<li><a<% if nnode._menu_selected then %> class="active"<%end%> href="<%=luci.util.pcdata(href)%>"><%=pcdata(nnode.title)%></a><%- submenu(prefix .. v.name .. "/", nnode) %></li> <%- @@ -122,7 +122,7 @@ if cattree and cattree.nodes then local href = controller.."/"..category.."/"..k.name.."/" href = (k.query) and href .. luci.http.build_querystring(k.query) or href %> -<li><a<% if node._menu_selected then %> class="preactive"<%end%> href="<%=href%>"><%=node.title%></a><% +<li><a<% if node._menu_selected then %> class="preactive"<%end%> href="<%=href%>"><%=pcdata(node.title)%></a><% submenu("/" .. category .. "/" .. k.name .. "/", node) %></li><% end end @@ -133,7 +133,7 @@ end <ul id="modemenu"><% for k,node in pairs(tree.nodes) do if node.title and not node.hidden then %> -<li><a<% if request[1] == k then %> class="active"<%end%> href="<%=controller%>/<%=k%>/"><%=node.title%></a></li><% +<li><a<% if request[1] == k then %> class="active"<%end%> href="<%=controller%>/<%=k%>/"><%=pcdata(node.title)%></a></li><% end end %> diff --git a/themes/freifunk/luasrc/view/themes/freifunk/header.htm b/themes/freifunk/luasrc/view/themes/freifunk/header.htm index 53c2f54529..f72df49381 100644 --- a/themes/freifunk/luasrc/view/themes/freifunk/header.htm +++ b/themes/freifunk/luasrc/view/themes/freifunk/header.htm @@ -44,7 +44,7 @@ require("luci.http").prepare_content("text/html") <link rel="shortcut icon" href="<%=media%>/images/favicon.ico" /> <meta http-equiv="content-type" content="application/xhtml+xml; charset=utf-8" /> <meta http-equiv="content-script-type" content="text/javascript" /> - <title><%=striptags( hostname .. ( (node and node.title) and ' - ' .. node.title or '')) %> - LuCI</title> + <title><%=striptags( hostname .. ( (node and node.title) and ' - ' .. pcdata(node.title) or '')) %> - LuCI</title> <!--[if lt IE 7]> <script type="text/javascript"> @@ -92,7 +92,7 @@ for k,v in pairs(request) do if c.nodes and c.nodes[v] then c = c.nodes[v] url = url .. "/" .. v - %><a href="<%=url%>"><%=c.title or v%></a> <% if k ~= #request then %>» <% end + %><a href="<%=url%>"><%=pcdata(c.title or v)%></a> <% if k ~= #request then %>» <% end end end %> @@ -126,7 +126,7 @@ local function submenu(prefix, node) href = (nnode.query) and href .. luci.http.build_querystring(nnode.query) or href %> <li> - <span<% if nnode._menu_selected then %> class="active"<%end%>><a href="<%=luci.util.pcdata(href)%>"><%=nnode.title%></a></span> + <span<% if nnode._menu_selected then %> class="active"<%end%>><a href="<%=luci.util.pcdata(href)%>"><%=pcdata(nnode.title)%></a></span> <%- submenu(prefix .. v.name .. "/", nnode) %> </li> <%- end %> @@ -149,7 +149,7 @@ if cattree and cattree.nodes then if not node.hidden and node.title and node.target then local href = controller.."/"..category.."/"..k.name href = (k.query) and href .. luci.http.build_querystring(k.query) or href %> - <div<% if node._menu_selected then %> class="preactive"<%end%>><a href="<%=href%>"><%=node.title%></a> + <div<% if node._menu_selected then %> class="preactive"<%end%>><a href="<%=href%>"><%=pcdata(node.title)%></a> <%submenu("/" .. category .. "/" .. k.name .. "/", node)%> </div> <% end @@ -161,7 +161,7 @@ end <ul><% for k,node in pairs(tree.nodes) do if node.title and not node.hidden then %> - <li<% if request[1] == k then %> class="active"<%end%>><a href="<%=controller%>/<%=k%>"><%=node.title%></a></li> + <li<% if request[1] == k then %> class="active"<%end%>><a href="<%=controller%>/<%=k%>"><%=pcdata(node.title)%></a></li> <% end end%> </ul> diff --git a/themes/openwrt-light/luasrc/view/themes/openwrt-light/header.htm b/themes/openwrt-light/luasrc/view/themes/openwrt-light/header.htm index 65700c2e70..5c1303bb23 100644 --- a/themes/openwrt-light/luasrc/view/themes/openwrt-light/header.htm +++ b/themes/openwrt-light/luasrc/view/themes/openwrt-light/header.htm @@ -49,7 +49,7 @@ require("luci.http").prepare_content("application/xhtml+xml") <script type="text/javascript" src="<%=resource%>/VarType.js"></script> <script type="text/javascript" src="<%=resource%>/XHTML1.js"></script> <script type="text/javascript" src="<%=resource%>/Dropdowns.js"></script> -<title><%=striptags( hostname .. ( (node and node.title) and ' - ' .. node.title or '')) %> - LuCI</title> +<title><%=striptags( hostname .. ( (node and node.title) and ' - ' .. pcdata(node.title) or '')) %> - LuCI</title> </head> <body class="lang_<%=luci.i18n.context.lang%>"> @@ -96,7 +96,7 @@ local function submenu(prefix, node) local href = controller .. prefix .. v.name .. "/" href = (nnode.query) and href .. luci.http.build_querystring(nnode.query) or href %> -<li><a<% if nnode._menu_selected then %> class="active"<%end%> href="<%=luci.util.pcdata(href)%>"><%=nnode.title%></a><%- +<li><a<% if nnode._menu_selected then %> class="active"<%end%> href="<%=luci.util.pcdata(href)%>"><%=pcdata(nnode.title)%></a><%- submenu(prefix .. v.name .. "/", nnode) %></li> <%- @@ -122,7 +122,7 @@ if cattree and cattree.nodes then local href = controller.."/"..category.."/"..k.name.."/" href = (k.query) and href .. luci.http.build_querystring(k.query) or href %> -<li><a<% if node._menu_selected then %> class="preactive"<%end%> href="<%=href%>"><%=node.title%></a><% +<li><a<% if node._menu_selected then %> class="preactive"<%end%> href="<%=href%>"><%=pcdata(node.title)%></a><% submenu("/" .. category .. "/" .. k.name .. "/", node) %></li><% end end @@ -133,7 +133,7 @@ end <ul id="modemenu"><% for k,node in pairs(tree.nodes) do if node.title and not node.hidden then %> -<li><a<% if request[1] == k then %> class="active"<%end%> href="<%=controller%>/<%=k%>/"><%=node.title%></a></li><% +<li><a<% if request[1] == k then %> class="active"<%end%> href="<%=controller%>/<%=k%>/"><%=pcdata(node.title)%></a></li><% end end %> diff --git a/themes/openwrt.org-oxygen/luasrc/view/themes/openwrt.org-oxygen/header.htm b/themes/openwrt.org-oxygen/luasrc/view/themes/openwrt.org-oxygen/header.htm index c212af5c40..582db0106c 100644 --- a/themes/openwrt.org-oxygen/luasrc/view/themes/openwrt.org-oxygen/header.htm +++ b/themes/openwrt.org-oxygen/luasrc/view/themes/openwrt.org-oxygen/header.htm @@ -51,7 +51,7 @@ require("luci.http").prepare_content("application/xhtml+xml") <script type="text/javascript" src="<%=resource%>/VarType.js"></script> <script type="text/javascript" src="<%=resource%>/XHTML1.js"></script> <script type="text/javascript" src="<%=resource%>/Dropdowns.js"></script> -<title><%=striptags( hostname .. ( (node and node.title) and ' - ' .. node.title or '')) %> - LuCI</title> +<title><%=striptags( hostname .. ( (node and node.title) and ' - ' .. pcdata(node.title) or '')) %> - LuCI</title> </head> <body class="lang_<%=luci.i18n.context.lang%>"> @@ -98,7 +98,7 @@ local function submenu(prefix, node) local href = controller .. prefix .. v.name .. "/" href = (nnode.query) and href .. luci.http.build_querystring(nnode.query) or href %> -<li><a<% if nnode._menu_selected then %> class="active"<%end%> href="<%=luci.util.pcdata(href)%>"><%=nnode.title%></a><%- +<li><a<% if nnode._menu_selected then %> class="active"<%end%> href="<%=luci.util.pcdata(href)%>"><%=pcdata(nnode.title)%></a><%- submenu(prefix .. v.name .. "/", nnode) %></li> <%- @@ -124,7 +124,7 @@ if cattree and cattree.nodes then local href = controller.."/"..category.."/"..k.name.."/" href = (k.query) and href .. luci.http.build_querystring(k.query) or href %> -<li><a<% if node._menu_selected then %> class="preactive"<%end%> href="<%=href%>"><%=node.title%></a><% +<li><a<% if node._menu_selected then %> class="preactive"<%end%> href="<%=href%>"><%=pcdata(node.title)%></a><% submenu("/" .. category .. "/" .. k.name .. "/", node) %></li><% end end @@ -135,7 +135,7 @@ end <ul id="modemenu"><% for k,node in pairs(tree.nodes) do if node.title and not node.hidden then %> -<li><a<% if request[1] == k then %> class="active"<%end%> href="<%=controller%>/<%=k%>/"><%=node.title%></a></li><% +<li><a<% if request[1] == k then %> class="active"<%end%> href="<%=controller%>/<%=k%>/"><%=pcdata(node.title)%></a></li><% end end %> diff --git a/themes/openwrt.org/luasrc/view/themes/openwrt.org/header.htm b/themes/openwrt.org/luasrc/view/themes/openwrt.org/header.htm index add2c9a730..93ee32eb41 100644 --- a/themes/openwrt.org/luasrc/view/themes/openwrt.org/header.htm +++ b/themes/openwrt.org/luasrc/view/themes/openwrt.org/header.htm @@ -49,7 +49,7 @@ require("luci.http").prepare_content("application/xhtml+xml") <script type="text/javascript" src="<%=resource%>/VarType.js"></script> <script type="text/javascript" src="<%=resource%>/XHTML1.js"></script> <script type="text/javascript" src="<%=resource%>/Dropdowns.js"></script> -<title><%=striptags( hostname .. ( (node and node.title) and ' - ' .. node.title or '')) %> - LuCI</title> +<title><%=striptags( hostname .. ( (node and node.title) and ' - ' .. pcdata(node.title) or '')) %> - LuCI</title> </head> <body class="lang_<%=luci.i18n.context.lang%>"> @@ -96,7 +96,7 @@ local function submenu(prefix, node) local href = controller .. prefix .. v.name .. "/" href = (nnode.query) and href .. luci.http.build_querystring(nnode.query) or href %> -<li><a<% if nnode._menu_selected then %> class="active"<%end%> href="<%=luci.util.pcdata(href)%>"><%=nnode.title%></a><%- +<li><a<% if nnode._menu_selected then %> class="active"<%end%> href="<%=luci.util.pcdata(href)%>"><%=pcdata(nnode.title)%></a><%- submenu(prefix .. v.name .. "/", nnode) %></li> <%- @@ -122,7 +122,7 @@ if cattree and cattree.nodes then local href = controller.."/"..category.."/"..k.name.."/" href = (k.query) and href .. luci.http.build_querystring(k.query) or href %> -<li><a<% if node._menu_selected then %> class="preactive"<%end%> href="<%=href%>"><%=node.title%></a><% +<li><a<% if node._menu_selected then %> class="preactive"<%end%> href="<%=href%>"><%=pcdata(node.title)%></a><% submenu("/" .. category .. "/" .. k.name .. "/", node) %></li><% end end @@ -133,7 +133,7 @@ end <ul id="modemenu"><% for k,node in pairs(tree.nodes) do if node.title and not node.hidden then %> -<li><a<% if request[1] == k then %> class="active"<%end%> href="<%=controller%>/<%=k%>/"><%=node.title%></a></li><% +<li><a<% if request[1] == k then %> class="active"<%end%> href="<%=controller%>/<%=k%>/"><%=pcdata(node.title)%></a></li><% end end %> diff --git a/themes/oxygen/luasrc/view/themes/oxygen/header.htm b/themes/oxygen/luasrc/view/themes/oxygen/header.htm index 6df6c8754e..9b951e8a6a 100644 --- a/themes/oxygen/luasrc/view/themes/oxygen/header.htm +++ b/themes/oxygen/luasrc/view/themes/oxygen/header.htm @@ -44,7 +44,7 @@ require("luci.http").prepare_content("application/xhtml+xml") <link rel="stylesheet" type="text/css" media="screen" href="<%=media%>/dashboard.css" /> <% if node and node.css then %><link rel="stylesheet" type="text/css" media="screen" href="<%=resource%>/<%=node.css%>" /> <% end -%> -<title><%=striptags( hostname .. ( (node and node.title) and ' - ' .. node.title or '')) %> - LuCI</title> +<title><%=striptags( hostname .. ( (node and node.title) and ' - ' .. pcdata(node.title) or '')) %> - LuCI</title> </head> <body class="lang_<%=luci.i18n.context.lang%>"> <div id="screen"> @@ -77,7 +77,7 @@ local function ucimenu(prefix, node) local href = controller .. prefix .. v.name .. "/" href = (nnode.query) and href .. luci.http.build_querystring(nnode.query) or href %> -<span><a class="menulink<% if nnode._menu_selected then %> active<%end%>" href="<%=luci.util.pcdata(href)%>"> > <%=nnode.title%></a></span> +<span><a class="menulink<% if nnode._menu_selected then %> active<%end%>" href="<%=luci.util.pcdata(href)%>"> > <%=pcdata(nnode.title)%></a></span> <%- end end @@ -119,7 +119,7 @@ ucimenu("/" .. category .. "/uci/", tree.nodes[category].nodes["uci"], "changes" if pointer.nodes and pointer.nodes[v] then pointer = pointer.nodes[v] %> - » <a href="<%=luci.dispatcher.build_url(unpack(crequest, 1, k))%>"><%=pointer.title or v%></a> + » <a href="<%=luci.dispatcher.build_url(unpack(crequest, 1, k))%>"><%=pcdata(pointer.title or v)%></a> <% end end |