From 2eab5c623eb7a248e8db66ba00dc8803871b9aff Mon Sep 17 00:00:00 2001
From: fusionate <nate@fusionpbx.com>
Date: Wed, 4 Sep 2024 13:49:44 -0600
Subject: [PATCH] Side Menu: Explicitly set content container width when
 side_menu_pin enabled to avoid issues with browser caching the css.

---
 resources/classes/menu.php | 8 +++++++-
 resources/footer.php       | 2 +-
 2 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/resources/classes/menu.php b/resources/classes/menu.php
index 4df58f2e85..c7ea193f58 100644
--- a/resources/classes/menu.php
+++ b/resources/classes/menu.php
@@ -1158,7 +1158,13 @@ if (!class_exists('menu')) {
 			if ($_SESSION['theme']['menu_side_state']['text'] != 'expanded' && $_SESSION['theme']['menu_side_state']['text'] != 'hidden') {
 				$content_container_onclick = "onclick=\"clearTimeout(menu_side_contract_timer); if ($(window).width() >= 576) { menu_side_contract(); }\"";
 			}
-			$html .= "<div id='content_container' ".$content_container_onclick.">\n";
+			//explicitly set content container width when side menu enabled
+			switch ($_SESSION['theme']['menu_side_state']['text']) {
+				case 'expanded': $content_container_width = $_SESSION['theme']['menu_side_width_expanded']['text'] ?? 225; break;
+				case 'hidden': $content_container_width = 0; break;
+				default: $content_container_width = $_SESSION['theme']['menu_side_width_contracted']['text'] ?? 60;
+			}
+			$html .= "<div id='content_container' style='width: calc(100% - ".$content_container_width."px);' ".$content_container_onclick.">\n";
 			$html .= "	<div id='body_header'>\n";
 			//header: left
 				$html .= "<div class='float-left'>\n";
diff --git a/resources/footer.php b/resources/footer.php
index 000dbe3087..bd3f46044a 100644
--- a/resources/footer.php
+++ b/resources/footer.php
@@ -200,7 +200,7 @@
 					if ($_SESSION['theme']['menu_side_state']['text'] != 'hidden') {
 						$menu_side_toggle = $_SESSION['theme']['menu_side_toggle']['text'] == 'hover' ? " onmouseenter=\"clearTimeout(menu_side_contract_timer); if ($('#menu_side_container').width() < 100) { menu_side_expand_start(); }\" onmouseleave=\"clearTimeout(menu_side_expand_timer); if ($('#menu_side_container').width() > 100 && $('#menu_side_state_current').val() != 'expanded') { menu_side_contract_start(); }\"" : null;
 					}
-					$container_open = "<div id='menu_side_container' ".($_SESSION['theme']['menu_side_state']['text'] == 'hidden' ? "style='display: none;'" : "class='hide-xs'").$menu_side_toggle." >\n";
+					$container_open = "<div id='menu_side_container' style='width: ".(in_array($_SESSION['theme']['menu_side_state']['text'], ['expanded','hidden']) ? ($_SESSION['theme']['menu_side_width_expanded']['text'] ?? 225) : ($_SESSION['theme']['menu_side_width_contracted']['text'] ?? 60))."px; ".($_SESSION['theme']['menu_side_state']['text'] == 'hidden' ? "display: none;'" : "' class='hide-xs'").$menu_side_toggle." >\n";
 					$menu = new menu;
 					$menu->text = $text;
 					$menu_html = $menu->menu_vertical($_SESSION['menu']['array']);