From 1ac8df2614336b34109375e62f201cf6bac46734 Mon Sep 17 00:00:00 2001 From: Jo-Philipp Wich Date: Wed, 15 Apr 2020 22:46:25 +0200 Subject: luci-theme-bootstrap: rework menu rendering 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 --- .../luasrc/view/themes/bootstrap/footer.htm | 1 + .../luasrc/view/themes/bootstrap/header.htm | 10 +- .../luasrc/view/themes/bootstrap/json-menu.htm | 134 --------------------- 3 files changed, 2 insertions(+), 143 deletions(-) delete mode 100644 themes/luci-theme-bootstrap/luasrc/view/themes/bootstrap/json-menu.htm (limited to 'themes/luci-theme-bootstrap/luasrc') diff --git a/themes/luci-theme-bootstrap/luasrc/view/themes/bootstrap/footer.htm b/themes/luci-theme-bootstrap/luasrc/view/themes/bootstrap/footer.htm index ec6895f06d..d0c395bf31 100644 --- a/themes/luci-theme-bootstrap/luasrc/view/themes/bootstrap/footer.htm +++ b/themes/luci-theme-bootstrap/luasrc/view/themes/bootstrap/footer.htm @@ -12,6 +12,7 @@ + diff --git a/themes/luci-theme-bootstrap/luasrc/view/themes/bootstrap/header.htm b/themes/luci-theme-bootstrap/luasrc/view/themes/bootstrap/header.htm index 39415154aa..89aa338152 100644 --- a/themes/luci-theme-bootstrap/luasrc/view/themes/bootstrap/header.htm +++ b/themes/luci-theme-bootstrap/luasrc/view/themes/bootstrap/header.htm @@ -35,9 +35,6 @@ <% end -%> - - - <% include("themes/bootstrap/json-menu") %> "> @@ -46,12 +43,7 @@

<%=boardinfo.hostname or "?"%> -

- -

diff --git a/themes/luci-theme-bootstrap/luasrc/view/themes/bootstrap/json-menu.htm b/themes/luci-theme-bootstrap/luasrc/view/themes/bootstrap/json-menu.htm deleted file mode 100644 index ea11cf2263..0000000000 --- a/themes/luci-theme-bootstrap/luasrc/view/themes/bootstrap/json-menu.htm +++ /dev/null @@ -1,134 +0,0 @@ - -- cgit v1.2.3