From f073dbe152ec3644dafcbba1b67e79732dfc0a0e Mon Sep 17 00:00:00 2001
From: fusionate <nate@fusionpbx.com>
Date: Wed, 11 Sep 2024 18:35:50 -0600
Subject: [PATCH] Theme: Style adjustments.

---
 themes/default/app_config.php | 10 +++-
 themes/default/css.php        | 89 ++++++++++++++++++++++++++---------
 themes/default/template.php   |  2 +-
 3 files changed, 77 insertions(+), 24 deletions(-)

diff --git a/themes/default/app_config.php b/themes/default/app_config.php
index d42538280b..c93f72e617 100644
--- a/themes/default/app_config.php
+++ b/themes/default/app_config.php
@@ -965,7 +965,7 @@
 		$apps[$x]['default_settings'][$y]['default_setting_subcategory'] = "table_row_background_color_dark";
 		$apps[$x]['default_settings'][$y]['default_setting_name'] = "text";
 		$apps[$x]['default_settings'][$y]['default_setting_value'] = "#edeff2";
-		$apps[$x]['default_settings'][$y]['default_setting_enabled'] = "true";
+		$apps[$x]['default_settings'][$y]['default_setting_enabled'] = "false";
 		$apps[$x]['default_settings'][$y]['default_setting_description'] = "Set the darker background color (and opacity) of table data rows.";
 		$y++;
 		$apps[$x]['default_settings'][$y]['default_setting_uuid'] = "117c0235-4387-43f4-8cd4-7ad4fec97820";
@@ -984,6 +984,14 @@
 		$apps[$x]['default_settings'][$y]['default_setting_enabled'] = "false";
 		$apps[$x]['default_settings'][$y]['default_setting_description'] = "Set the lighter background color (and opacity) of table data rows.";
 		$y++;
+		$apps[$x]['default_settings'][$y]['default_setting_uuid'] = "08c65000-aca9-468d-881e-185963b7d5f4";
+		$apps[$x]['default_settings'][$y]['default_setting_category'] = "theme";
+		$apps[$x]['default_settings'][$y]['default_setting_subcategory'] = "table_row_background_color_hover";
+		$apps[$x]['default_settings'][$y]['default_setting_name'] = "text";
+		$apps[$x]['default_settings'][$y]['default_setting_value'] = "#e0e6ef";
+		$apps[$x]['default_settings'][$y]['default_setting_enabled'] = "false";
+		$apps[$x]['default_settings'][$y]['default_setting_description'] = "Set the background color of table data rows on hover.";
+		$y++;
 		$apps[$x]['default_settings'][$y]['default_setting_uuid'] = "efa1022d-2b88-4a5d-981e-a2540c64324e";
 		$apps[$x]['default_settings'][$y]['default_setting_category'] = "theme";
 		$apps[$x]['default_settings'][$y]['default_setting_subcategory'] = "table_row_border_color";
