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

[project/luci.git] / themes / fledermaus / luasrc / view / themes / fledermaus / header.htm

diff --git a/themes/fledermaus/luasrc/view/themes/fledermaus/header.htm b/themes/fledermaus/luasrc/view/themes/fledermaus/header.htm
index 40086d9ca760e135cb1c6c12df2ce27b9a3df4ce..7f625fd38e0c1a30eadca4df8d17a38cedea1c24 100644 (file)
--- a/themes/fledermaus/luasrc/view/themes/fledermaus/header.htm
+++ b/themes/fledermaus/luasrc/view/themes/fledermaus/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
@@ -34,8 +34,8 @@ require("luci.http").prepare_content("text/html")
        <div class="whitetext smalltext 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 />
@@ -44,7 +44,7 @@ require("luci.http").prepare_content("text/html")
 </div>
 
 <div class="separator yellow bold">
-<%:path Pfad%>: <% 
+<%:path%>: <% 
 local c = tree
 local url = controller
 for k,v in pairs(request) do
@@ -108,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 %>
@@ -119,23 +119,23 @@ end
                </div>
                <%
                        if "admin" == request[1] then
-                               require("luci.model.uci") 
                                local ucic = 0
-                               local changes = luci.model.uci.changes()
-                               for n, s in pairs(changes) do
-                                       for no, o in pairs(s) do
-                                               ucic = ucic + 1;
+                               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>