From 7499606fcbe23b40e58aa2acfa44397ad90ea8dc Mon Sep 17 00:00:00 2001
From: fusionate <nate@fusionpbx.com>
Date: Mon, 17 Jun 2024 15:27:59 -0600
Subject: [PATCH] Dashboard - Icon & Content Widgets: Better integration of
 color settings.

---
 core/dashboard/resources/dashboard/content.php | 8 ++++----
 core/dashboard/resources/dashboard/icon.php    | 6 +++---
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/core/dashboard/resources/dashboard/content.php b/core/dashboard/resources/dashboard/content.php
index 8035c9fb11..bd5f9a9434 100644
--- a/core/dashboard/resources/dashboard/content.php
+++ b/core/dashboard/resources/dashboard/content.php
@@ -11,13 +11,13 @@
 //dashboard icon
 	echo "<div class='hud_box'>\n";
 
-	echo "<div class='hud_content' ".(empty($dashboard_details_state) || $dashboard_details_state != "disabled" ? "onclick=\"$('#hud_content_details').slideToggle('fast'); toggle_grid_row_end('".trim(preg_replace("/[^a-z]/", '_', strtolower($row['dashboard_name'])),'_')."');\"" : null).">\n";
-	echo "	<span class='hud_title'>".escape($dashboard_name)."</span>";
-	echo "	<span style='padding-left: 5%; padding-right: 5%; max-height: 150px; overflow: auto;'>".str_replace("\r", '<br>', escape($dashboard_content))."</span>\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_content_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).">".escape($dashboard_name)."</span>";
+	echo "	<span style='padding: 5%; height: 150px; max-height: 150px; vertical-align: middle; overflow: auto; ".(!empty($row['dashboard_number_text_color']) ? "color: ".$row['dashboard_number_text_color'].";" : null)."'>".str_replace("\r", '<br>', escape($dashboard_content))."</span>\n";
 	echo "</div>\n";
 
 	if (empty($dashboard_details_state) || $dashboard_details_state != "disabled") {
-		echo "<div class='hud_details hud_box' id='hud_content_details' style='padding: 20px; 10%; overflow: auto;'>".str_replace("\r", '<br>', escape($dashboard_content_details))."</div>\n";
+		echo "<div class='hud_details hud_box' id='hud_content_details' style='padding: 20px; 10%; overflow: auto; ".(!empty($row['dashboard_detail_background_color']) ? "background: ".$row['dashboard_detail_background_color'].";" : null)."'>".str_replace("\r", '<br>', escape($dashboard_content_details))."</div>\n";
 	}
 
 	echo "<span class='hud_expander' onclick=\"$('#hud_content_details').slideToggle('fast');\"><span class='fas fa-ellipsis-h'></span></span>";
diff --git a/core/dashboard/resources/dashboard/icon.php b/core/dashboard/resources/dashboard/icon.php
index 9c84d114cc..ab1277a836 100644
--- a/core/dashboard/resources/dashboard/icon.php
+++ b/core/dashboard/resources/dashboard/icon.php
@@ -11,13 +11,13 @@
 //dashboard icon
 	echo "<div class='hud_box'>\n";
 
-	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 == 'new' ? '_blank' : '_self')."')\">".escape($dashboard_name)."</span>";
+	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 == 'new' ? '_blank' : '_self')."')\">".escape($dashboard_name)."</span>";
 	echo "	<a href='".$dashboard_url."' ".($dashboard_target == 'new' ? "target='_blank'" : null)."><span class='hud_stat'><i class=\"fas ".$dashboard_icon."\" style=\"font-size: 0.8em;\"></i></span></a>\n";
 	echo "</div>\n";
 
 	if (empty($dashboard_details_state) || $dashboard_details_state != "disabled") {
-		echo "<div class='hud_details hud_box' id='hud_icon_details' style='padding: 20px; 10%; overflow: auto;'>".str_replace("\r", '<br>', escape($dashboard_content_details))."</div>\n";
+		echo "<div class='hud_details hud_box' id='hud_icon_details' style='padding: 20px; 10%; overflow: auto; ".(!empty($row['dashboard_detail_background_color']) ? "background: ".$row['dashboard_detail_background_color'].";" : null)."'>".str_replace("\r", '<br>', escape($dashboard_content_details))."</div>\n";
 	}
 
 	echo "<span class='hud_expander' onclick=\"$('#hud_icon_details').slideToggle('fast');\"><span class='fas fa-ellipsis-h'></span></span>";