From 54484dedd5a5c5343806c84928340e9e3870e370 Mon Sep 17 00:00:00 2001
From: FusionPBX <markjcrane@gmail.com>
Date: Wed, 28 Aug 2024 12:57:27 -0600
Subject: [PATCH] Update dashboard content widget

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

diff --git a/core/dashboard/index.php b/core/dashboard/index.php
index 94360508da..7c77ca16d8 100644
--- a/core/dashboard/index.php
+++ b/core/dashboard/index.php
@@ -536,9 +536,11 @@ function toggle_grid_row_end_all() {
 		$dashboard_target = trim(preg_replace($text_pattern, '', $dashboard_target));
 		$dashboard_width = trim(preg_replace($text_pattern, '', $dashboard_width));
 		$dashboard_height = trim(preg_replace($text_pattern, '', $dashboard_height));
-		$dashboard_content = trim(preg_replace($text_pattern, '', $dashboard_content));
+		$dashboard_content = preg_replace($text_pattern, '', $dashboard_content);
+		$dashboard_content = str_replace("\n", '<br />', $dashboard_content);
 		$dashboard_content_text_align = trim(preg_replace($text_pattern, '', $dashboard_content_text_align));
-		$dashboard_content_details = trim(preg_replace($text_pattern, '', $dashboard_content_details));
+		$dashboard_content_details = preg_replace($text_pattern, '', $dashboard_content_details);
+		$dashboard_content_details = str_replace("\n", '<br />', $dashboard_content_details);
 		$dashboard_chart_type = preg_replace($text_pattern, '', $dashboard_chart_type);
 		$dashboard_label_text_color = preg_replace($text_pattern, '', $dashboard_label_text_color);
 		$dashboard_number_text_color = preg_replace($text_pattern, '', $dashboard_number_text_color);
@@ -660,3 +662,4 @@ function toggle_grid_row_end_all() {
 	require_once "resources/footer.php";
 
 ?>
+
diff --git a/core/dashboard/resources/dashboard/content.php b/core/dashboard/resources/dashboard/content.php
index daec932471..dbae532a8b 100644
--- a/core/dashboard/resources/dashboard/content.php
+++ b/core/dashboard/resources/dashboard/content.php
@@ -18,12 +18,13 @@
 	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_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_label_background_color']) ? "style='background: ".$row['dashboard_label_background_color'].";'" : null).">".escape($dashboard_name)."</span>";
-	echo "		<span style='padding: 7%; height: ".$dashboard_content_height."; max-height: ".$dashboard_content_height.";  text-align: ".$row['dashboard_content_text_align']."; vertical-align: ".$dashboard_content_text_vertical_align."; 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 "		<span style='padding: 12px; height: ".$dashboard_content_height."; max-height: ".$dashboard_content_height.";  text-align: ".$row['dashboard_content_text_align']."; vertical-align: ".$dashboard_content_text_vertical_align."; overflow: auto; ".(!empty($row['dashboard_number_text_color']) ? "color: ".$row['dashboard_number_text_color'].";" : null)."'>".$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; ".(!empty($row['dashboard_detail_background_color']) ? "background: ".$row['dashboard_detail_background_color'].";" : null)."'>".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)."'>".$dashboard_content_details."</div>\n";
 	}
 	echo "	<span class='hud_expander' onclick=\"$('#hud_content_details').slideToggle('fast');\"><span class='fas fa-ellipsis-h'></span></span>";
 	echo "</div>\n";
 
 ?>
+