projects
/
project
/
luci.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
make use of the new features in the binding for uci v0.4.0 - fixes remaining dependen...
[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
99bd399
..
2aea59c
100644
(file)
--- a/
themes/fledermaus/luasrc/view/themes/fledermaus/header.htm
+++ b/
themes/fledermaus/luasrc/view/themes/fledermaus/header.htm
@@
-73,9
+73,12
@@
local function submenu(prefix, node)
%>
<ul>
<% for j, v in pairs(index) do
%>
<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>
<li>
- <span<% if nnode._menu_selected then %> class="yellowtext"<%end%>><a href="<%=
controller .. prefix .. v.name
%>"><%=nnode.title%></a></span>
+ <span<% if nnode._menu_selected then %> class="yellowtext"<%end%>><a href="<%=
href
%>"><%=nnode.title%></a></span>
<% submenu(prefix .. v.name .. "/", nnode) %>
</li>
<% end %>
<% submenu(prefix .. v.name .. "/", nnode) %>
</li>
<% end %>
@@
-93,7
+96,9
@@
if cattree and cattree.nodes then
for i, k in ipairs(index) do
node = cattree.nodes[k.name]
for i, k in ipairs(index) do
node = cattree.nodes[k.name]
- if node.title then %>
+ 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="yellowtext"<%end%>><a href="<%=controller%>/<%=category%>/<%=k.name%>"><%=node.title%></a>
<%submenu("/" .. category .. "/" .. k.name .. "/", node)%>
</div>
<div<% if node._menu_selected then %> class="yellowtext"<%end%>><a href="<%=controller%>/<%=category%>/<%=k.name%>"><%=node.title%></a>
<%submenu("/" .. category .. "/" .. k.name .. "/", node)%>
</div>
@@
-115,9
+120,11
@@
end
<%
if "admin" == request[1] then
require("luci.model.uci")
<%
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 n, s in pairs(luci.model.uci.changes()) do
+ for no, o in pairs(s) do
+ ucic = ucic + 1;
+ end
end
%>
<div><%:config Konfiguration%>
end
%>
<div><%:config Konfiguration%>
@@
-133,4
+140,4
@@
end
</div>
<% end %>
</div>
</div>
<% end %>
</div>
- <div id="content">
\ No newline at end of file
+ <div id="content">