nsinnovations/fusionpbx
2
0
Fork 0
mirror of https://github.com/fusionpbx/fusionpbx.git synced 2025-12-30 00:53:50 +00:00
Code Issues Packages Projects Releases Wiki Activity

Side Menu: Explicitly set content container width when side_menu_pin enabled to avoid issues with browser caching the css.

Browse Source
This commit is contained in:
fusionate
2024-09-04 13:49:44 -06:00
parent 86a4df04cf
commit 2eab5c623e
2 changed files with 8 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
resources/classes/menu.php
View File

@@ -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";

2
resources/footer.php
View File

@@ -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']);