Several small cleanups and improvements

[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 1ae5df92299f6c5f34cf09b407674cd7cd39ef57..df31154c0ae56914c793c927a009b3e5580c2286 100644 (file)
--- a/themes/openwrt.org/luasrc/view/themes/openwrt.org/header.htm
+++ b/themes/openwrt.org/luasrc/view/themes/openwrt.org/header.htm
@@ -91,7 +91,7 @@ end
 
 <div class="menubar">
        <div id="mainmenu" class="mainmenu">
-<%
+<%-
 local function submenu(prefix, node)
        if not node.nodes then
                return false
@@ -110,18 +110,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
 
@@ -157,7 +159,7 @@ end
        </div>
 
        <%
-               if "admin" == request[1] 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,10 +172,10 @@ end
        <div class="mainmenu" style="float:right; margin-right:2em">
                <div>
                        <% if ucic > 0 then %>
-                       <a href="<%=controller%>/admin/uci/changes"><%:changes%>: <%=ucic%></a>
+                       <a class="warning" href="<%=controller%>/<%=category%>/uci/changes"><%:unsavedchanges%>: <%=ucic%></a>
                        <ul>
-                               <li><a href="<%=controller%>/admin/uci/apply"><%:apply%></a></li>
-                               <li><a href="<%=controller%>/admin/uci/revert"><%:revert%></a></li>
+                               <li><a href="<%=controller%>/<%=category%>/uci/apply"><%:apply%></a></li>
+                               <li><a href="<%=controller%>/<%=category%>/uci/revert"><%:revert%></a></li>
                        </ul>
                        <% else %>
                        <a href="#"><%:changes%>: 0</a>