+<%#
+LuCI - Lua Configuration Interface
+Copyright 2008 Steven Barth <steven@midlink.org>
+Copyright 2008 Jo-Philipp Wich <xm@leipzig.freifunk.net>
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+$Id$
+
+-%>
<%
require("luci.sys")
local load1, load5, load15 = luci.sys.loadavg()
local category = request[1]
local tree = luci.dispatcher.node()
local cattree = category and luci.dispatcher.node(category)
-local node = luci.dispatcher.context.dispatched
+local node = luci.dispatcher.context.dispatched
local c = tree
for i,r in ipairs(request) do
- if c.nodes and c.nodes[r] then
+ if c.nodes and c.nodes[r] then
c = c.nodes[r]
c._menu_selected = true
end
<%=luci.config.brand.firmware%><br />
<%=luci.config.brand.distro%><br />
<%:load%>: <%=load1%> <%=load5%> <%=load15%><br />
- <%:hostname%>: <%=luci.sys.hostname()%>
+ <%:hostname%>: <%=luci.sys.hostname()%>
</div>
<div class="title">
<span class="headertitle"><%=luci.config.brand.title%></span><br />
</div>
<div class="pathbar separator black whitetext bold">
-<%:path%>: <%
+<%:path%>: <%
local c = tree
local url = controller
for k,v in pairs(request) do
%>
</div>
-<div class="mainmenu">
+<div class="menubar">
+ <div class="mainmenu">
<%
local function submenu(prefix, node)
- if not node._menu_selected or not node.nodes then
+ if not node.nodes then
return false
end
- local index = {}
+ local index = {}
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})
end
end
-
+
table.sort(index, function(a, b) return a.order < b.order end)
%>
<ul>
- <% for j, v in pairs(index) do
+ <% 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
<% submenu(prefix .. v.name .. "/", nnode) %>
</li>
<% end %>
- </ul>
-<%
+ </ul>
+<%
end
if cattree and cattree.nodes then
- local index = {}
+ local index = {}
for k, node in pairs(cattree.nodes) do
table.insert(index, {name=k, order=node.order or 100})
end
-
+
table.sort(index, function(a, b) return a.order < b.order end)
for i, k in ipairs(index) do
if node.title and node.target 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>
+ <div<% if node._menu_selected then %> class="preactive"<%end%>><a href="<%=href%>"><%=node.title%></a>
<%submenu("/" .. category .. "/" .. k.name .. "/", node)%>
</div>
<% end
end
end
-%>
+%>
</div>
<div class="modemenu">
<ul><%
<% end
end%>
</ul>
- </div>
- <div class="sidebar">
+
<%
if "admin" == request[1] then
local ucic = 0
end
end
%>
- <div>
- <ul>
- <% 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%>: 0</li>
- <% end %>
- </ul>
+ <div class="mainmenu" style="float:right; margin-right:2em">
+ <div>
+ <% if ucic > 0 then %>
+ <a href="<%=controller%>/admin/uci/changes"><%:changes%>: <%=ucic%></a>
+ <ul>
+ <li><a href="<%=controller%>/admin/uci/apply"><%:apply%></a></li>
+ <li><a href="<%=controller%>/admin/uci/revert"><%:revert%></a></li>
+ </ul>
+ <% else %>
+ <a href="#"><%:changes%>: 0</a>
+ <% end %>
+ </div>
</div>
<% end %>
</div>
- <div id="content">
+ <br class="clear" />
+</div>
+<div id="content">