projects / project / luci.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
Fixed last commit
[project/luci.git] / themes / openwrt.org / luasrc / view / themes / openwrt.org / header.htm
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 7b711d0..6b83114 100644 (file)
--- a/themes/openwrt.org/luasrc/view/themes/openwrt.org/header.htm
+++ b/themes/openwrt.org/luasrc/view/themes/openwrt.org/header.htm
@@ -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,8 +31,8 @@ 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"?>
@@ -40,9 +41,9 @@ require("luci.http").prepare_content("text/html")
 <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">
@@ -67,7 +68,7 @@ require("luci.http").prepare_content("text/html")
        <%=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 />
@@ -91,9 +92,9 @@ end
 
 <div class="menubar">
        <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 = {}
@@ -110,18 +111,20 @@ local function submenu(prefix, node)
        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
 
@@ -135,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>
@@ -149,7 +152,7 @@ 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%>
@@ -157,7 +160,7 @@ end
        </div>
 
        <%
-               if tree.nodes[category].ucidata then
+               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
@@ -170,11 +173,8 @@ end
        <div class="mainmenu" style="float:right; margin-right:2em">
                <div>
                        <% if ucic > 0 then %>
-                       <a href="<%=controller%>/<%=category%>/uci/changes"><%:changes%>: <%=ucic%></a>
-                       <ul>
-                               <li><a href="<%=controller%>/<%=category%>/uci/apply"><%:apply%></a></li>
-                               <li><a href="<%=controller%>/<%=category%>/uci/revert"><%:revert%></a></li>
-                       </ul>
+                       <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 %>
Lua Configuration Interface (mirror)