* luci/themes/openwrt.org: added usability patch thanks Alina!

* luci/i18n: add additional strings needed for patch above
author: Jo-Philipp Wich <jow@openwrt.org> 2008-09-24 13:02:49 +0000
committer: Jo-Philipp Wich <jow@openwrt.org> 2008-09-24 13:02:49 +0000
commit: 23206ee3c979cd22af0c7b9b97bedab6197d3852 (patch)
tree: 893a980fbd84985fe57ae6fb561a9376fdd66d7e /themes/openwrt.org/luasrc
parent: 57e0c3075e5b458f89d4704020c88cce65f22ded (diff)
2 files changed, 83 insertions, 109 deletions
diff --git a/themes/openwrt.org/luasrc/view/themes/openwrt.org/footer.htm b/themes/openwrt.org/luasrc/view/themes/openwrt.org/footer.htm
index c1d4dfccbc..f8ea5ad577 100644
--- a/themes/openwrt.org/luasrc/view/themes/openwrt.org/footer.htm
+++ b/themes/openwrt.org/luasrc/view/themes/openwrt.org/footer.htm
@@ -12,9 +12,10 @@ You may obtain a copy of the License at
 $Id$
 
 -%>
-		<br class="clear" />
-	</div>
+<div class="clear"></div>
+</div>
 
-	<div class="luci separator black whitetext bold"><a href="<%=controller%>/about">Powered by <%= luci.__appname__ .. " " .. luci.__version__%></a></div>
+<p class="luci"><a href="<%=controller%>/about">Powered by <%= luci.__appname__ .. " " .. luci.__version__%></a></p>
 </body>
 </html>
+
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 6e460d5b03..05ee94ffb8 100644
--- a/themes/openwrt.org/luasrc/view/themes/openwrt.org/header.htm
+++ b/themes/openwrt.org/luasrc/view/themes/openwrt.org/header.htm
@@ -34,64 +34,39 @@ require("luci.i18n").loadc("default")
 require("luci.http").prepare_content("application/xhtml+xml")
 
 -%>
-
 <?xml version="1.0" encoding="utf-8"?>
 <!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">
+<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="<%=luci.config.main.lang%>" lang="<%=luci.config.main.lang%>">
 <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><%=striptags( hostname .. ( (node and node.title) and ' - ' .. node.title or '')) %> - LuCI</title>
-
-	<!--[if lt IE 7]>
-		<script type="text/javascript">
-			function setup_hover() {
-				function ie_hover(e) {
-					e.onmouseover = function() { this.className = "hover" }
-					e.onmouseout  = function() { this.className = null    }
-				}
-
-				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] );
-			}
-		</script>
-	<![endif]-->
+<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 node and node.css then %><link rel="stylesheet" type="text/css" media="screen" href="<%=resource%>/<%=node.css%>" />
+<% end -%>
+<script type="text/javascript" src="<%=media%>/VarType.js"></script>
+<script type="text/javascript" src="<%=media%>/XHTML1.js"></script>
+<script type="text/javascript" src="<%=media%>/Dropdowns.js"></script>
+<title><%=striptags( hostname .. ( (node and node.title) and ' - ' .. node.title or '')) %> - LuCI</title>
 </head>
-<body onload="window.setup_hover &amp;&amp; setup_hover()">
-<div id="header">
-	<div class="info whitetext smalltext bold right">
-	<%=luci.config.brand.firmware%><br />
-	<%=luci.config.brand.distro%><br />
-	<%:load%>: <%=load1%> <%=load5%> <%=load15%><br />
-	<%:hostname%>: <%=hostname%>
-	</div>
-	<div class="title">
-		<span class="headertitle"><%=luci.config.brand.title%></span><br />
-		<span class="whitetext bold"><%=luci.config.brand.subtitle%></span>
-	</div>
-</div>
+<body class="lang_<%=luci.config.main.lang%>">
 
