From c0de036b3162d73e9fad878afaa32e7ca0df1fed Mon Sep 17 00:00:00 2001
From: Jo-Philipp Wich <jo@mein.io>
Date: Sat, 7 Jul 2018 15:12:47 +0200
Subject: treewide: always include cbi.js

Include cbi.js in the main header template like it is done for xhr.js and
remove the page specific includes.

Signed-off-by: Jo-Philipp Wich <jo@mein.io>
---
 .../luasrc/view/themes/openwrt.org/header.htm                 | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

(limited to 'themes/luci-theme-openwrt')

diff --git a/themes/luci-theme-openwrt/luasrc/view/themes/openwrt.org/header.htm b/themes/luci-theme-openwrt/luasrc/view/themes/openwrt.org/header.htm
index 773cf1f82e..e77f9a4bfe 100644
--- a/themes/luci-theme-openwrt/luasrc/view/themes/openwrt.org/header.htm
+++ b/themes/luci-theme-openwrt/luasrc/view/themes/openwrt.org/header.htm
@@ -87,6 +87,9 @@
 		local childs = disp.node_childs(node)
 		if #childs > 0 then
 			if level > 2 then
+				if level == 3 then
+					write('<div id="tabmenu">')
+				end
 				write('<ul class="cbi-tabmenu">')
 			end
 
@@ -112,6 +115,9 @@
 
 			if level > 2 then
 				write('</ul>')
+				if level == 3 then
+					write('</div>')
+				end
 			end
 
 			if selected_node then
@@ -157,6 +163,7 @@
 <%= css %>
 </style>
 <% end -%>
+<script type="text/javascript" src="<%=resource%>/cbi.js"></script>
 <script type="text/javascript" src="<%=resource%>/xhr.js"></script>
 <script type="text/javascript">//<![CDATA[
 	document.addEventListener('DOMContentLoaded', function() {
@@ -240,9 +247,7 @@
 	</div>
 
 	<div id="maincontent">
-		<div id="tabmenu">
-			<% if category then render_tabmenu(category, cattree) end %>
-		</div>
+		<% if category then render_tabmenu(category, cattree) end %>
 
 		<noscript>
 			<div class="alert-message warning">
-- 
cgit v1.2.3