luci-0.11: merge outstanding trunk changes
[project/luci.git] / themes / openwrt / luasrc / view / themes / openwrt.org / header.htm
index 1078c51..5006723 100644 (file)
@@ -13,79 +13,73 @@ $Id$
 
 -%>
 <%
-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
-local hostname = luci.sys.hostname()
-
-local c = tree
-for i,r in ipairs(request) do
-       if c.nodes and c.nodes[r] then
-               c = c.nodes[r]
-               c._menu_selected = true
-       end
-end
+       local sys  = require "luci.sys"
+       local http = require "luci.http"
+       local disp = require "luci.dispatcher"
+
+       local hostname = sys.hostname()
+       local load1, load5, load15 = sys.loadavg()
+
+       local request  = disp.context.path
+       local request2 = disp.context.request
+
+       local category = request[1]
+       local cattree  = category and disp.node(category)
 
-require("luci.i18n").loadc("base")
-require("luci.http").prepare_content("application/xhtml+xml")
+       local leaf = request2[#request2]
 
+       local tree = disp.node()
+       local node = disp.context.dispatched
+
+       local categories = disp.node_childs(tree)
+
+       local c = tree
+       local i, r
+
+       -- tag all nodes leading to this page
+       for i, r in ipairs(request) do
+               if c.nodes and c.nodes[r] then
+                       c = c.nodes[r]
+                       c._menu_selected = true
+               end
+       end
+
+       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)
+                       url = url .. 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
+               local childs = disp.node_childs(node)
+               if #childs > 0 then
 %>
        <div class="tabmenu<%=level%>">
        <ul class="tabmenu l<%=level%>">
                <%
                        local selected_node
                        local selected_name
+                       local i, v
 
-                       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
+                       for i, v in ipairs(childs) do
+                               local nnode = node.nodes[v]
+                               if nnode._menu_selected then
+                                       selected_node = nnode
+                                       selected_name = v
+                               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 class="tabmenu-item-<%=v%><% if nnode._menu_selected or (node.leaf and v == leaf) then %> active<% end %>">
+                               <a href="<%=nodeurl(prefix, v, nnode.query)%>"><%=striptags(translate(nnode.title))%></a>
                        </li>
                <%
-                               end
                        end
                %>
        </ul>
@@ -99,8 +93,6 @@ require("luci.http").prepare_content("application/xhtml+xml")
 <%
                end
        end
-
-
 -%>
 
 <?xml version="1.0" encoding="utf-8"?>
@@ -110,12 +102,17 @@ require("luci.http").prepare_content("application/xhtml+xml")
 <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
 <meta http-equiv="Content-Script-Type" content="text/javascript" />
 <link rel="stylesheet" type="text/css" media="screen" href="<%=media%>/cascade.css" />
-<!--[if lt IE 7]><link rel="stylesheet" type="text/css" media="screen" href="<%=media%>/ie6.css" /><![endif]-->
+<!--[if IE 6]><link rel="stylesheet" type="text/css" media="screen" href="<%=media%>/ie6.css" /><![endif]-->
 <!--[if IE 7]><link rel="stylesheet" type="text/css" media="screen" href="<%=media%>/ie7.css" /><![endif]-->
+<!--[if IE 8]><link rel="stylesheet" type="text/css" media="screen" href="<%=media%>/ie8.css" /><![endif]-->
 <% if node and node.css then %><link rel="stylesheet" type="text/css" media="screen" href="<%=resource%>/<%=node.css%>" />
 <% end -%>
+<% if css then %><style title="text/css">
+<%= css %>
+</style>
+<% end -%>
 <script type="text/javascript" src="<%=resource%>/xhr.js"></script>
-<title><%=striptags( hostname .. ( (node and node.title) and ' - ' .. node.title or '')) %> - LuCI</title>
+<title><%=striptags( hostname .. ( (node and node.title) and ' - ' .. translate(node.title) or '')) %> - LuCI</title>
 </head>
 <body class="lang_<%=luci.i18n.context.lang%>">
 
@@ -130,16 +127,20 @@ require("luci.http").prepare_content("application/xhtml+xml")
 <div class="hostinfo">
        <%=hostname%> | <%=luci.version.distversion%> |
        <%:Load%>: <%="%.2f" % load1%> <%="%.2f" % load5%> <%="%.2f" % load15%>
+       <span id="xhr_poll_status" style="display:none" onclick="XHR.running() ? XHR.halt() : XHR.run()">
+               | <%:Auto Refresh%>:
+               <span id="xhr_poll_status_on"><%:on%></span>
+               <span id="xhr_poll_status_off" style="display:none"><%:off%></span>
+       </span>
 </div>
 
-<ul id="modemenu"><%
-for k,node in pairs(tree.nodes) do
-       if node.title and not node.hidden then %>
-<li><a<% if request[1] == k then %> class="active"<%end%> href="<%=controller%>/<%=k%>/"><%=striptags(node.title)%></a></li><%
-       end
-end
-%>
-</ul>
+<% if #categories > 1 then %>
+       <ul id="modemenu">
+               <% for i, r in ipairs(categories) do %>
+                       <li><a<% if request[1] == r then %> class="active"<%end%> href="<%=controller%>/<%=r%>/"><%=striptags(translate(tree.nodes[r].title))%></a></li>
+               <% end %>
+       </ul>
+<% end %>
 
 <%
 if tree.nodes[category] and tree.nodes[category].ucidata then
@@ -154,7 +155,7 @@ if tree.nodes[category] and tree.nodes[category].ucidata then
 -%>
 <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>
+               <a class="warning" href="<%=controller%>/<%=category%>/uci/changes/?redir=<%=luci.http.urlencode(luci.http.formvalue("redir") or REQUEST_URI)%>"><%:Unsaved Changes%>: <%=ucic%></a>
        <%- else -%>
                <a href="#"><%:Changes%>: 0</a>
        <% end -%>
@@ -176,9 +177,10 @@ if tree.nodes[category] and tree.nodes[category].ucidata then
                        </div>
                </noscript>
 
-               <%- if not luci.sys.user.getpasswd("root") then -%>
+               <%- if luci.sys.process.info("uid") == 0 and luci.sys.user.getuser("root") and not luci.sys.user.getpasswd("root") and category ~= "failsafe" 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.%>
+                       <%:There is no password set on this router. Please configure a root password to protect the web interface and enable SSH.%><br />
+                       <a href="<%=pcdata(luci.dispatcher.build_url("admin/system/admin"))%>"><%:Go to password configuration...%></a>
                </div>
                <%- end -%>