From f8e363de2f7c1aeaf2aad3849477c0e4babdf0fa Mon Sep 17 00:00:00 2001 From: FusionPBX Date: Tue, 3 Sep 2024 13:42:54 -0600 Subject: [PATCH] Update css.php to use background_color_enabled --- themes/default/css.php | 32 +++++++++++--------------------- 1 file changed, 11 insertions(+), 21 deletions(-) diff --git a/themes/default/css.php b/themes/default/css.php index 12aa954af9..69689cd03b 100644 --- a/themes/default/css.php +++ b/themes/default/css.php @@ -321,14 +321,13 @@ if (!empty($_SESSION['username'])) { } //logged in - use standard background colors - if (!empty($_SESSION['theme']['background_image_enabled']) && !empty($_SESSION['theme']['background_color'][0]) && !empty($_SESSION['theme']['background_color'][1])) { + if (isset($_SESSION['theme']['background_color_enabled']['boolean']) && !empty($_SESSION['theme']['background_color_enabled']) && $_SESSION['theme']['background_color_enabled'] == 'true' && !empty($_SESSION['theme']['background_color'][0]) && !empty($_SESSION['theme']['background_color'][1])) { $background_colors[0] = $_SESSION['theme']['background_color'][0]; $background_colors[1] = $_SESSION['theme']['background_color'][1]; } - elseif (!empty($_SESSION['theme']['background_image_enabled']) && !empty($_SESSION['theme']['background_color'][0])) { + elseif (isset($_SESSION['theme']['background_color_enabled']['boolean']) && !empty($_SESSION['theme']['background_color_enabled']) && $_SESSION['theme']['background_color_enabled'] == 'true' && !empty($_SESSION['theme']['background_color'][0])) { $background_colors[0] = $_SESSION['theme']['background_color'][0]; } - } else { //not logged in - try using login background images @@ -344,11 +343,18 @@ else { } //use standard background colors - if (!empty($_SESSION['theme']['background_color']) && !empty($_SESSION['theme']['background_color'][0]) && !empty($_SESSION['theme']['background_color'][1])) { + if (!empty($_SESSION['theme']['login_background_color']) && !empty($_SESSION['theme']['login_background_color'][0]) && !empty($_SESSION['theme']['login_background_color'][1])) { $background_colors[0] = $_SESSION['theme']['login_background_color'][0]; $background_colors[1] = $_SESSION['theme']['login_background_color'][1]; } - elseif (!empty($_SESSION['theme']['background_image_enabled']) && !empty($_SESSION['theme']['background_color'][0])) { + elseif (!empty($_SESSION['theme']['login_background_color']) && !empty($_SESSION['theme']['login_background_color'][0])) { + $background_colors[0] = $_SESSION['theme']['login_background_color'][0]; + } + elseif ($_SESSION['theme']['background_color_enabled']) && $_SESSION['theme']['background_color_enabled'] == 'true' && !empty($_SESSION['theme']['background_color'][0]) && !empty($_SESSION['theme']['background_color'][1])) { + $background_colors[0] = $_SESSION['theme']['background_color'][0]; + $background_colors[1] = $_SESSION['theme']['background_color'][1]; + } + elseif $_SESSION['theme']['background_color_enabled']) && $_SESSION['theme']['background_color_enabled'] == 'true' && !empty($_SESSION['theme']['background_color'][0])) { $background_colors[0] = $_SESSION['theme']['background_color'][0]; } } @@ -3230,22 +3236,6 @@ else { //default: white white-space: nowrap; } - .list-status-active { - width: 10px; - height: 10px; - background-color: green; - border-radius: 50%; - display: inline-block; - } - - .list-status-inactive { - width: 10px; - height: 10px; - background-color: #ccc; - border-radius: 50%; - display: inline-block; - } - /* EDIT ********************************************************************************/ td.edit_delete_checkbox_all {