From 1a9353ac88a60a50089f6fd6bb7df132809bcf38 Mon Sep 17 00:00:00 2001 From: Alex <40072887+alexdcrane@users.noreply.github.com> Date: Thu, 22 Aug 2024 16:59:12 -0700 Subject: [PATCH] Update parent.php (#7109) * Update parent.php * Update dashboard_edit.php * Update app_defaults.php --- core/dashboard/app_defaults.php | 3 +-- core/dashboard/dashboard_edit.php | 13 ++++++------- core/dashboard/resources/dashboard/parent.php | 15 ++++++++------- 3 files changed, 15 insertions(+), 16 deletions(-) diff --git a/core/dashboard/app_defaults.php b/core/dashboard/app_defaults.php index a79940eee8..7a4522b6db 100644 --- a/core/dashboard/app_defaults.php +++ b/core/dashboard/app_defaults.php @@ -74,7 +74,7 @@ if ($domains_processed == 1) { if (!empty($row['dashboard_label_background_color'])) { $array['dashboard'][$x]['dashboard_label_background_color'] = $row['dashboard_label_background_color']; } if (!empty($row['dashboard_label_background_color_hover'])) { $array['dashboard'][$x]['dashboard_label_background_color'] = $row['dashboard_label_background_color_hover']; } if (!empty($row['dashboard_background_color'])) { $array['dashboard'][$x]['dashboard_background_color'] = $row['dashboard_background_color']; } - if (!empty($row['dashboard_background_color_hover'])) { $array['dashboard'][$x]['dashboard_background_color'] = $row['dashboard_background_color_hover']; } + if (!empty($row['dashboard_background_color_hover'])) { $array['dashboard'][$x]['dashboard_background_color_hover'] = $row['dashboard_background_color_hover']; } if (!empty($row['dashboard_detail_background_color'])) { $array['dashboard'][$x]['dashboard_detail_background_color'] = $row['dashboard_detail_background_color']; } if (!empty($row['dashboard_content'])) { $array['dashboard'][$x]['dashboard_content'] = $row['dashboard_content']; } if (!empty($row['dashboard_content_details'])) { $array['dashboard'][$x]['dashboard_content_details'] = $row['dashboard_content_details']; } @@ -131,4 +131,3 @@ if ($domains_processed == 1) { } ?> - diff --git a/core/dashboard/dashboard_edit.php b/core/dashboard/dashboard_edit.php index 9a131383fe..bafd07d437 100644 --- a/core/dashboard/dashboard_edit.php +++ b/core/dashboard/dashboard_edit.php @@ -751,7 +751,6 @@ echo "\n"; if ( - $action == "add" || $dashboard_path == "voicemails/voicemails" || $dashboard_path == "xml_cdr/missed_calls" || $dashboard_path == "xml_cdr/recent_calls" || @@ -886,9 +885,9 @@ } } if (empty($dashboard_background_color) || (is_array($dashboard_background_color) && count($dashboard_background_color) < 2)) { - echo " \n"; + echo " \n"; if (empty($dashboard_background_color)) { - echo " \n"; + echo " \n"; } echo "
\n"; } @@ -908,9 +907,9 @@ } } if (empty($dashboard_background_color_hover) || (is_array($dashboard_background_color_hover) && count($dashboard_background_color_hover) < 2)) { - echo " \n"; + echo " \n"; if (empty($dashboard_background_color_hover)) { - echo " \n"; + echo " \n"; } echo "
\n"; } @@ -930,9 +929,9 @@ } } if (empty($dashboard_detail_background_color) || (is_array($dashboard_detail_background_color) && count($dashboard_detail_background_color) < 2)) { - echo " \n"; + echo " \n"; if (empty($dashboard_detail_background_color)) { - echo " \n"; + echo " \n"; } echo "
\n"; } diff --git a/core/dashboard/resources/dashboard/parent.php b/core/dashboard/resources/dashboard/parent.php index a38bcca8a2..533abb80f6 100644 --- a/core/dashboard/resources/dashboard/parent.php +++ b/core/dashboard/resources/dashboard/parent.php @@ -90,14 +90,14 @@ } if (!empty($row['dashboard_background_color'])) { $background_color = json_decode($row['dashboard_background_color'], true); - echo "#".$dashboard_name." .hud_content {\n"; + echo "#".$dashboard_name." {\n"; echo " background: ".$background_color[0].";\n"; echo " background-image: linear-gradient(to right, ".$background_color[1]." 0%, ".$background_color[0]." 30%, ".$background_color[0]." 70%, ".$background_color[1]." 100%);\n"; echo "}\n"; } if (!empty($row['dashboard_background_color_hover'])) { $background_color_hover = json_decode($row['dashboard_background_color_hover'], true); - echo "#".$dashboard_name.":hover .hud_content {\n"; + echo "#".$dashboard_name.":hover {\n"; echo " background: ".$background_color_hover[0].";\n"; echo " background-image: linear-gradient(to right, ".$background_color_hover[1]." 0%, ".$background_color_hover[0]." 30%, ".$background_color_hover[0]." 70%, ".$background_color_hover[1]." 100%);\n"; echo "}\n"; @@ -118,10 +118,11 @@ echo "}\n"; } if ($row['dashboard_path'] == "core/dashboard/resources/dashboard/icon.php") { - echo "#".$dashboard_name." div.hud_content,\n"; + echo "#".$dashboard_name.",\n"; echo "#".$dashboard_name." span.hud_title,\n"; echo "#".$dashboard_name." span.hud_stat {\n"; echo " transition: .4s;\n"; + echo " border-radius: 5px;\n"; echo "}\n"; } switch ($row['dashboard_row_span']) { @@ -158,8 +159,8 @@ echo "\n"; //include the dashboards - echo "
\n"; - echo "
\n"; + echo "
\n"; + echo "
\n"; $x = 0; foreach ($parent_widgets as $row) { @@ -182,9 +183,9 @@ // $dashboard_row_span += 3; //} - echo "
\n"; + echo "
\n"; echo " ".escape($dashboard_label).""; - echo " \n"; + echo " \n"; echo "
\n"; }