X-Git-Url: http://git.archive.openwrt.org/?a=blobdiff_plain;f=themes%2Fopenwrt%2Fluasrc%2Fview%2Fthemes%2Fopenwrt.org%2Fheader.htm;h=6eea8af20b90a92397e16b88ede12ffb41ce09ea;hb=c473bb1d75ff7faa07b89db53b7d8dd526e91904;hp=1078c51760aee5ec08edd9317751e98594c863ce;hpb=e4b1a11597b73e6b2ed0c9d0fa16efac924b92a0;p=project%2Fluci.git

diff --git a/themes/openwrt/luasrc/view/themes/openwrt.org/header.htm b/themes/openwrt/luasrc/view/themes/openwrt.org/header.htm
index 1078c5176..6eea8af20 100644
--- a/themes/openwrt/luasrc/view/themes/openwrt.org/header.htm
+++ b/themes/openwrt/luasrc/view/themes/openwrt.org/header.htm
@@ -81,7 +81,7 @@ require("luci.http").prepare_content("application/xhtml+xml")
 						selected_name = v.name
 					end
 		%>
-			<li<% if nnode._menu_selected or v.name == leaf then %> class="active"<% end %>>
+			<li class="tabmenu-item-<%=v.name%><% if nnode._menu_selected or (node.leaf and v.name == leaf) then %> active<% end %>">
 				<a href="<%=nodeurl(prefix, v.name, nnode.query)%>"><%=striptags(nnode.title)%></a>
 			</li>
 		<%
@@ -110,8 +110,9 @@ require("luci.http").prepare_content("application/xhtml+xml")
 <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
 <meta http-equiv="Content-Script-Type" content="text/javascript" />
 <link rel="stylesheet" type="text/css" media="screen" href="<%=media%>/cascade.css" />
-<!--[if lt IE 7]><link rel="stylesheet" type="text/css" media="screen" href="<%=media%>/ie6.css" /><![endif]-->
+<!--[if IE 6]><link rel="stylesheet" type="text/css" media="screen" href="<%=media%>/ie6.css" /><![endif]-->
 <!--[if IE 7]><link rel="stylesheet" type="text/css" media="screen" href="<%=media%>/ie7.css" /><![endif]-->
+<!--[if IE 8]><link rel="stylesheet" type="text/css" media="screen" href="<%=media%>/ie8.css" /><![endif]-->
 <% if node and node.css then %><link rel="stylesheet" type="text/css" media="screen" href="<%=resource%>/<%=node.css%>" />
 <% end -%>
 <script type="text/javascript" src="<%=resource%>/xhr.js"></script>
@@ -154,7 +155,7 @@ if tree.nodes[category] and tree.nodes[category].ucidata then
 -%>
 <div id="savemenu">
 	<% if ucic > 0 then %>
-		<a class="warning" href="<%=controller%>/<%=category%>/uci/changes/?redir=<%=luci.http.urlencode(tree.nodes[category].nodes["uci"].query)%>"><%:Unsaved Changes%>: <%=ucic%></a>
+		<a class="warning" href="<%=controller%>/<%=category%>/uci/changes/?redir=<%=luci.http.urlencode(luci.http.formvalue("redir") or REQUEST_URI)%>"><%:Unsaved Changes%>: <%=ucic%></a>
 	<%- else -%>
 		<a href="#"><%:Changes%>: 0</a>
 	<% end -%>
@@ -176,7 +177,7 @@ if tree.nodes[category] and tree.nodes[category].ucidata then
 			</div>
 		</noscript>
 
-		<%- if not luci.sys.user.getpasswd("root") then -%>
+		<%- if luci.sys.user.getuser("root") and not luci.sys.user.getpasswd("root") then -%>
 		<div class="errorbox">
 			<strong><%:No password set!%></strong><br />
 			<%:There is no password set on this router. Please configure a root password to protect the web interface and enable SSH.%>