<%= hostname .. ( (node and node.title) and ' - ' .. node.title or '') %>

-<%:path%>: <% +

+<%:path%>: <% local c = tree local url = controller for k,v in pairs(request) do @@ -72,43 +82,50 @@ end %>

-<% +

+<%- 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 = {} + local count = 0 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}) + count = count + 1 end end - + table.sort(index, function(a, b) return a.order < b.order end) + + if count > 0 then %>

- class="yellowtext"<%end%>><%=nnode.title%> - <% submenu(prefix .. v.name .. "/", nnode) %> + class="active"<%end%>><%=nnode.title%> + <%- submenu(prefix .. v.name .. "/", nnode) %>

-<% + <%- end %> + <%- end %> + +<%- + end 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 @@ -116,44 +133,47 @@ if cattree and cattree.nodes then 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 %> - class="yellowtext"<%end%>><%=node.title%> + class="preactive"<%end%>><%=node.title%> <%submenu("/" .. category .. "/" .. k.name .. "/", node)%>

<% end end end -%> +%>

<%:webui%> -

class="yellowtext"<%end%>><%=node.title%> -<% end - end%> -

- <% - if "admin" == request[1] then - 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 +

class="active"<%end%>><%=node.title%> +<% end + end%> +

+ + <% + if tree.nodes[category] and tree.nodes[category].ucidata then + 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 - %> -

<%:config%> + end + %> +

<% if ucic > 0 then %> - <% submenu("/" .. category .. "/uci/", tree.nodes[category].nodes["uci"]) -%> + <%:unsavedchanges%>: <%=ucic%> + <% submenu("/" .. category .. "/uci/", tree.nodes[category].nodes["uci"]) -%> <% else %> -

<%:changes%>: 0

+ <%:changes%>: 0 <% end %>

- <% end %>

+ <% end %> + +
+