From 65b957c2f7e66d58c9e7827b70bdeab6a7276368 Mon Sep 17 00:00:00 2001 From: fusionate Date: Wed, 4 Sep 2024 19:31:09 -0600 Subject: [PATCH] Theme: Fix sub menu indicator icons, and date/time picker icons after Font Awesome upgrade. --- resources/classes/menu.php | 2 +- resources/footer.php | 2 ++ themes/default/template.php | 26 +++++++++++++------------- 3 files changed, 16 insertions(+), 14 deletions(-) diff --git a/resources/classes/menu.php b/resources/classes/menu.php index c7ea193f58..9270219a71 100644 --- a/resources/classes/menu.php +++ b/resources/classes/menu.php @@ -1134,7 +1134,7 @@ if (!class_exists('menu')) { $menu_target = ($menu_item_main['menu_item_category'] == 'external') ? '_blank' : ''; $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"; + $html .= "
\n"; } if (!empty($menu_item_main['menu_item_icon']) && substr($menu_item_main['menu_item_icon'], 0, 3) == 'fa-') { // font awesome icon $html .= ""; diff --git a/resources/footer.php b/resources/footer.php index bd3f46044a..25a2a27863 100644 --- a/resources/footer.php +++ b/resources/footer.php @@ -152,6 +152,8 @@ $settings_array['theme']['menu_style'] = !empty($settings_array['theme']['menu_style']) ? $settings_array['theme']['menu_style'] : 'fixed'; $settings_array['theme']['menu_position'] = isset($settings_array['theme']['menu_position']) ? $settings_array['theme']['menu_position'] : 'top'; $settings_array['theme']['footer'] = isset($settings_array['theme']['footer']) ? $settings_array['theme']['footer'] : '© '.$text['theme-label-copyright'].' 2008 - '.date('Y')." fusionpbx.com ".$text['theme-label-all_rights_reserved']; + $settings_array['theme']['menu_side_item_main_sub_icon_contract'] = !empty($settings_array['theme']['menu_side_item_main_sub_icon_contract']) ? explode(' ', $settings_array['theme']['menu_side_item_main_sub_icon_contract'])[1] : null; + $settings_array['theme']['menu_side_item_main_sub_icon_expand'] = !empty($settings_array['theme']['menu_side_item_main_sub_icon_expand']) ? explode(' ', $settings_array['theme']['menu_side_item_main_sub_icon_expand'])[1] : null; //assign the setings $view->assign('settings', $settings_array); diff --git a/themes/default/template.php b/themes/default/template.php index c77f690ad2..1a39a1a438 100644 --- a/themes/default/template.php +++ b/themes/default/template.php @@ -1,5 +1,5 @@ {* @@ -119,7 +119,7 @@ {literal} $('.menu_side_control_state').hide(); $('.menu_side_item_main_sub_icons').hide(); - $('.sub_arrows').removeClass('fa-{/literal}{$settings.theme.menu_side_item_main_sub_icon_contract}{literal}').addClass('fa-{/literal}{$settings.theme.menu_side_item_main_sub_icon_expand}{literal}'); + $('.sub_arrows').removeClass('{/literal}{$settings.theme.menu_side_item_main_sub_icon_contract}{literal}').addClass('{/literal}{$settings.theme.menu_side_item_main_sub_icon_expand}{literal}'); $('#menu_side_container').animate({ width: '{/literal}{$settings.theme.menu_side_width_contracted}{literal}px' }, 180, function() { menu_side_state_current = 'contracted'; }); @@ -210,8 +210,8 @@ } function menu_side_item_toggle(item_id) { - $('#sub_arrow_'+item_id).toggleClass(['fa-{/literal}{$settings.theme.menu_side_item_main_sub_icon_contract}{literal}','fa-{/literal}{$settings.theme.menu_side_item_main_sub_icon_expand}{literal}']); - $('.sub_arrows').not('#sub_arrow_'+item_id).removeClass('fa-{/literal}{$settings.theme.menu_side_item_main_sub_icon_contract}{literal}').addClass('fa-{/literal}{$settings.theme.menu_side_item_main_sub_icon_expand}{literal}'); + $('#sub_arrow_'+item_id).toggleClass(['{/literal}{$settings.theme.menu_side_item_main_sub_icon_contract}{literal}','{/literal}{$settings.theme.menu_side_item_main_sub_icon_expand}{literal}']); + $('.sub_arrows').not('#sub_arrow_'+item_id).removeClass('{/literal}{$settings.theme.menu_side_item_main_sub_icon_contract}{literal}').addClass('{/literal}{$settings.theme.menu_side_item_main_sub_icon_expand}{literal}'); $('#sub_'+item_id).slideToggle(180, function() { {/literal} {if $settings.theme.menu_side_item_main_sub_close != 'manual'} @@ -605,15 +605,15 @@ showClose: true, }, icons: { - time: 'fas fa-clock', - date: 'fas fa-calendar-alt', - up: 'fas fa-arrow-up', - down: 'fas fa-arrow-down', - previous: 'fas fa-chevron-left', - next: 'fas fa-chevron-right', - today: 'fas fa-calendar-check', - clear: 'fas fa-trash', - close: 'fas fa-times', + time: 'fa-solid fa-clock', + date: 'fa-solid fa-calendar-days', + up: 'fa-solid fa-arrow-up', + down: 'fa-solid fa-arrow-down', + previous: 'fa-solid fa-chevron-left', + next: 'fa-solid fa-chevron-right', + today: 'fa-solid fa-calendar-check', + clear: 'fa-solid fa-trash', + close: 'fa-solid fa-xmark', } }); //define formatting of individual classes