themes/*: Added .hidden Flag

diff --git a/themes/fledermaus/luasrc/view/themes/fledermaus/header.htm b/themes/fledermaus/luasrc/view/themes/fledermaus/header.htm
index 515eaabe00b9b1b183be580cd071310e59b57dfd..ca64381111808ff85f4b862a81d06d0aa79c2b94 100644 (file)
--- a/themes/fledermaus/luasrc/view/themes/fledermaus/header.htm
+++ b/themes/fledermaus/luasrc/view/themes/fledermaus/header.htm
@@ -86,7 +86,7 @@ end
        <div id="mainmenu" class="mainmenu">
 <%-
 local function submenu(prefix, node)
-       if not node.nodes then
+       if not node.nodes or node.hidden then
                return false
        end
        local index = {}
@@ -104,7 +104,7 @@ local function submenu(prefix, node)
 %>
        <ul>
        <%- for j, v in pairs(index) do
-               if #v.name > 0 then
+               if not v.hidden and #v.name > 0 then
                        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
@@ -130,7 +130,7 @@ if cattree and cattree.nodes then
 
        for i, k in ipairs(index) do
                node = cattree.nodes[k.name]
-               if node.title and node.target then
+               if not node.hidden and 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>
@@ -144,7 +144,7 @@ end
        <div class="modemenu">
                <ul><%
                        for k,node in pairs(tree.nodes) do
-                               if node.title then %>
+                               if node.title and not node.hidden then %>
                                        <li<% if request[1] == k then %> class="active"<%end%>><a href="<%=controller%>/<%=k%>"><%=node.title%></a></li>
 <%                             end
                        end%>

diff --git a/themes/openwrt-light/luasrc/view/themes/openwrt-light/header.htm b/themes/openwrt-light/luasrc/view/themes/openwrt-light/header.htm
index 43abeedf7988ebae92f21c2b4b2b22b2afb21181..e9e1a135af0c2dc8b51b62b80b482b1bd9545f72 100644 (file)
--- a/themes/openwrt-light/luasrc/view/themes/openwrt-light/header.htm
+++ b/themes/openwrt-light/luasrc/view/themes/openwrt-light/header.htm
@@ -93,7 +93,7 @@ end
        <div id="mainmenu" class="mainmenu">
 <%-
 local function submenu(prefix, node)
-       if not node.nodes then
+       if node.hidden or not node.nodes then
                return false
        end
        local index = {}
@@ -111,7 +111,7 @@ local function submenu(prefix, node)
 %>
        <ul>
        <%- for j, v in pairs(index) do
-               if #v.name > 0 then
+               if not v.hidden and #v.name > 0 then
                        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
@@ -137,7 +137,7 @@ if cattree and cattree.nodes then
 
        for i, k in ipairs(index) do
                node = cattree.nodes[k.name]
-               if node.title and node.target then
+               if not node.hidden and 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>
@@ -151,7 +151,7 @@ end
        <div class="modemenu">
                <ul><%
                        for k,node in pairs(tree.nodes) do
-                               if node.title then %>
+                               if node.title and not node.hidden then %>
                                        <li<% if request[1] == k then %> class="active"<%end%>><a href="<%=controller%>/<%=k%>"><%=node.title%></a></li>
 <%                             end
                        end%>

diff --git a/themes/openwrt.org/luasrc/view/themes/openwrt.org/header.htm b/themes/openwrt.org/luasrc/view/themes/openwrt.org/header.htm
index b26b68a3df2e805595064699c0816c3cbe7369b7..56cd1b681773d229d110159c172beb9048e151ac 100644 (file)
--- a/themes/openwrt.org/luasrc/view/themes/openwrt.org/header.htm
+++ b/themes/openwrt.org/luasrc/view/themes/openwrt.org/header.htm
@@ -94,7 +94,7 @@ end
        <div id="mainmenu" class="mainmenu">
 <%-
 local function submenu(prefix, node)
-       if not node.nodes then
+       if not node.nodes and not node.hidden then
                return false
        end
        local index = {}
@@ -138,7 +138,7 @@ if cattree and cattree.nodes then
 
        for i, k in ipairs(index) do
                node = cattree.nodes[k.name]
-               if node.title and node.target then
+               if node.title and node.target and not node.hidden 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>
@@ -152,7 +152,7 @@ end
        <div class="modemenu">
                <ul><%
                        for k,node in pairs(tree.nodes) do
-                               if node.title then %>
+                               if node.title and not node.hidden then %>
                                        <li<% if request[1] == k then %> class="active"<%end%>><a href="<%=controller%>/<%=k%>"><%=node.title%></a></li>
 <%                             end
                        end%>