+<%#
+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 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
- 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
<% 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-script-type" content="text/javascript" />
- <title>LuCI - Lua Configuration Interface - <%=node.title%></title>
+ <title>LuCI - Lua Configuration Interface - <%=(node and node.title)%></title>
</head>
<body>
<div id="header">
- <div class="whitetext smalltext bold right">
+ <div class="info 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>
+ <div class="title">
<span class="headertitle"><%=luci.config.brand.title%></span><br />
<span class="whitetext bold"><%=luci.config.brand.subtitle%></span>
</div>
</div>
-<div class="separator black whitetext bold">
-<%:path Pfad%>: <%
+<div class="pathbar separator black whitetext bold">
+<%:path%>: <%
local c = tree
local url = controller
for k,v in pairs(request) do
%>
</div>
-<div id="page">
-<div id="columns"><div id="columnswrapper">
- <div class="sidebar left">
+<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
- table.insert(index, {name=k, order=n.order or 100})
+ 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
- local nnode = node.nodes[v.name]%>
+ <% 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
+ %>
<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="active"<%end%>><a href="<%=href%>"><%=nnode.title%></a></span>
<% 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
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 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>
<%submenu("/" .. category .. "/" .. k.name .. "/", node)%>
</div>
<% end
end
end
-%>
+%>
</div>
- <div class="sidebar right">
- <div><%:webui Weboberfläche%>
- <ul><%
- for k,node in pairs(tree.nodes) do
- if node.title then %>
- <li<% if request[1] == k then %> class="blacktext"<%end%>><a href="<%=controller%>/<%=k%>"><%=node.title%></a></li>
-<% end
- end%>
- </ul>
- </div>
+ <div class="modemenu">
+ <ul><%
+ for k,node in pairs(tree.nodes) do
+ if node.title then %>
+ <li<% if request[1] == k then %> class="active"<%end%>><a href="<%=controller%>/<%=k%>"><%=node.title%></a></li>
+<% end
+ end%>
+ </ul>
+
<%
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%>
- <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>
- <% else %>
- <li><%:changes Änderungen%>: 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">
\ No newline at end of file
+ <br class="clear" />
+</div>
+<div id="content">
projects / project / luci.git / blobdiff