* Rewrote Luci to be coroutine-safe allowing the use of non-forking webservers

[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 2ab67ec..d1b7518 100644 (file)
--- a/themes/openwrt.org/luasrc/view/themes/openwrt.org/header.htm
+++ b/themes/openwrt.org/luasrc/view/themes/openwrt.org/header.htm
@@ -1,11 +1,11 @@
 <%
 require("luci.sys")
 local load1, load5, load15 = luci.sys.loadavg()
-local request  = require("luci.dispatcher").request
+local request  = require("luci.dispatcher").context.path
 local category = request[1]
 local tree     = luci.dispatcher.node()
 local cattree  = category and luci.dispatcher.node(category)
-local node     = luci.dispatcher.dispatched 
+local node     = luci.dispatcher.context.dispatched 
 
 local c = tree
 for i,r in ipairs(request) do
@@ -33,8 +33,8 @@ require("luci.http").prepare_content("text/html")
        <div class="whitetext smalltext bold right">
        <%=luci.config.brand.firmware%><br />
        <%=luci.config.brand.distro%><br />
-       <%:load Last%>: <%=load1%> <%=load5%> <%=load15%><br />
-       <%:hostname Hostname%>: <%=luci.sys.hostname()%> 
+       <%:load%>: <%=load1%> <%=load5%> <%=load15%><br />
+       <%:hostname%>: <%=luci.sys.hostname()%> 
        </div>
        <div>
                <span class="headertitle"><%=luci.config.brand.title%></span><br />
@@ -43,7 +43,7 @@ require("luci.http").prepare_content("text/html")
 </div>
 
 <div class="separator black whitetext bold">
-<%:path Pfad%>: <% 
+<%:path%>: <% 
 local c = tree
 local url = controller
 for k,v in pairs(request) do
@@ -73,9 +73,12 @@ local function submenu(prefix, node)
 %>
        <ul>
        <% for j, v in pairs(index) do 
-               local nnode = node.nodes[v.name]%>
+               local nnode = node.nodes[v.name]
+               local href = controller .. prefix .. v.name
+               href = (v.query) and href .. luci.http.build_querystring(v.query) or href
+               %>
                <li>
-                       <span<% if nnode._menu_selected then %> class="blacktext"<%end%>><a href="<%=controller .. prefix .. v.name%>"><%=nnode.title%></a></span>
+                       <span<% if nnode._menu_selected then %> class="blacktext"<%end%>><a href="<%=href%>"><%=nnode.title%></a></span>
                        <% submenu(prefix .. v.name .. "/", nnode) %>
                </li>
        <% end %>
@@ -93,8 +96,10 @@ if cattree and cattree.nodes then
 
        for i, k in ipairs(index) do
                node = cattree.nodes[k.name]
-               if node.title then %>
-                       <div<% if node._menu_selected then %> class="blacktext"<%end%>><a href="<%=controller%>/<%=category%>/<%=k.name%>"><%=node.title%></a>                  
+               if node.title 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="blacktext"<%end%>><a href="<%=href%>"><%=node.title%></a>                  
                                <%submenu("/" .. category .. "/" .. k.name .. "/", node)%>
                        </div>
 <%             end
@@ -103,7 +108,7 @@ end
 %>             
        </div>
        <div class="sidebar right">
-               <div><%:webui Weboberfläche%>
+               <div><%:webui%>
                        <ul><%
                                for k,node in pairs(tree.nodes) do
                                        if node.title then %>
@@ -114,23 +119,26 @@ end
                </div>
                <%
                        if "admin" == request[1] then
-                               require("luci.model.uci") 
-                               local ucic = luci.model.uci.changes()
-                               if ucic then
-                                       ucic = #luci.util.split(ucic)
+                               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
                                end
                %>
-               <div><%:config Konfiguration%>
+               <div><%:config%>
                        <ul>
-                       <% if ucic then %>
-                               <li><a href="<%=controller%>/admin/uci/changes"><%:changes Änderungen%>: <%=ucic%></a></li>
-                               <li><a href="<%=controller%>/admin/uci/apply"><%:apply Anwenden%></a></li>
-                               <li><a href="<%=controller%>/admin/uci/revert"><%:revert Verwerfen%></a></li>
+                       <% if ucic > 0 then %>
+                               <li><a href="<%=controller%>/admin/uci/changes"><%:changes%>: <%=ucic%></a></li>
+                               <li><a href="<%=controller%>/admin/uci/apply"><%:apply%></a></li>
+                               <li><a href="<%=controller%>/admin/uci/revert"><%:revert%></a></li>
                        <% else %>
-                               <li><%:changes Änderungen%>: 0</li>
+                               <li><%:changes%>: 0</li>
                        <% end %>
                        </ul>
                </div>
                <% end %>
        </div>
-       <div id="content">
\ No newline at end of file
+       <div id="content">