luci-theme-openwrt: rework menu rendering
authorJo-Philipp Wich <jo@mein.io>
Wed, 15 Apr 2020 20:43:05 +0000 (22:43 +0200)
committerJo-Philipp Wich <jo@mein.io>
Thu, 7 May 2020 17:40:50 +0000 (19:40 +0200)
Utilize the LuCI.ui.menu class to load, traverse and cache the menu tree
in the local session store.

Signed-off-by: Jo-Philipp Wich <jo@mein.io>
[only render menu when logged in for 19.07]
(backported from commit 48269ade6163c34f348632bf225e2c6649b0a9c1)

themes/luci-theme-openwrt/htdocs/luci-static/resources/menu-openwrt.js [new file with mode: 0644]
themes/luci-theme-openwrt/luasrc/view/themes/openwrt.org/footer.htm
themes/luci-theme-openwrt/luasrc/view/themes/openwrt.org/header.htm

diff --git a/themes/luci-theme-openwrt/htdocs/luci-static/resources/menu-openwrt.js b/themes/luci-theme-openwrt/htdocs/luci-static/resources/menu-openwrt.js
new file mode 100644 (file)
index 0000000..ca97838
--- /dev/null
@@ -0,0 +1,133 @@
+'use strict';
+'require baseclass';
+'require ui';
+
+return baseclass.extend({
+       __init__: function() {
+               ui.menu.load().then(L.bind(this.render, this));
+       },
+
+       render: function(tree) {
+               var node = tree,
+                   url = '';
+
+               this.renderModeMenu(tree);
+
+               if (L.env.dispatchpath.length >= 3) {
+                       for (var i = 0; i < 3 && node; i++) {
+                               node = node.children[L.env.dispatchpath[i]];
+                               url = url + (url ? '/' : '') + L.env.dispatchpath[i];
+                       }
+
+                       if (node)
+                               this.renderTabMenu(node, url);
+               }
+       },
+
+       handleMenuExpand: function(ev) {
+               var a = ev.target, ul1 = a.parentNode.parentNode, ul2 = a.nextElementSibling;
+
+               document.querySelectorAll('ul.mainmenu.l1 > li.active').forEach(function(li) {
+                       if (li !== a.parentNode)
+                               li.classList.remove('active');
+               });
+
+               if (!ul2)
+                       return;
+
+               if (ul2.parentNode.offsetLeft + ul2.offsetWidth <= ul1.offsetLeft + ul1.offsetWidth)
+                       ul2.classList.add('align-left');
+
+               ul1.classList.add('active');
+               a.parentNode.classList.add('active');
+               a.blur();
+
+               ev.preventDefault();
+               ev.stopPropagation();
+       },
+
+       renderMainMenu: function(tree, url, level) {
+               var l = (level || 0) + 1,
+                   ul = E('ul', { 'class': 'mainmenu l%d'.format(l) }),
+                   children = ui.menu.getChildren(tree);
+
+               if (children.length == 0 || l > 2)
+                       return E([]);
+
+               for (var i = 0; i < children.length; i++) {
+                       var isActive = (L.env.dispatchpath[l] == children[i].name),
+                           activeClass = 'mainmenu-item-%s%s'.format(children[i].name, isActive ? ' selected' : '');
+
+                       ul.appendChild(E('li', { 'class': activeClass }, [
+                               E('a', {
+                                       'href': L.url(url, children[i].name),
+                                       'click': (l == 1) ? this.handleMenuExpand : null,
+                               }, [ _(children[i].title) ]),
+                               this.renderMainMenu(children[i], url + '/' + children[i].name, l)
+                       ]));
+               }
+
+               if (l == 1) {
+                       var container = document.querySelector('#mainmenu');
+
+                       container.appendChild(ul);
+                       container.style.display = '';
+               }
+
+               return ul;
+       },
+
+       renderModeMenu: function(tree) {
+               var ul = document.querySelector('#modemenu'),
+                   children = ui.menu.getChildren(tree);
+
+               for (var i = 0; i < children.length; i++) {
+                       var isActive = (L.env.requestpath.length ? children[i].name == L.env.requestpath[0] : i == 0);
+
+                       ul.appendChild(E('li', {}, [
+                               E('a', {
+                                       'href': L.url(children[i].name),
+                                       'class': isActive ? 'active' : null
+                               }, [ _(children[i].title) ])
+                       ]));
+
+                       if (isActive)
+                               this.renderMainMenu(children[i], children[i].name);
+               }
+
+               if (ul.children.length > 1)
+                       ul.style.display = '';
+       },
+
+       renderTabMenu: function(tree, url, level) {
+               var container = document.querySelector('#tabmenu'),
+                   l = (level || 0) + 1,
+                   ul = E('ul', { 'class': 'cbi-tabmenu' }),
+                   children = ui.menu.getChildren(tree),
+                   activeNode = null;
+
+               if (children.length == 0)
+                       return E([]);
+
+               for (var i = 0; i < children.length; i++) {
+                       var isActive = (L.env.dispatchpath[l + 2] == children[i].name),
+                           activeClass = isActive ? ' cbi-tab' : '',
+                           className = 'tabmenu-item-%s %s'.format(children[i].name, activeClass);
+
+                       ul.appendChild(E('li', { 'class': className }, [
+                               E('a', { 'href': L.url(url, children[i].name) }, [ _(children[i].title) ] )
+                       ]));
+
+                       if (isActive)
+                               activeNode = children[i];
+               }
+
+               container.appendChild(ul);
+               container.style.display = '';
+
+               if (activeNode)
+                       container.appendChild(this.renderTabMenu(activeNode, url + '/' + activeNode.name, l));
+
+               return ul;
+       }
+});
index a056dd84f2f11f1704f37ab35a03e97989312a0b..48ca73bd0a3810cd586b9b0ad5fb11a394f72757 100644 (file)
        <% local ver = require "luci.version" -%>
        Powered by <%= ver.luciname %> (<%= ver.luciversion %>)
 </p>
