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 3cd2b1a..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
@@ -31,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"?>
@@ -41,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><%=hostname%> - <%=(node and node.title)%> - LuCI</title>
+       <title><%= hostname .. ( (node and node.title) and ' - ' .. node.title or '') %> - LuCI</title>
  
         <!--[if lt IE 7]>
                 <script type="text/javascript">
@@ -94,7 +94,7 @@ end
         <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 = {}
@@ -138,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>
@@ -152,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%>
@@ -174,10 +174,7 @@ end
                 <div>
                         <% if ucic > 0 then %>
                         <a class="warning" href="<%=controller%>/<%=category%>/uci/changes"><%:unsavedchanges%>: <%=ucic%></a>
-                       <ul>
-                               <li><a href="<%=controller%>/<%=category%>/uci/apply"><%:apply%></a></li>
-                               <li><a href="<%=controller%>/<%=category%>/uci/revert"><%:revert%></a></li>
-                       </ul>
+                       <% submenu("/" .. category .. "/uci/", tree.nodes[category].nodes["uci"]) -%>
                         <% else %>
                         <a href="#"><%:changes%>: 0</a>
                         <% end %>