diff --git a/themes/default/css.php b/themes/default/css.php
index 08c6ae9335..1e9bd753b7 100644
--- a/themes/default/css.php
+++ b/themes/default/css.php
@@ -187,7 +187,8 @@ $table_row_text_link_color_hover = $_SESSION['theme']['table_row_text_link_color
 $table_row_border_color = $_SESSION['theme']['table_row_border_color']['text'] ?? '#c5d1e5';
 $table_row_background_color_light = $_SESSION['theme']['table_row_background_color_light']['text'] ?? '#fff';
 $table_row_background_color_medium = $_SESSION['theme']['table_row_background_color_medium']['text'] ?? '#f0f2f6';
-$table_row_background_color_dark = $_SESSION['theme']['table_row_background_color_dark']['text'] ?? '#e5e9f0';
+$table_row_background_color_dark = $_SESSION['theme']['table_row_background_color_dark']['text'] ?? '#edeff2';
+$table_row_background_color_hover = $_SESSION['theme']['table_row_background_color_hover']['text'] ?? null;
 $table_row_padding = $_SESSION['theme']['table_row_padding']['text'] ?? '4px 7px';
 $form_table_label_background_color = $_SESSION['theme']['form_table_label_background_color']['text'] ?? '#e5e9f0';
 $form_table_label_border_radius = $_SESSION['theme']['form_table_label_border_radius']['text'] ?? null;
@@ -2419,7 +2420,6 @@ else { //default: white
 	.message_text {
 		z-index: 99999;
 		margin: 0 auto;
-		padding: 15px;
 		text-align: center;
 		font-family: arial, san-serif;
 		font-size: 10pt;
@@ -2427,29 +2427,34 @@ else { //default: white
 		color: <?=$message_default_color?>;
 		background: <?-$message_default_background_color?>;
 		box-shadow: inset 0px 7px 8px -10px <?=$message_default_color?>;
-		border-bottom: solid 1px <?=$message_default_color?>;
 		opacity: 0;
+		<?php
+		if ($menu_style == 'side') {
+			echo "padding: 20px;\n";
+			echo "min-height: 60px;\n";
+		}
+		else {
+			echo "padding: 15px;\n";
+		}
+		?>
 		}
 
 	.message_mood_positive {
 		color: <?=$message_positive_color?>;
 		background: <?=$message_positive_background_color?>;
 		box-shadow: inset 0px 7px 8px -10px <?=$message_positive_color?>;
-		border-bottom: solid 1px <?=$message_positive_color?>;
 		}
 
 	.message_mood_negative {
 		color: <?=$message_negative_color?>;
 		background: <?=$message_negative_background_color?>;
 		box-shadow: inset 0px 7px 8px -10px <?=$message_negative_color?>;
-		border-bottom: solid 1px <?=$message_negative_color?>;
 		}
 
 	.message_mood_alert {
 		color: <?=$message_alert_color?>;
 		background: <?=$message_alert_background_color?>;
 		box-shadow: inset 0px 7px 8px -10px <?=$message_alert_color?>;
-		border-bottom: solid 1px <?=$message_alert_color?>;
 		}
 
 /* OPERATOR PANEL ****************************************************************/
@@ -3115,21 +3120,19 @@ else { //default: white
 /* LIST ACTION BAR *************************************************************/
 
 	div.action_bar {
-		position: -webkit-sticky;
-		position: sticky;
 		z-index: 5;
 		<?php
 		switch ($menu_style) {
 			case 'side':
 				$action_bar_top = '0';
 				break;
+			case 'fixed':
+				$action_bar_top = '49px';
+				break;
 			case 'inline':
 			case 'static':
 				$action_bar_top = '-1px';
 				break;
-			case 'fixed':
-			default:
-				$action_bar_top = '49px';
 		}
 		?>
 		top: <?php echo $action_bar_top; ?>;
@@ -3141,28 +3144,62 @@ else { //default: white
 		border-radius: <?=$action_bar_border_radius?>;
 		background: <?=$action_bar_background?>;
 		box-shadow: <?=$action_bar_shadow?>;
-		padding: 10px;
-		margin: -10px -10px 10px -10px;
+		<?php
+		switch ($menu_style) {
+			case 'side':
+				echo "position: -webkit-sticky;\n";
+				echo "position: sticky;\n";
+				echo "padding: 15px 20px 15px 20px;\n";
+				echo "margin: -10px -20px 10px -20px;\n";
+				echo "min-height: 60px;\n";
+				break;
+			case 'fixed';
+				echo "position: -webkit-sticky;\n";
+				echo "position: sticky;\n";
+				echo "padding: 10px 30px 10px 30px;\n";
+				echo "margin: -10px -30px 10px -30px;\n";
+				break;
+			case 'static':
+			case 'inline':
+				echo "padding: 15px 20px 15px 20px;\n";
+				echo "margin: -10px -20px 10px -20px;\n";
+				break;
+		}
+		?>
 		-webkit-transition: all .2s ease;
 		-moz-transition: all .2s ease;
 		transition: all .2s ease;
 		}
 
-	div.action_bar.scroll {
-		border-top: <?=$action_bar_border_top_scroll?>;
-		border-right: <?=$action_bar_border_right_scroll?>;
-		border-bottom: <?=$action_bar_border_bottom_scroll?>;
-		border-left: <?=$action_bar_border_left_scroll?>;
-		border-radius: <?=$action_bar_border_radius_scroll?>;
-		background: <?=$action_bar_background_scroll?>;
-		box-shadow: <?=$action_bar_shadow_scroll?>;
-		}
+	<?php
+	if ($menu_style == 'side' || $menu_style == 'fixed') {
+		?>
+		div.action_bar.scroll {
+			border-top: <?=$action_bar_border_top_scroll?>;
+			border-right: <?=$action_bar_border_right_scroll?>;
+			border-bottom: <?=$action_bar_border_bottom_scroll?>;
+			border-left: <?=$action_bar_border_left_scroll?>;
+			border-radius: <?=$action_bar_border_radius_scroll?>;
+			background: <?=$action_bar_background_scroll?>;
+			box-shadow: <?=$action_bar_shadow_scroll?>;
+			}
+		<?php
+	}
+	?>
 
 	div.action_bar.sub {
 		position: static;
 		}
 
 	div.action_bar > div.heading {
+		<?php
+		if ($menu_style == 'side') {
+			echo "padding-top: 2px;\n";
+		}
+		else if ($menu_style == 'fixed') {
+			echo "padding-top: 4px;\n";
+		}
+		?>
 		float: left;
 		}
 
@@ -3276,6 +3313,14 @@ else { //default: white
 		vertical-align: middle;
 		}
 
+	<?php if (!empty($table_row_background_color_hover)) { ?>
+		.list-row:hover > td,
+		.list-row:nth-child(odd):hover > :not(.action-button),
+		.list-row:nth-child(even):hover > :not(.action-button) {
+			background: <?=$table_row_background_color_hover?>;
+			}
+	<?php } ?>
+
 	.list-row > :not(.checkbox) {
 		padding: <?=$table_row_padding?>;
 		}
diff --git a/themes/default/template.php b/themes/default/template.php
index 5f35684296..f2b5b4929a 100644
--- a/themes/default/template.php
+++ b/themes/default/template.php
@@ -806,7 +806,7 @@
 	//handle action bar style on scroll
 		{literal}
 		window.addEventListener('scroll', function(){
-			action_bar_scroll('action_bar', 20);
+			action_bar_scroll('action_bar', {/literal}{if $settings.theme.menu_style == 'side'}60{else}20{/if}{literal});
 		}, false);
 		function action_bar_scroll(action_bar_id, scroll_position, function_sticky, function_inline) {
 			if (document.getElementById(action_bar_id)) {