diff --git a/core/default_settings/default_setting_edit.php b/core/default_settings/default_setting_edit.php index ea4c051e45..23e14ec725 100644 --- a/core/default_settings/default_setting_edit.php +++ b/core/default_settings/default_setting_edit.php @@ -611,8 +611,9 @@ } elseif ($category == "theme" && $subcategory == "menu_side_state" && $name == "text" ) { echo " \n"; } elseif ($category == "theme" && $subcategory == "menu_side_toggle" && $name == "text" ) { diff --git a/core/domain_settings/domain_setting_edit.php b/core/domain_settings/domain_setting_edit.php index b9b7f23436..b41c44aa80 100644 --- a/core/domain_settings/domain_setting_edit.php +++ b/core/domain_settings/domain_setting_edit.php @@ -668,8 +668,9 @@ if (count($_POST) > 0 && strlen($_POST["persistformvar"]) == 0) { } elseif ($category == "theme" && $subcategory == "menu_side_state" && $name == "text" ) { echo " \n"; } elseif ($category == "theme" && $subcategory == "menu_side_toggle" && $name == "text" ) { diff --git a/core/user_settings/user_setting_edit.php b/core/user_settings/user_setting_edit.php index df276d4bdc..7949d433b8 100644 --- a/core/user_settings/user_setting_edit.php +++ b/core/user_settings/user_setting_edit.php @@ -630,8 +630,9 @@ if (count($_POST) > 0 && strlen($_POST["persistformvar"]) == 0) { } elseif ($user_setting_category == "theme" && $user_setting_subcategory == "menu_side_state" && $user_setting_name == "text" ) { echo " \n"; } elseif ($user_setting_category == "theme" && $user_setting_subcategory == "menu_side_toggle" && $user_setting_name == "text" ) { diff --git a/resources/app_languages.php b/resources/app_languages.php index 60992940e5..5606259d01 100644 --- a/resources/app_languages.php +++ b/resources/app_languages.php @@ -4449,6 +4449,29 @@ $text['option-contracted']['sv-se'] = "Contracted"; $text['option-contracted']['uk-ua'] = "Contracted"; $text['option-contracted']['tr-tr'] = "Contracted"; +$text['option-hidden']['en-us'] = "Hidden"; +$text['option-hidden']['en-gb'] = "Hidden"; +$text['option-hidden']['ar-eg'] = "Hidden"; +$text['option-hidden']['de-at'] = "Hidden"; +$text['option-hidden']['de-ch'] = "Hidden"; +$text['option-hidden']['de-de'] = "Hidden"; +$text['option-hidden']['el-gr'] = "Hidden"; +$text['option-hidden']['es-cl'] = "Hidden"; +$text['option-hidden']['es-mx'] = "Hidden"; +$text['option-hidden']['fr-ca'] = "Hidden"; +$text['option-hidden']['fr-fr'] = "Hidden"; +$text['option-hidden']['he-il'] = "Hidden"; +$text['option-hidden']['it-it'] = "Hidden"; +$text['option-hidden']['nl-nl'] = "Hidden"; +$text['option-hidden']['pl-pl'] = "Hidden"; +$text['option-hidden']['pt-br'] = "Hidden"; +$text['option-hidden']['pt-pt'] = "Hidden"; +$text['option-hidden']['ro-ro'] = "Hidden"; +$text['option-hidden']['ru-ru'] = "Hidden"; +$text['option-hidden']['sv-se'] = "Hidden"; +$text['option-hidden']['uk-ua'] = "Hidden"; +$text['option-hidden']['tr-tr'] = "Hidden"; + $text['option-hover']['en-us'] = "Hover"; $text['option-hover']['en-gb'] = "Hover"; $text['option-hover']['ar-eg'] = "Hover"; diff --git a/resources/classes/menu.php b/resources/classes/menu.php index 316fcefd0d..8d2bb39a78 100644 --- a/resources/classes/menu.php +++ b/resources/classes/menu.php @@ -1085,7 +1085,7 @@ if (!class_exists('menu')) { } if ($_SESSION['theme']['menu_side_pin']['boolean'] == 'true') { $html .= " text['theme-label-pin_menu']."\">\n"; - $html .= " text['theme-label-unpin_menu']."\">\n"; + $html .= " text['theme-label-unpin_menu']."\">\n"; } $html .= " \n"; if ($_SESSION['theme']['menu_brand_type']['text'] == 'none') { @@ -1134,11 +1134,14 @@ if (!class_exists('menu')) { $html .= "
\n"; } $html .= "\n"; - $html .= "
= 576 && document.getElementById('menu_side_state_current').value != 'expanded') { menu_side_contract(); }\"" : null).">\n"; + 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 .= "
\n"; $html .= "
\n"; //header: left $html .= "
\n"; - $html .= button::create(['type'=>'button','title'=>$this->text['theme-label-expand_menu'],'icon'=>'bars','class'=>'default hide-sm-up float-left','onclick'=>'menu_side_expand();']); + $html .= button::create(['type'=>'button','id'=>'menu_side_state_hidden_button','title'=>$this->text['theme-label-expand_menu'],'icon'=>'bars','class'=>'default '.($_SESSION['theme']['menu_side_state']['text'] != 'hidden' ? 'hide-sm-up ' : null).'float-left','onclick'=>'menu_side_expand();']); if ($_SESSION['theme']['menu_brand_type']['text'] == 'text' || $_SESSION['theme']['menu_brand_type']['text'] == 'image_text') { $body_header_brand_text = $_SESSION['theme']['body_header_brand_text']['text'] != '' ? escape($_SESSION['theme']['body_header_brand_text']['text']) : "FusionPBX"; $html .= " \n"; diff --git a/resources/footer.php b/resources/footer.php index e72753e6c3..dfe6bb571d 100644 --- a/resources/footer.php +++ b/resources/footer.php @@ -187,13 +187,15 @@ //build menu by style switch ($_SESSION['theme']['menu_style']['text']) { case 'side': - $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 = "