+
+<% if luci.dispatcher.context.authsession then %>
+<script type="text/javascript">L.require('menu-openwrt')</script>
+<% end %>
+
 </body>
 </html>
index e5b20992cb46db68c295ec9728cda7db119bd0a3..376aee99cbbffe5892280fe614f0ce030d90598f 100644 (file)
 <% end -%>
 <script type="text/javascript" src="<%=url('admin/translations', luci.i18n.context.lang)%><%# ?v=PKG_VERSION %>"></script>
 <script type="text/javascript" src="<%=resource%>/cbi.js"></script>
-<script type="text/javascript" src="<%=resource%>/xhr.js"></script>
-<script type="text/javascript">//<![CDATA[
-       (function() {
-               function get_children(node) {
-                       var children = [];
-
-                       for (var k in node.children) {
-                               if (!node.children.hasOwnProperty(k))
-                                       continue;
-
-                               if (!node.children[k].satisfied)
-                                       continue;
-
-                               if (!node.children[k].hasOwnProperty('title'))
-                                       continue;
-
-                               children.push(Object.assign(node.children[k], { name: k }));
-                       }
-
-                       return children.sort(function(a, b) {
-                               return ((a.order || 1000) - (b.order || 1000));
-                       });
-               }
-
-               function handle_mainmenu_expand(ev) {
-                       var a = ev.target, ul1 = a.parentNode.parentNode, ul2 = a.nextElementSibling;
-
-                       document.querySelectorAll('ul.mainmenu.l1 > li.active').forEach(function(li) {
-                               if (li !== a.parentNode)
-                                       li.classList.remove('active');
-                       });
-
-                       if (!ul2)
-                               return;
-
-                       if (ul2.parentNode.offsetLeft + ul2.offsetWidth <= ul1.offsetLeft + ul1.offsetWidth)
-                               ul2.classList.add('align-left');
 
-                       ul1.classList.add('active');
-                       a.parentNode.classList.add('active');
-                       a.blur();
-
-                       ev.preventDefault();
-                       ev.stopPropagation();
-               }
-
-               function render_mainmenu(tree, url, level) {
-                       var l = (level || 0) + 1,
-                           ul = E('ul', { 'class': 'mainmenu l%d'.format(l) }),
-                           children = get_children(tree);
-
-                       if (children.length == 0 || l > 2)
-                               return E([]);
-
-                       for (var i = 0; i < children.length; i++) {
-                               var isActive = (L.env.dispatchpath[l] == children[i].name),
-                                   activeClass = 'mainmenu-item-%s%s'.format(children[i].name, isActive ? ' selected' : '');
-
-                               ul.appendChild(E('li', { 'class': activeClass }, [
-                                       E('a', {
-                                               'href': L.url(url, children[i].name),
-                                               'click': (l == 1) ? handle_mainmenu_expand : null,
-                                       }, [ _(children[i].title) ]),
-                                       render_mainmenu(children[i], url + '/' + children[i].name, l)
-                               ]));
-                       }
-
-                       if (l == 1) {
-                               var container = document.querySelector('#mainmenu');
-
-                               container.appendChild(ul);
-                               container.style.display = '';
-                       }
-
-                       return ul;
-               }
-
-               function render_modemenu(tree) {
-                       var ul = document.querySelector('#modemenu'),
-                           children = get_children(tree);
-
-                       for (var i = 0; i < children.length; i++) {
-                               var isActive = (L.env.requestpath.length ? children[i].name == L.env.requestpath[0] : i == 0);
-
-                               ul.appendChild(E('li', {}, [
-                                       E('a', {
-                                               'href': L.url(children[i].name),
-                                               'class': isActive ? 'active' : null
-                                       }, [ _(children[i].title) ])
-                               ]));
-
-                               if (isActive)
-                                       render_mainmenu(children[i], children[i].name);
-                       }
-
-                       if (ul.children.length > 1)
-                               ul.style.display = '';
-               }
-
-               function render_tabmenu(tree, url, level) {
-                       var container = document.querySelector('#tabmenu'),
-                           l = (level || 0) + 1,
-                           ul = E('ul', { 'class': 'cbi-tabmenu' }),
-                           children = get_children(tree),
-                           activeNode = null;
-
-                       if (children.length == 0)
-                               return E([]);
-
-                       for (var i = 0; i < children.length; i++) {
-                               var isActive = (L.env.dispatchpath[l + 2] == children[i].name),
-                                   activeClass = isActive ? ' cbi-tab' : '',
-                                   className = 'tabmenu-item-%s %s'.format(children[i].name, activeClass);
-
-                               ul.appendChild(E('li', { 'class': className }, [
-                                       E('a', { 'href': L.url(url, children[i].name) }, [ _(children[i].title) ] )
-                               ]));
-
-                               if (isActive)
-                                       activeNode = children[i];
-                       }
-
-                       container.appendChild(ul);
-                       container.style.display = '';
-
-                       if (activeNode)
-                               container.appendChild(render_tabmenu(activeNode, url + '/' + activeNode.name, l));
-
-                       return ul;
-               }
-
-               document.addEventListener('luci-loaded', function(ev) {
-                       var tree = <%= luci.http.write_json(luci.dispatcher.context.authsession and luci.dispatcher.menu_json() or {}) %>,
-                           node = tree,
-                           url = '';
-
-                       render_modemenu(tree);
-
-                       if (L.env.dispatchpath.length >= 3) {
-                               for (var i = 0; i < 3 && node; i++) {
-                                       node = node.children[L.env.dispatchpath[i]];
-                                       url = url + (url ? '/' : '') + L.env.dispatchpath[i];
-                               }
-
-                               if (node)
-                                       render_tabmenu(node, url);
-                       }
-               });
-       })();
-//]]></script>
 <title><%=striptags( (boardinfo.hostname or "?") .. ( (node and node.title) and ' - ' .. translate(node.title) or '')) %> - LuCI</title>
 </head>
 <body class="lang_<%=luci.i18n.context.lang%>" data-page="<%= pcdata(table.concat(disp.context.requestpath, "-")) %>">
        <%:Load%>: <%="%.2f" % (loadinfo[1] / 65535.0)%> <%="%.2f" % (loadinfo[2] / 65535.0)%> <%="%.2f" % (loadinfo[3] / 65535.0)%>
 </div>
 
-<div id="indicators">
-       <span id="xhr_poll_status" style="display:none" onclick="XHR.running() ? XHR.halt() : XHR.run()">
-               <span id="xhr_poll_status_on"><%:Auto Refresh%>: <%:on%></span>
-               <span id="xhr_poll_status_off" style="display:none"><%:Auto Refresh%>: <%:off%></span>
-       </span>
-</div>
+<div id="indicators"></div>
 
 <ul id="modemenu" style="display:none"></ul>