dbxe
/
fusionpbx
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Theme - Side Menu: More adjustments.

This commit is contained in:
fusionate 2024-09-09 12:29:49 -06:00
parent 6059c1e7d1
commit f4fbb34e5f
No known key found for this signature in database
3 changed files with 44 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

47
resources/classes/menu.php
View File

@ -1101,40 +1101,41 @@ if (!class_exists('menu')) {
//menu brand image and/or text //menu brand image and/or text
$html .= " <div id='menu_side_control_container'>\n"; $html .= " <div id='menu_side_control_container'>\n";
$html .= " <div class='menu_side_control_state' style='float: right; ".($_SESSION['theme']['menu_side_state']['text'] != 'expanded' ? 'display: none' : null)."'>\n"; $html .= " <div class='menu_side_control_state' style='float: right; ".($_SESSION['theme']['menu_side_state']['text'] != 'expanded' ? 'display: none' : null)."'>\n";
if ($_SESSION['theme']['menu_brand_type']['text'] != 'none') { if ($_SESSION['theme']['menu_brand_type']['text'] != 'none' && ($_SESSION['theme']['menu_side_pin']['boolean'] == 'false' || $_SESSION['theme']['menu_side_pin']['boolean'] == '')) {
$html .= " <a class='menu_side_item_main menu_side_contract' onclick='menu_side_contract();' style='padding: 8px 15px !important; ".($_SESSION['theme']['menu_side_state']['text'] != 'expanded' ? "display: none;" : null)."'><i class='fa-solid fa-bars fa-fw'></i></a>"; $html .= " <a class='menu_side_item_main menu_side_contract' onclick='menu_side_contract();' style='height: 50px; padding: 15px 16px 8px 16px !important; ".($_SESSION['theme']['menu_side_state']['text'] != 'expanded' ? "display: none;" : null)."'><i class='fa-solid fa-bars fa-fw'></i></a>";
} }
if ($_SESSION['theme']['menu_side_pin']['boolean'] == 'true') { if ($_SESSION['theme']['menu_side_pin']['boolean'] == 'true') {
$menu_side_state_set_height_top_padding = $_SESSION['theme']['menu_brand_type']['text'] != 'image' && $_SESSION['theme']['menu_brand_type']['text'] != 'image_text' ? 'height: 50px; padding-top: 16px !important;' : null; $html .= " <a class='menu_side_item_main' id='menu_side_state_set_expanded' onclick=\"menu_side_state_set('expanded');\" oncontextmenu=\"menu_side_state_set('delete'); return false;\" style='height: 50px; padding: 15px 16px 8px 16px !important; ".($_SESSION['theme']['menu_side_state']['text'] == 'expanded' ? 'display: none' : null)."' title=\"".$this->text['theme-label-pin_menu']."\"><i class='fa-solid fa-toggle-off fa-sm fa-fw'></i></a>\n";
$html .= "<a class='menu_side_item_main' id='menu_side_state_set_expanded' onclick=\"menu_side_state_set('expanded');\" oncontextmenu=\"menu_side_state_set('delete'); return false;\" style='padding: 8px 16px 8px 16px !important; ".$menu_side_state_set_height_top_padding." ".($_SESSION['theme']['menu_side_state']['text'] == 'expanded' ? 'display: none' : null)."' title=\"".$this->text['theme-label-pin_menu']."\"><i class='fa-solid fa-toggle-off fa-sm fa-fw'></i></a>\n"; $html .= " <a class='menu_side_item_main' id='menu_side_state_set_contracted' onclick=\"menu_side_state_set('contracted');\" oncontextmenu=\"menu_side_state_set('delete'); return false;\" style='height: 50px; padding: 15px 16px 8px 16px !important; ".($_SESSION['theme']['menu_side_state']['text'] != 'expanded' ? 'display: none' : null)."' title=\"".$this->text['theme-label-unpin_menu']."\"><i class='fa-solid fa-toggle-on fa-sm fa-fw'></i></a>\n";
$html .= "<a class='menu_side_item_main' id='menu_side_state_set_contracted' onclick=\"menu_side_state_set('contracted');\" oncontextmenu=\"menu_side_state_set('delete'); return false;\" style='padding: 8px 16px 8px 16px !important; ".$menu_side_state_set_height_top_padding." ".($_SESSION['theme']['menu_side_state']['text'] != 'expanded' ? 'display: none' : null)."' title=\"".$this->text['theme-label-unpin_menu']."\"><i class='fa-solid fa-toggle-on fa-sm fa-fw'></i></a>\n";
} }
$html .= " </div>\n"; $html .= " </div>\n";
if ($_SESSION['theme']['menu_brand_type']['text'] == 'none') {
$html .= "<a class='menu_side_item_main menu_side_contract' onclick='menu_side_contract();' style='height: 50px; min-width: ".($_SESSION['theme']['menu_side_width_contracted']['text'] ?? 60)."px; ".($_SESSION['theme']['menu_side_pin']['boolean'] == 'true' ? "max-width: calc(100% - 50px);" : null)."' title=\"".$this->text['theme-label-contract_menu']."\"><i class='fa-solid fa-bars fa-fw' style='z-index: 99800; padding-left: 1px; padding-top: 8px;'></i></a>";
}
$menu_brand_text = !empty($_SESSION['theme']['menu_brand_text']['text']) ? escape($_SESSION['theme']['menu_brand_text']['text']) : "FusionPBX"; $menu_brand_text = !empty($_SESSION['theme']['menu_brand_text']['text']) ? escape($_SESSION['theme']['menu_brand_text']['text']) : "FusionPBX";
if ($_SESSION['theme']['menu_brand_type']['text'] == 'text') { switch ($_SESSION['theme']['menu_brand_type']['text']) {
$html .= " <a class='menu_brand_text' ".($_SESSION['theme']['menu_side_state']['text'] != 'expanded' ? "style='display: none;'" : null)." href='".PROJECT_PATH."/'>".$menu_brand_text."</a>\n"; case 'none':
} $html .= "<a class='menu_side_item_main menu_side_contract' onclick='menu_side_contract();' style='".($_SESSION['theme']['menu_side_state']['text'] != 'expanded' ? "display: none;" : null)." height: 50px; min-width: ".($_SESSION['theme']['menu_side_width_contracted']['text'] ?? 60)."px; ".($_SESSION['theme']['menu_side_pin']['boolean'] == 'true' ? "max-width: calc(100% - 50px);" : null)."' title=\"".$this->text['theme-label-contract_menu']."\"><i class='fa-solid fa-bars fa-fw' style='z-index: 99800; padding-left: 1px; padding-top: 8px;'></i></a>";
if ($_SESSION['theme']['menu_brand_type']['text'] == 'image' || $_SESSION['theme']['menu_brand_type']['text'] == '') { $html .= "<a class='menu_side_item_main menu_side_expand' onclick='menu_side_expand();' style='".($_SESSION['theme']['menu_side_state']['text'] == 'expanded' ? "display: none;" : null)." height: 50px;' title=\"".$text['theme-label-expand_menu']."\"><i class='fa-solid fa-bars fa-fw' style='z-index: 99800; padding-left: 1px; padding-top: 8px;'></i></a>";
break;
case 'text':
$html .= "<a class='menu_brand_text' ".($_SESSION['theme']['menu_side_state']['text'] != 'expanded' ? "style='display: none;'" : null)." href='".PROJECT_PATH."/'>".escape($menu_brand_text)."</a>\n";
$html .= "<a class='menu_side_item_main menu_side_expand' style='height: 50px; padding-top: 15px; ".($_SESSION['theme']['menu_side_state']['text'] == 'expanded' ? "display: none" : null)."' onclick='menu_side_expand();' title=\"".$this->text['theme-label-expand_menu']."\"><i class='fa-solid fa-bars fa-fw' style='z-index: 99800; padding-left: 1px;'></i></a>";
break;
case 'image_text':
$menu_brand_image_contracted = !empty($_SESSION['theme']['menu_side_brand_image_contracted']['text']) ? $_SESSION['theme']['menu_side_brand_image_contracted']['text'] : PROJECT_PATH."/themes/default/images/logo_side_contracted.png";
$html .= "<a class='menu_brand_image' href='".PROJECT_PATH."/'>";
$html .= "<img id='menu_brand_image_contracted' style='".($_SESSION['theme']['menu_side_state']['text'] == 'expanded' ? "display: none;" : null)."' src='".escape($menu_brand_image_contracted)."' title=\"".escape($menu_brand_text)."\">";
$html .= "<span id='menu_brand_image_expanded' class='menu_brand_text' ".($_SESSION['theme']['menu_side_state']['text'] != 'expanded' ? "style='display: none;'" : null).">".escape($menu_brand_text)."</span>";
$html .= "</a>\n";
break;
case 'image':
default:
$menu_brand_image_contracted = !empty($_SESSION['theme']['menu_side_brand_image_contracted']['text']) ? $_SESSION['theme']['menu_side_brand_image_contracted']['text'] : PROJECT_PATH."/themes/default/images/logo_side_contracted.png"; $menu_brand_image_contracted = !empty($_SESSION['theme']['menu_side_brand_image_contracted']['text']) ? $_SESSION['theme']['menu_side_brand_image_contracted']['text'] : PROJECT_PATH."/themes/default/images/logo_side_contracted.png";
$menu_brand_image_expanded = !empty($_SESSION['theme']['menu_side_brand_image_expanded']['text']) ? $_SESSION['theme']['menu_side_brand_image_expanded']['text'] : PROJECT_PATH."/themes/default/images/logo_side_expanded.png"; $menu_brand_image_expanded = !empty($_SESSION['theme']['menu_side_brand_image_expanded']['text']) ? $_SESSION['theme']['menu_side_brand_image_expanded']['text'] : PROJECT_PATH."/themes/default/images/logo_side_expanded.png";
$html .= " <a class='menu_brand_image' href='".PROJECT_PATH."/'>"; $html .= "<a class='menu_brand_image' href='".PROJECT_PATH."/'>";
$html .= "<img id='menu_brand_image_contracted' style='".($_SESSION['theme']['menu_side_state']['text'] == 'expanded' ? "display: none;" : null)."' src='".escape($menu_brand_image_contracted)."' title=\"".escape($menu_brand_text)."\">"; $html .= "<img id='menu_brand_image_contracted' style='".($_SESSION['theme']['menu_side_state']['text'] == 'expanded' ? "display: none;" : null)."' src='".escape($menu_brand_image_contracted)."' title=\"".escape($menu_brand_text)."\">";
$html .= "<img id='menu_brand_image_expanded' ".($_SESSION['theme']['menu_side_state']['text'] != 'expanded' ? "style='display: none;'" : null)." src='".escape($menu_brand_image_expanded)."' title=\"".escape($menu_brand_text)."\">"; $html .= "<img id='menu_brand_image_expanded' ".($_SESSION['theme']['menu_side_state']['text'] != 'expanded' ? "style='display: none;'" : null)." src='".escape($menu_brand_image_expanded)."' title=\"".escape($menu_brand_text)."\">";
$html .= "</a>\n"; $html .= "</a>\n";
break;
} }
if ($_SESSION['theme']['menu_brand_type']['text'] == 'image_text') {
$menu_brand_image_contracted = !empty($_SESSION['theme']['menu_side_brand_image_contracted']['text']) ? $_SESSION['theme']['menu_side_brand_image_contracted']['text'] : PROJECT_PATH."/themes/default/images/logo_side_contracted.png";
$html .= " <a class='menu_brand_image' href='".PROJECT_PATH."/'>";
$html .= "<img id='menu_brand_image_contracted' style='".($_SESSION['theme']['menu_side_state']['text'] == 'expanded' ? "display: none;" : null)."' src='".escape($menu_brand_image_contracted)."' title=\"".escape($menu_brand_text)."\">";
$html .= "<span id='menu_brand_image_expanded' ".($_SESSION['theme']['menu_side_state']['text'] != 'expanded' ? "style='display: none;'" : null).">".escape($menu_brand_text)."</span>";
$html .= "</a>\n";
}
// else {
// $html .= " <a class='menu_side_item_main menu_side_expand' ".($_SESSION['theme']['menu_side_state']['text'] == 'expanded' ? "style='display: none';" : null)." onclick='menu_side_expand();' title=\"".$this->text['theme-label-expand_menu']."\"><i class='fa-solid fa-bars fa-fw' style='z-index: 99800; padding-left: 1px;'></i></a>";
// }
$html .= " </div>\n"; $html .= " </div>\n";
//main menu items //main menu items
if (!empty($menu_array)) { if (!empty($menu_array)) {

20
themes/default/css.php
View File

@ -60,7 +60,7 @@ $menu_main_icon_color = $_SESSION['theme']['menu_main_icon_color']['text'] ?? '#
$menu_main_icon_color_hover = $_SESSION['theme']['menu_main_icon_color_hover']['text'] ?? '#fd9c03'; $menu_main_icon_color_hover = $_SESSION['theme']['menu_main_icon_color_hover']['text'] ?? '#fd9c03';
$body_header_background_color = $_SESSION['theme']['body_header_background_color']['text'] ?? 'transparent'; $body_header_background_color = $_SESSION['theme']['body_header_background_color']['text'] ?? 'transparent';
$body_header_shadow_color = $_SESSION['theme']['body_header_shadow_color']['text'] ?? ''; $body_header_shadow_color = $_SESSION['theme']['body_header_shadow_color']['text'] ?? '';
$body_header_brand_text_color = $_SESSION['theme']['body_header_brand_text_color']['text'] ?? 'rgba(0,0,0,0.90)'; $body_header_brand_text_color = $_SESSION['theme']['body_header_brand_text_color']['text'] ?? 'rgba(0,0,0,0.9)';
$body_header_brand_text_color_hover = $_SESSION['theme']['body_header_brand_text_color_hover']['text'] ?? 'rgba(0,0,0,1.0)'; $body_header_brand_text_color_hover = $_SESSION['theme']['body_header_brand_text_color_hover']['text'] ?? 'rgba(0,0,0,1.0)';
$body_header_brand_text_size = $_SESSION['theme']['body_header_brand_text_size']['text'] ?? '16px'; $body_header_brand_text_size = $_SESSION['theme']['body_header_brand_text_size']['text'] ?? '16px';
$button_height = $_SESSION['theme']['button_height']['text'] ?? '28px'; $button_height = $_SESSION['theme']['button_height']['text'] ?? '28px';
@ -867,20 +867,28 @@ else { //default: white
border: none; border: none;
height: auto; height: auto;
max-width: 145px; max-width: 145px;
max-height: 35px; max-height: 31px;
margin-left: -7px; margin-left: -7px;
} }
/* menu brand text */ /* menu brand text */
a.menu_brand_text { span.menu_brand_text {
display: inline-block; display: inline-block;
padding: 10px 20px;
color: <?=$menu_brand_text_color?>; color: <?=$menu_brand_text_color?>;
font-weight: 600; font-weight: 600;
white-space: nowrap; white-space: nowrap;
} }
a.menu_brand_text:hover { a.menu_brand_text {
display: inline-block;
padding: 15px 20px;
color: <?=$menu_brand_text_color?>;
font-weight: 600;
white-space: nowrap;
}
a.menu_brand_text:hover,
span.menu_brand_text:hover {
color: <?=$menu_brand_text_color_hover?>; color: <?=$menu_brand_text_color_hover?>;
text-decoration: none; text-decoration: none;
} }
@ -892,7 +900,7 @@ else { //default: white
z-index: 99901; z-index: 99901;
top: 0; top: 0;
padding: 0; padding: 0;
min-height: 75px; min-height: 61px;
text-align: left; text-align: left;
<?php if ($menu_main_background_image) { ?> <?php if ($menu_main_background_image) { ?>
background-image: url("<?=$menu_main_background_image?>"); background-image: url("<?=$menu_main_background_image?>");

2
themes/default/template.php
View File

@ -132,7 +132,7 @@
{/literal} {/literal}
{/if} {/if}
{literal} {literal}
// $('.menu_side_contract').hide(); $('.menu_side_contract').hide();
$('.menu_side_expand').show(); $('.menu_side_expand').show();
if ($(window).width() < 576) { if ($(window).width() < 576) {
$('#menu_side_container').hide(); $('#menu_side_container').hide();