Fixed last commit
[project/luci.git] / themes / openwrt.org / luasrc / view / themes / openwrt.org / header.htm
index df31c01..6b83114 100644 (file)
@@ -20,6 +20,7 @@ local category = request[1]
 local tree     = luci.dispatcher.node()
 local cattree  = category and luci.dispatcher.node(category)
 local node     = luci.dispatcher.context.dispatched
+local hostname = luci.sys.hostname()
 
 local c = tree
 for i,r in ipairs(request) do
@@ -30,25 +31,44 @@ for i,r in ipairs(request) do
 end
 
 require("luci.i18n").loadc("default")
-
 require("luci.http").prepare_content("text/html")
-%><?xml version="1.0" encoding="utf-8"?>
+
+-%>
+
+<?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">
 <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="text/xhtml+xml; charset=utf-8" />
+       <meta http-equiv="content-type" content="application/xhtml+xml; charset=utf-8" />
        <meta http-equiv="content-script-type" content="text/javascript" />
-       <title>LuCI - Lua Configuration Interface - <%=(node and node.title)%></title>
+       <title><%= 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]-->
 </head>
-<body>
+<body onload="window.setup_hover && 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%>: <%=luci.sys.hostname()%>
+       <%:hostname%>: <%=hostname%>
        </div>
        <div class="title">
                <span class="headertitle"><%=luci.config.brand.title%></span><br />
@@ -71,34 +91,41 @@ end
 </div>
 
 <div class="menubar">
-       <div class="mainmenu">
-<%
+       <div id="mainmenu" class="mainmenu">
+<%-
 local function submenu(prefix, node)
-       if not node.nodes then
+       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>
-       <% for j, v in pairs(index) do
-               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
+       <%- 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="<%=href%>"><%=nnode.title%></a></span>
-                       <% submenu(prefix .. v.name .. "/", nnode) %>
+                       <%- submenu(prefix .. v.name .. "/", nnode) %>
                </li>
-       <% end %>
+               <%- end %>
+       <%- end %>
        </ul>
-<%
+<%-
+       end
 end
 
 if cattree and cattree.nodes then
@@ -111,7 +138,7 @@ if cattree and cattree.nodes then
 
        for i, k in ipairs(index) do
                node = cattree.nodes[k.name]
-               if node.title and node.target then
+               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>
@@ -125,38 +152,36 @@ end
        <div class="modemenu">
                <ul><%
                        for k,node in pairs(tree.nodes) do
-                               if node.title then %>
+                               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 "admin" == request[1] then
-                               local ucic = 0
-                               for i, j in pairs(require("luci.model.uci").changes()) do
-                                       for k, l in pairs(j) do
-                                               for m, n in pairs(l) do
-                                                       ucic = ucic + 1;
-                                               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 k, l in pairs(j) do
+                                       for m, n in pairs(l) do
+                                               ucic = ucic + 1;
                                        end
                                end
-               %>
-               <div class="mainmenu" style="float:right; margin-right:2em">
-                       <div>
-                               <% if ucic > 0 then %>
-                               <a href="<%=controller%>/admin/uci/changes"><%:changes%>: <%=ucic%></a>
-                               <ul>
-                                       <li><a href="<%=controller%>/admin/uci/apply"><%:apply%></a></li>
-                                       <li><a href="<%=controller%>/admin/uci/revert"><%:revert%></a></li>
-                               </ul>
-                               <% else %>
-                               <a href="#"><%:changes%>: 0</a>
-                               <% end %>
-                       </div>
+                       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>
-               <% end %>
        </div>
+       <% end %>
+
        <br class="clear" />
 </div>
 <div id="content">