From 33e491a75dc1bfe2daaf342d264c314c99d1b674 Mon Sep 17 00:00:00 2001
From: Alex <40072887+alexdcrane@users.noreply.github.com>
Date: Mon, 29 Jul 2024 20:25:05 -0700
Subject: [PATCH] Fix dashboard widget hover transition (#7075)

* Fix dashboard widget hover transition

The background colors were being set twice

* Update dashboard_edit.php

* Update index.php
---
 core/dashboard/dashboard_edit.php           | 24 ++++++++-------------
 core/dashboard/index.php                    |  6 +++---
 core/dashboard/resources/dashboard/icon.php |  6 +++---
 3 files changed, 15 insertions(+), 21 deletions(-)

diff --git a/core/dashboard/dashboard_edit.php b/core/dashboard/dashboard_edit.php
index 9e2a3b31e4..539fa0bcf5 100644
--- a/core/dashboard/dashboard_edit.php
+++ b/core/dashboard/dashboard_edit.php
@@ -832,11 +832,9 @@
 	echo $text['label-dashboard_background_color']."\n";
 	echo "</td>\n";
 	echo "<td class='vtable' style='position: relative;' align='left'>\n";
-	if (!empty($dashboard_background_color)) {
-		if (is_array($dashboard_background_color)) {
-			foreach($dashboard_background_color as $background_color) {
-				echo "	<input type='text' class='formfld colorpicker' name='dashboard_background_color[]' value='".escape($background_color)."'><br />\n";
-			}
+	if (!empty($dashboard_background_color) && is_array($dashboard_background_color)) {
+		foreach($dashboard_background_color as $background_color) {
+			echo "	<input type='text' class='formfld colorpicker' name='dashboard_background_color[]' value='".escape($background_color)."'><br />\n";
 		}
 	}
 	if (empty($dashboard_background_color) || (is_array($dashboard_background_color) && count($dashboard_background_color) < 2)) {
@@ -856,11 +854,9 @@
 		echo $text['label-dashboard_background_color_hover']."\n";
 		echo "</td>\n";
 		echo "<td class='vtable' style='position: relative;' align='left'>\n";
-		if (!empty($dashboard_background_color_hover)) {
-			if (is_array($dashboard_background_color_hover)) {
-				foreach($dashboard_background_color_hover as $background_color) {
-					echo "	<input type='text' class='formfld colorpicker' name='dashboard_background_color_hover[]' value='".escape($background_color)."'><br />\n";
-				}
+		if (!empty($dashboard_background_color_hover) && is_array($dashboard_background_color_hover)) {
+			foreach($dashboard_background_color_hover as $background_color) {
+				echo "	<input type='text' class='formfld colorpicker' name='dashboard_background_color_hover[]' value='".escape($background_color)."'><br />\n";
 			}
 		}
 		if (empty($dashboard_background_color_hover) || (is_array($dashboard_background_color_hover) && count($dashboard_background_color_hover) < 2)) {
@@ -880,11 +876,9 @@
 	echo $text['label-dashboard_detail_background_color']."\n";
 	echo "</td>\n";
 	echo "<td class='vtable' style='position: relative;' align='left'>\n";
-	if (!empty($dashboard_detail_background_color)) {
-		if (is_array($dashboard_detail_background_color)) {
-			foreach($dashboard_detail_background_color as $detail_background_color) {
-				echo "	<input type='text' class='formfld colorpicker' name='dashboard_detail_background_color[]' value='".escape($detail_background_color)."'><br />\n";
-			}
+	if (!empty($dashboard_detail_background_color) && is_array($dashboard_detail_background_color)) {
+		foreach($dashboard_detail_background_color as $detail_background_color) {
+			echo "	<input type='text' class='formfld colorpicker' name='dashboard_detail_background_color[]' value='".escape($detail_background_color)."'><br />\n";
 		}
 	}
 	if (empty($dashboard_detail_background_color) || (is_array($dashboard_detail_background_color) && count($dashboard_detail_background_color) < 2)) {
diff --git a/core/dashboard/index.php b/core/dashboard/index.php
index fd44076353..1ac46bce69 100644
--- a/core/dashboard/index.php
+++ b/core/dashboard/index.php
@@ -36,7 +36,7 @@
 	}
 	elseif (file_exists(getenv('SystemDrive') . DIRECTORY_SEPARATOR . 'ProgramData' . DIRECTORY_SEPARATOR . 'fusionpbx' . DIRECTORY_SEPARATOR . 'config.conf')) {
 		// Windows
-	} 	
+	}
 	else {
 		header("Location: /core/install/install.php");
 		exit;
@@ -312,7 +312,7 @@ foreach ($dashboard as $row) {
 			echo "	height: 89.5px;\n";
 			echo "}\n";
 			echo "#".$dashboard_name." .hud_stat {\n";
-			echo "	line-height: 0.1;\n";
+			echo "	line-height: 0;\n";
 			echo "	font-size: 30pt;\n";
 			echo "}\n";
 			echo "#".$dashboard_name." .hud_chart {\n";
@@ -321,7 +321,7 @@ foreach ($dashboard as $row) {
 			echo "	padding-top: 0;\n";
 			echo "}\n";
 			echo "#".$dashboard_name." div.hud_content .fas {\n";
-			echo "	line-height: 0.1;\n";
+			echo "	line-height: 0;\n";
 			echo "	font-size: 30pt;\n";
 			echo "}\n";
 			break;
diff --git a/core/dashboard/resources/dashboard/icon.php b/core/dashboard/resources/dashboard/icon.php
index 1c731d1424..e5c8242896 100644
--- a/core/dashboard/resources/dashboard/icon.php
+++ b/core/dashboard/resources/dashboard/icon.php
@@ -17,8 +17,8 @@
 
 //dashboard icon
 	echo "<div class='hud_box'>\n";
-	echo "	<div class='hud_content' ".(!empty($row['dashboard_background_color']) ? "style='background: ".$row['dashboard_background_color'].";'" : null)." ".(empty($dashboard_details_state) || $dashboard_details_state != "disabled" ? "onclick=\"$('#hud_icon_details').slideToggle('fast'); toggle_grid_row_end('".trim(preg_replace("/[^a-z]/", '_', strtolower($row['dashboard_name'])),'_')."');\"" : null).">\n";
-	echo "		<span class='hud_title' ".(!empty($row['dashboard_heading_background_color']) ? "style='background: ".$row['dashboard_heading_background_color'].";'" : null)." onclick=\"window.open('".$dashboard_url."', '".$dashboard_target."', '".$window_parameters."')\">".escape($dashboard_name)."</span>";
+	echo "	<div class='hud_content' ".(empty($dashboard_details_state) || $dashboard_details_state != "disabled" ? "onclick=\"$('#hud_icon_details').slideToggle('fast'); toggle_grid_row_end('".trim(preg_replace("/[^a-z]/", '_', strtolower($row['dashboard_name'])),'_')."');\"" : null).">\n";
+	echo "		<span class='hud_title' onclick=\"window.open('".$dashboard_url."', '".$dashboard_target."', '".$window_parameters."')\">".escape($dashboard_name)."</span>";
 	echo "		<span class='hud_stat' onclick=\"window.open('".$dashboard_url."', '".$dashboard_target."', '".$window_parameters."')\"><i class=\"fas ".$dashboard_icon."\" style=\"font-size: 0.8em;\"></i></span>\n";
 	echo "	</div>\n";
 	if (empty($dashboard_details_state) || $dashboard_details_state != "disabled") {
@@ -27,4 +27,4 @@
 	echo "	<span class='hud_expander' onclick=\"$('#hud_icon_details').slideToggle('fast');\"><span class='fas fa-ellipsis-h'></span></span>";
 	echo "</div>\n";
 
-?>
\ No newline at end of file
+?>