diff --git a/resources/classes/menu.php b/resources/classes/menu.php index 2fcb92026f..c5f5852e53 100644 --- a/resources/classes/menu.php +++ b/resources/classes/menu.php @@ -1111,7 +1111,10 @@ if (!class_exists('menu')) { if (is_array($menu_array) && sizeof($menu_array) != 0) { foreach ($menu_array as $menu_index_main => $menu_item_main) { $menu_target = ($menu_item_main['menu_item_category'] == 'external') ? '_blank' : ''; - $html .= " "; + $html .= " "; + if (is_array($menu_item_main['menu_items']) && sizeof($menu_item_main['menu_items']) != 0 && $_SESSION['theme']['menu_side_item_main_sub_icons']['boolean'] == 'true') { + $html .= "
\n"; + } if ($menu_item_main['menu_item_icon'] != '') { $html .= ""; } diff --git a/resources/footer.php b/resources/footer.php index a844824fcc..6ad90e2138 100644 --- a/resources/footer.php +++ b/resources/footer.php @@ -189,6 +189,8 @@ $menu_html = $menu->menu_vertical($_SESSION['menu']['array']); unset($menu); $view->assign('menu_side_state', (isset($_SESSION['theme']['menu_side_state']['text']) && $_SESSION['theme']['menu_side_state']['text'] != '' ? $_SESSION['theme']['menu_side_state']['text'] : 'contracted')); + $view->assign('menu_side_item_main_sub_icon_expand', (isset($_SESSION['theme']['menu_side_item_main_sub_icon_expand']['text']) && $_SESSION['theme']['menu_side_item_main_sub_icon_expand']['text'] != '' ? $_SESSION['theme']['menu_side_item_main_sub_icon_expand']['text'] : 'chevron-down')); + $view->assign('menu_side_item_main_sub_icon_contract', (isset($_SESSION['theme']['menu_side_item_main_sub_icon_contract']['text']) && $_SESSION['theme']['menu_side_item_main_sub_icon_contract']['text'] != '' ? $_SESSION['theme']['menu_side_item_main_sub_icon_contract']['text'] : 'chevron-up')); break; case 'inline': $container_open = "
\n"; diff --git a/themes/default/app_config.php b/themes/default/app_config.php index 1f8d58927b..c2ff1dbc36 100644 --- a/themes/default/app_config.php +++ b/themes/default/app_config.php @@ -1743,6 +1743,30 @@ $apps[$x]['default_settings'][$y]['default_setting_enabled'] = "true"; $apps[$x]['default_settings'][$y]['default_setting_description'] = "Set whether the Side Menu opens & closes with a click (focus) or by mouse over/out (hover)."; $y++; + $apps[$x]['default_settings'][$y]['default_setting_uuid'] = "994acf94-09df-42ec-b2c1-c3fc7d665cb9"; + $apps[$x]['default_settings'][$y]['default_setting_category'] = "theme"; + $apps[$x]['default_settings'][$y]['default_setting_subcategory'] = "menu_side_item_main_sub_icons"; + $apps[$x]['default_settings'][$y]['default_setting_name'] = "boolean"; + $apps[$x]['default_settings'][$y]['default_setting_value'] = "true"; + $apps[$x]['default_settings'][$y]['default_setting_enabled'] = "true"; + $apps[$x]['default_settings'][$y]['default_setting_description'] = "Set whether to display submenu indicator icons next to main menu items."; + $y++; + $apps[$x]['default_settings'][$y]['default_setting_uuid'] = "bf786d83-2e8c-4928-be7c-dfd2cde894d4"; + $apps[$x]['default_settings'][$y]['default_setting_category'] = "theme"; + $apps[$x]['default_settings'][$y]['default_setting_subcategory'] = "menu_side_item_main_sub_icon_expand"; + $apps[$x]['default_settings'][$y]['default_setting_name'] = "text"; + $apps[$x]['default_settings'][$y]['default_setting_value'] = "chevron-down"; + $apps[$x]['default_settings'][$y]['default_setting_enabled'] = "true"; + $apps[$x]['default_settings'][$y]['default_setting_description'] = "Set the submenu indicator icon to use for the expand action (default: chevron-down)."; + $y++; + $apps[$x]['default_settings'][$y]['default_setting_uuid'] = "fe64a3e8-70af-4d9f-868a-47a739789cd3"; + $apps[$x]['default_settings'][$y]['default_setting_category'] = "theme"; + $apps[$x]['default_settings'][$y]['default_setting_subcategory'] = "menu_side_item_main_sub_icon_contract"; + $apps[$x]['default_settings'][$y]['default_setting_name'] = "text"; + $apps[$x]['default_settings'][$y]['default_setting_value'] = "chevron-up"; + $apps[$x]['default_settings'][$y]['default_setting_enabled'] = "true"; + $apps[$x]['default_settings'][$y]['default_setting_description'] = "Set the submenu indicator icon to use for the contract action (default: chevron-up)."; + $y++; $apps[$x]['default_settings'][$y]['default_setting_uuid'] = "97a620e1-d7b2-4550-8648-726c3029143d"; $apps[$x]['default_settings'][$y]['default_setting_category'] = "theme"; $apps[$x]['default_settings'][$y]['default_setting_subcategory'] = "action_bar_border_top"; diff --git a/themes/default/template.php b/themes/default/template.php index a2e9c74cbb..52d547db89 100644 --- a/themes/default/template.php +++ b/themes/default/template.php @@ -156,6 +156,16 @@ } } + function menu_side_item_toggle(item_id) { + $('#sub_arrow_'+item_id).toggleClass(['fa-{/literal}{$menu_side_item_main_sub_icon_contract}{literal}','fa-{/literal}{$menu_side_item_main_sub_icon_expand}{literal}']); + $('.sub_arrows').not('#sub_arrow_'+item_id).removeClass('fa-{/literal}{$menu_side_item_main_sub_icon_contract}{literal}').addClass('fa-{/literal}{$menu_side_item_main_sub_icon_expand}{literal}'); + $('#sub_'+item_id).slideToggle(180, function() { + if (!$(this).is(':hidden')) { + $('.menu_side_sub').not($(this)).slideUp(180); + } + }); + } + function menu_side_state_set(state) { var user_setting_set_path = '{/literal}{$project_path}{literal}/core/user_settings/user_setting_set.php?category=theme&subcategory=menu_side_state&name=text&value='+state; var xhr = new XMLHttpRequest();