-<div class="pathbar separator black whitetext bold">
-<%:path%>: <%
-local c = tree
-local url = controller
-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 %>&#187; <% end
-	end
-end
-%>
+<p class="skiplink">
+<span id="skiplink1"><a href="#navigation"><%:skiplink1 Skip to navigation%></a></span>
+<span id="skiplink2"><a href="#content"><%:skiplink2 Skip to content%></a></span>
+</p>
+
+<div id="header">
+<h1><%=luci.config.brand.firmware%></h1>
+<p>
+<%=luci.config.brand.distro%><br />
+<%:load%>: <%=load1%> <%=load5%> <%=load15%><br />
+<%:hostname%>: <%=hostname%>
+</p>
 </div>
 
-<div class="menubar">
-	<div id="mainmenu" class="mainmenu">
+<div id="menubar">
+<h2 class="navigation"><a id="navigation" name="navigation"><%:navigation Navigation%></a></h2>
+<ul id="mainmenu" class="dropdowns">
 <%-
 local function submenu(prefix, node)
 	if not node.nodes or node.hidden then
@@ -110,21 +85,23 @@ local function submenu(prefix, node)
 
 	if count > 0 then
 %>
-	<ul>
-	<%- for j, v in pairs(index) do
-		if #v.name > 0 then
-			local nnode = node.nodes[v.name]
-			local href = controller .. prefix .. v.name
-			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>
-			<%- submenu(prefix .. v.name .. "/", nnode) %>
-		</li>
-		<%- end %>
-	<%- end %>
-	</ul>
+<ul id="submenu_<%=string.gsub(string.gsub(prefix, "/", "_"), "^_(.-)_$", "%1")%>">
+<%-
+		for j, v in pairs(index) do
+			if #v.name > 0 then
+				local nnode = node.nodes[v.name]
+				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><%-
+submenu(prefix .. v.name .. "/", nnode)
+%></li>
 <%-
+			end
+		end
+%>
+</ul>
+<%
 	end
 end
 
@@ -139,49 +116,45 @@ if cattree and cattree.nodes then
 	for i, k in ipairs(index) do
 		node = cattree.nodes[k.name]
 		if node.title and node.target and not node.hidden 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>
-				<%submenu("/" .. category .. "/" .. k.name .. "/", node)%>
-			</div>
-<%		end
+			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><%
+submenu("/" .. category .. "/" .. k.name .. "/", node)
+%></li><% end
+	end
+end
+%>
+</ul>
+
+<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><%	
 	end
 end
 %>
-	</div>
-	<div class="modemenu">
-		<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>
-<%				end
-			end%>
-		</ul>
-	</div>
-
-	<%
-		if tree.nodes[category] and tree.nodes[category].ucidata then
-			local ucic = 0
-			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;
-					end
-				end
+</ul>
+
+<%
+if tree.nodes[category] and tree.nodes[category].ucidata then
+	local ucic = 0
+	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;
 			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>
-			<% submenu("/" .. category .. "/uci/", tree.nodes[category].nodes["uci"]) -%>
-			<% else %>
-			<a href="#"><%:changes%>: 0</a>
-			<% end %>
-		</div>
-	</div>
-	<% end %>
-
-	<br class="clear" />
+		end
+	end
+-%>
+<ul id="savemenu" class="dropdowns">
+<li><% if ucic > 0 then %><a class="warning" href="<%=controller%>/<%=category%>/uci/changes/"><%:unsavedchanges%>: <%=ucic%></a><%
+submenu("/" .. category .. "/uci/", tree.nodes[category].nodes["uci"])
+else -%>
+<a href="#"><%:changes%>: 0</a><% end -%>
+</li>
+</ul><% end %>
+
+<div class="clear"></div>
 </div>
-<div id="content">
+<div id="maincontent">
author	Jo-Philipp Wich <jow@openwrt.org>	2008-09-24 13:02:49 +0000
committer	Jo-Philipp Wich <jow@openwrt.org>	2008-09-24 13:02:49 +0000
commit	23206ee3c979cd22af0c7b9b97bedab6197d3852 (patch)
tree	893a980fbd84985fe57ae6fb561a9376fdd66d7e /themes/openwrt.org/luasrc
parent	57e0c3075e5b458f89d4704020c88cce65f22ded (diff)