From 3658fbfe24ca0cebe2ab51b6e21f3e690a923013 Mon Sep 17 00:00:00 2001
From: camer0n <e107inc@gmail.com>
Date: Sat, 19 Apr 2025 09:59:10 -0700
Subject: [PATCH] Issue #5473 Collapsing adminMenu now functional.

---
 e107_core/templates/admin_template.php       |  2 +-
 e107_handlers/admin_ui.php                   |  5 +++-
 e107_handlers/sitelinks_class.php            |  1 -
 e107_themes/bootstrap3/css/modern-dark-2.css |  3 +-
 e107_web/js/core/admin.jquery.js             | 29 +++++++++++++++++++-
 5 files changed, 35 insertions(+), 5 deletions(-)

diff --git a/e107_core/templates/admin_template.php b/e107_core/templates/admin_template.php
index f7a6abbc9..a9bbddacd 100644
--- a/e107_core/templates/admin_template.php
+++ b/e107_core/templates/admin_template.php
@@ -309,7 +309,7 @@ $ADMIN_TEMPLATE['menu']['button_active'] = '
 ';
 
 $ADMIN_TEMPLATE['menu']['start_sub'] = '
-	<ul class="plugin-navigation-sub nav nav-pills nav-stacked nav-second-level collapse" id="sub-{LINK_ID}">
+	<ul class="plugin-navigation-sub nav nav-pills nav-stacked nav-second-level {SUB_CLASS}" id="sub-{LINK_ID}">
 ';
 
 $ADMIN_TEMPLATE['menu']['button_sub'] = '
diff --git a/e107_handlers/admin_ui.php b/e107_handlers/admin_ui.php
index 80055e145..bc628ca89 100755
--- a/e107_handlers/admin_ui.php
+++ b/e107_handlers/admin_ui.php
@@ -1651,6 +1651,7 @@ class e_admin_dispatcher
 					'data-target' => '#sub-' . $item['link_id'],
 					'role'        => 'button'
 				];
+				$item['sub_class'] = 'collapse';
 				$item['caret'] = true; // Indicate caret for sub-menu parents
 
 				// Check if any sub-item is active to expand the parent
@@ -1660,14 +1661,16 @@ class e_admin_dispatcher
 					{
 						$parent = $subItem['group'];
 						$var[$parent]['link_data']['aria-expanded'] = 'true';
+						$item['sub_class'] = 'collapse in';
 					}
 
+
 				}
 
 			}
 			elseif(!isset($item['link']))
 			{
-				$tmp = explode('/', trim($key, '/'), 3);
+				$tmp = explode('/', trim($key, '/'), 2);
 				$item['link'] = e_REQUEST_SELF . '?mode=' . $tmp[0] . '&action=' . ($tmp[1] ?? 'main');
 			}
 		}
diff --git a/e107_handlers/sitelinks_class.php b/e107_handlers/sitelinks_class.php
index 7980c0d66..ed9d779c8 100644
--- a/e107_handlers/sitelinks_class.php
+++ b/e107_handlers/sitelinks_class.php
@@ -1509,7 +1509,6 @@ i.e-cat_users-32{ background-position: -555px 0; width: 32px; height: 32px; }
 				$replace['SUB_CLASS'] = ' '.varset($e107_vars[$act]['sub_class'], 'e-hideme e-expandme');
 
 
-
 				$replace['SUB_MENU']  = $tp->parseTemplate($START_SUB, false, $replace);
 				$replace['SUB_MENU'] .= $this->admin(false, $active_page, $e107_vars[$act]['sub'], $tmpl, true, (isset($e107_vars[$act]['sort']) ? $e107_vars[$act]['sort'] : $sortlist));
 				$replace['SUB_MENU'] .= $tmpl['end_sub'] ?? '';
diff --git a/e107_themes/bootstrap3/css/modern-dark-2.css b/e107_themes/bootstrap3/css/modern-dark-2.css
index 579801815..a73598ed0 100644
--- a/e107_themes/bootstrap3/css/modern-dark-2.css
+++ b/e107_themes/bootstrap3/css/modern-dark-2.css
@@ -1563,6 +1563,7 @@ thead th, thead tr, .table > thead > tr > th { border-bottom: 0; border-left:0;
         z-index: 1000;
         background: #373737;
         height: 100%;
+        padding-left: 5px;
         }
 
         div.admin-left-panel-collapsed .admin-right-panel {
@@ -1683,7 +1684,7 @@ body {
 #admin-ui-nav-menu a { color: rgba(255,255,255,0.5); }
 #admin-ui-nav-menu a:hover { color: rgba(255,255,255,1); }
 #admin-ui-nav-menu span.sidebar-toggle-panel { display: flex;  justify-content: space-between;}
-#admin-ui-nav-menu .caret-icon { font-size:1.2em; margin-top:8px }
+#admin-ui-nav-menu .caret-icon { font-size:1.2em; margin-top:10px }
 #admin-ui-nav-menu a:hover .caret-icon { color: rgba(255,255,255,1); }
 #admin-ui-nav-menu a:active { background-color: #2E77B6; color:white }
 
diff --git a/e107_web/js/core/admin.jquery.js b/e107_web/js/core/admin.jquery.js
index 61669ab1d..75b0deef7 100644
--- a/e107_web/js/core/admin.jquery.js
+++ b/e107_web/js/core/admin.jquery.js
@@ -454,6 +454,29 @@ $(document).ready(function()
 				return true;
 			}
 		);
+
+		$('#admin-ui-nav-menu a[data-toggle="collapse"]').each(function() {
+		var $link = $(this);
+		var $caret = $link.find('.caret-icon');
+		if ($caret.length) {
+			var target = $($link.attr('data-target'));
+
+			// Initial state on page load
+			if (target.hasClass('in')) {
+				$caret.removeClass('fa-chevron-down').addClass('fa-chevron-up');
+			} else {
+				$caret.removeClass('fa-chevron-up').addClass('fa-chevron-down');
+			}
+
+			// Listen for Bootstrap collapse events
+			target.on('shown.bs.collapse', function() {
+				$caret.removeClass('fa-chevron-down').addClass('fa-chevron-up');
+			}).on('hidden.bs.collapse', function() {
+				$caret.removeClass('fa-chevron-up').addClass('fa-chevron-down');
+			});
+		}
+	});
+
 		
 		$('input[data-loading-text]').on('click', function()
 			{
@@ -726,7 +749,7 @@ $(document).ready(function()
 		
 		// Admin Prefs Navigation
 		
-		 $(".plugin-navigation a").click(function () {
+		 $("#admin-prefs .plugin-navigation a").click(function () {
 		 	$(".plugin-navigation a").each(function(index) {
     			var ot = $(this).attr("href");
     			if (ot.split('#')[1]) {
@@ -735,6 +758,10 @@ $(document).ready(function()
 				$(this).closest("li").removeClass("active");
 				$(this).switchClass( "link-active", "link", 0 );
 			});
+
+
+
+
 	   		var id = $(this).attr("href"), hash = id.split('#')[1], form = $('.admin-menu')[0]; // FIXME - a better way to detect the page form
 	   		
 			$(this).switchClass( "link", "link-active", 30 );