themes/openwrt: rework menu and header area
[project/luci.git] / themes / openwrt / luasrc / view / themes / openwrt.org / header.htm
index 0a32055f8085639ae31effbac62ba348ddd579d1..11f6793b7a0d6b07649cfe9b2fd8836b33ba4cc9 100644 (file)
@@ -1,7 +1,7 @@
 <%#
 LuCI - Lua Configuration Interface
 Copyright 2008 Steven Barth <steven@midlink.org>
-Copyright 2008 Jo-Philipp Wich <xm@leipzig.freifunk.net>
+Copyright 2008-2010 Jo-Philipp Wich <xm@subsignal.org>
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.
@@ -17,6 +17,8 @@ require("luci.sys")
 local load1, load5, load15 = luci.sys.loadavg()
 local request  = require("luci.dispatcher").context.path
 local category = request[1]
+local request2 = require("luci.dispatcher").context.request
+local leaf     = request2[#request2]
 local tree     = luci.dispatcher.node()
 local cattree  = category and luci.dispatcher.node(category)
 local node     = luci.dispatcher.context.dispatched
@@ -33,6 +35,72 @@ end
 require("luci.i18n").loadc("base")
 require("luci.http").prepare_content("application/xhtml+xml")
 
+
+       local function nodeurl(prefix, name, query)
+               local url = controller .. prefix .. name .. "/"
+               if query then
+                       url = url .. luci.http.build_querystring(query)
+               end
+               return pcdata(url)
+       end
+
+       local function subtree(prefix, node, level)
+               if not node.nodes or node.hidden then
+                       return false
+               end
+
+               if not level then
+                       level = 1
+               end
+
+               local index = {}
+               local count = 0
+               for k, n in pairs(node.nodes) do
+                       if n.title and n.target then
+                               table.insert(index, {name=k, order=n.order or 100})
+                               count = count + 1
+                       end
+               end
+
+               table.sort(index, function(a, b) return a.order < b.order end)
+
+               if count > 0 then
+%>
+       <div class="tabmenu<%=level%>">
+       <ul class="tabmenu l<%=level%>">
+               <%
+                       local selected_node
+                       local selected_name
+
+                       for j, v in pairs(index) do
+                               if #v.name > 0 then
+                                       local nnode = node.nodes[v.name]
+
+                                       if nnode._menu_selected then
+                                               selected_node = nnode
+                                               selected_name = v.name
+                                       end
+               %>
+                       <li<% if nnode._menu_selected or v.name == leaf then %> class="active"<% end %>>
+                               <a href="<%=nodeurl(prefix, v.name, nnode.query)%>"><%=striptags(nnode.title)%></a>
+                       </li>
+               <%
+                               end
+                       end
+               %>
+       </ul>
+       <br style="clear:both" />
+<%
+                       if selected_node then
+                               subtree(prefix .. selected_name .. "/", selected_node, level + 1)
+                       end
+%>
+       </div>
+<%
+               end
+       end
+
+
 -%>
 
 <?xml version="1.0" encoding="utf-8"?>
@@ -59,77 +127,13 @@ require("luci.http").prepare_content("application/xhtml+xml")
 <span id="skiplink2"><a href="#content"><%:Skip to content%></a></span>
 </p>
 
-<div id="header">
-<h1><%=luci.version.distname%></h1>
-<p>
-<%=luci.version.distversion%><br />
-<%:Load%>: <%="%.2f" % load1%> <%="%.2f" % load5%> <%="%.2f" % load15%><br />
-<%:Hostname%>: <%=hostname%>
-</p>
-</div>
-
 <div id="menubar">
 <h2 class="navigation"><a id="navigation" name="navigation"><%:Navigation%></a></h2>
-<ul id="mainmenu" class="dropdowns">
-<%-
-local function submenu(prefix, node)
-       if not node.nodes or node.hidden then
-               return false
-       end
-       local index = {}
-       local count = 0
-       for k, n in pairs(node.nodes) do
-               if n.title and n.target then
-                       table.insert(index, {name=k, order=n.order or 100})
-                       count = count + 1
-               end
-       end
-
-       table.sort(index, function(a, b) return a.order < b.order end)
-
-       if count > 0 then
-%>
-<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="<%=pcdata(href)%>"><%=striptags(nnode.title)%></a><%-
-submenu(prefix .. v.name .. "/", nnode)
-%></li>
-<%-
-                       end
-               end
-%>
-</ul>
-<%
-       end
-end
-
-if cattree and cattree.nodes then
-       local index = {}
-       for k, node in pairs(cattree.nodes) do
-               table.insert(index, {name=k, order=node.order or 100})
-       end
 
-       table.sort(index, function(a, b) return a.order < b.order end)
-
-       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
-%>
-<li><a<% if node._menu_selected then %> class="preactive"<%end%> href="<%=pcdata(href)%>"><%=striptags(node.title)%></a><%
-submenu("/" .. category .. "/" .. k.name .. "/", node)
-%></li><% end
-       end
-end
-%>
-</ul>
+<div class="hostinfo">
+       <%=hostname%> | <%=luci.version.distversion%> |
+       <%:Load%>: <%="%.2f" % load1%> <%="%.2f" % load5%> <%="%.2f" % load15%>
+</div>
 
 <ul id="modemenu"><%
 for k,node in pairs(tree.nodes) do
@@ -151,27 +155,33 @@ if tree.nodes[category] and tree.nodes[category].ucidata then
                end
        end
 -%>
-<ul id="savemenu" class="dropdowns">
-<li><% if ucic > 0 then %><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><% end -%>
-</li>
-</ul><% end %>
+<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>
+       <%- else -%>
+               <a href="#"><%:Changes%>: 0</a>
+       <% end -%>
+</div><% end %>
 
 <div class="clear"></div>
 </div>
-<div id="maincontent">
-       <noscript>
-               <div class="errorbox">
-                       <strong><%:Java Script required!%></strong><br />
-                       <%:You must enable Java Script in your browser or LuCI will not work properly.%>
-               </div>
-       </noscript>
 
-       <%- if 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.%>
+<div id="maincontainer">
+       <div id="tabmenu">
+               <% if category then subtree("/" .. category .. "/", cattree) end %>
        </div>
-       <%- end -%>
+
+       <div id="maincontent">
+               <noscript>
+                       <div class="errorbox">
+                               <strong><%:Java Script required!%></strong><br />
+                               <%:You must enable Java Script in your browser or LuCI will not work properly.%>
+                       </div>
+               </noscript>
+
+               <%- if 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.%>
+               </div>
+               <%- end -%>