X-Git-Url: https://git.archive.openwrt.org/?p=project%2Fluci.git;a=blobdiff_plain;f=themes%2Ffledermaus%2Fluasrc%2Fview%2Fthemes%2Ffledermaus%2Fheader.htm;h=6377381b47ed3a61789c2397802482e7b9e0dfb4;hp=ca64381111808ff85f4b862a81d06d0aa79c2b94;hb=7c765875884d6866c53b63757731b079bace2e9b;hpb=a8a1dad10a269ecd32efd11d00bbe0ecdcad874c

diff --git a/themes/fledermaus/luasrc/view/themes/fledermaus/header.htm b/themes/fledermaus/luasrc/view/themes/fledermaus/header.htm
index ca6438111..6377381b4 100644
--- a/themes/fledermaus/luasrc/view/themes/fledermaus/header.htm
+++ b/themes/fledermaus/luasrc/view/themes/fledermaus/header.htm
@@ -36,14 +36,14 @@ require("luci.http").prepare_content("text/html")
 -%>
 
 <?xml version="1.0" encoding="utf-8"?>
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN" "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml">
 <head>
 	<link rel="stylesheet" type="text/css" href="<%=media%>/cascade.css" />
 	<% 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><%= hostname .. ( (node and node.title) and ' - ' .. node.title or '') %> - LuCI</title>
+	<title><%=striptags( hostname .. ( (node and node.title) and ' - ' .. node.title or '')) %> - LuCI</title>
 
 	<!--[if lt IE 7]>
 		<script type="text/javascript">
@@ -55,7 +55,7 @@ require("luci.http").prepare_content("text/html")
 
 				var lis  = document.getElementById("mainmenu").getElementsByTagName("LI");
 				var divs = document.getElementById("mainmenu").getElementsByTagName("DIV");
-				
+
 				for( var i = 0; i < lis.length;  i++ ) ie_hover( lis[i]  );
 				for( var i = 0; i < divs.length; i++ ) ie_hover( divs[i] );
 			}
@@ -69,7 +69,7 @@ require("luci.http").prepare_content("text/html")
 </div></div>
 
 <div class="pathbar separator black whitetext bold">
-<%:path%>: <%
+<%:Path%>: <%
 local c = tree
 local url = controller
 for k,v in pairs(request) do
@@ -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="<%=href%>"><%=nnode.title%></a></span>
+			<span<% if nnode._menu_selected then %> class="active"<%end%>><a href="<%=luci.util.pcdata(href)%>"><%=nnode.title%></a></span>
 			<%- submenu(prefix .. v.name .. "/", nnode) %>
 		</li>
 		<%- end %>
@@ -154,7 +154,8 @@ end
 	<%
 		if tree.nodes[category] and tree.nodes[category].ucidata then
 			local ucic = 0
-			for i, j in pairs(require("luci.model.uci").changes()) do
+
+			for i, j in pairs(require("luci.model.uci").cursor():changes()) do
 				for k, l in pairs(j) do
 					for m, n in pairs(l) do
 						ucic = ucic + 1;
@@ -165,10 +166,10 @@ end
 	<div class="mainmenu" style="float:right; margin-right:2em">
 		<div>
 			<% if ucic > 0 then %>
-			<a class="warning" href="<%=controller%>/<%=category%>/uci/changes"><%:unsavedchanges%>: <%=ucic%></a>
+			<a class="warning" href="<%=controller%>/<%=category%>/uci/changes"><%:Unsaved Changes%>: <%=ucic%></a>
 			<% submenu("/" .. category .. "/uci/", tree.nodes[category].nodes["uci"]) -%>
 			<% else %>
-			<a href="#"><%:changes%>: 0</a>
+			<a href="#"><%:Changes%>: 0</a>
 			<% end %>
 		</div>
 	</div>
@@ -176,4 +177,4 @@ end
 
 	<br class="clear" />
 </div>
-<div id="content">
+<div id="maincontent">
