diff --git a/app/extensions/resources/dashboard/config.php b/app/extensions/resources/dashboard/config.php index 95037aae9b..fbd82ae049 100644 --- a/app/extensions/resources/dashboard/config.php +++ b/app/extensions/resources/dashboard/config.php @@ -3,7 +3,8 @@ $array['dashboard'][$x]['dashboard_uuid'] = '3bac3209-2f51-47db-b5fe-a1a804f49da9'; $array['dashboard'][$x]['dashboard_name'] = 'Caller ID'; $array['dashboard'][$x]['dashboard_path'] = 'extensions/caller_id'; -$array['dashboard'][$x]['dashboard_order'] = '160'; +$array['dashboard'][$x]['dashboard_details_state'] = 'hidden'; +$array['dashboard'][$x]['dashboard_order'] = '200'; $array['dashboard'][$x]['dashboard_enabled'] = 'false'; $array['dashboard'][$x]['dashboard_description'] = ''; $y = 0; diff --git a/app/registrations/resources/dashboard/config.php b/app/registrations/resources/dashboard/config.php index e104100096..beabb051ea 100644 --- a/app/registrations/resources/dashboard/config.php +++ b/app/registrations/resources/dashboard/config.php @@ -12,7 +12,7 @@ $array['dashboard'][$x]['dashboard_height'] = ''; $array['dashboard'][$x]['dashboard_content'] = ''; $array['dashboard'][$x]['dashboard_content_text_align'] = ''; $array['dashboard'][$x]['dashboard_content_details'] = ''; -$array['dashboard'][$x]['dashboard_chart_type'] = ''; +$array['dashboard'][$x]['dashboard_chart_type'] = 'icon'; $array['dashboard'][$x]['dashboard_label_enabled'] = 'true'; $array['dashboard'][$x]['dashboard_label_text_color'] = ''; $array['dashboard'][$x]['dashboard_label_text_color_hover'] = ''; @@ -27,7 +27,7 @@ $array['dashboard'][$x]['dashboard_detail_background_color'] = ''; $array['dashboard'][$x]['dashboard_column_span'] = '1'; $array['dashboard'][$x]['dashboard_row_span'] = '1'; $array['dashboard'][$x]['dashboard_details_state'] = 'disabled'; -$array['dashboard'][$x]['dashboard_order'] = '50'; +$array['dashboard'][$x]['dashboard_order'] = '80'; $array['dashboard'][$x]['dashboard_enabled'] = 'true'; $array['dashboard'][$x]['dashboard_description'] = ''; $y = 0; @@ -41,4 +41,3 @@ $array['dashboard'][$x]['dashboard_groups'][$y]['group_name'] = 'admin'; $y++; ?> - diff --git a/app/registrations/resources/dashboard/registrations.php b/app/registrations/resources/dashboard/registrations.php index 7f0e7cbcd1..2d290fe1d2 100644 --- a/app/registrations/resources/dashboard/registrations.php +++ b/app/registrations/resources/dashboard/registrations.php @@ -51,10 +51,9 @@ echo "
\n"; echo "
\n"; echo " ".escape($dashboard_label).""; - echo " \n"; - echo "
\n"; - echo " Inactive: ".$inactive_registrations."\n"; - echo " Active: ".$active_registrations."\n"; + echo "
\n"; + echo " \n"; + echo " ".$active_registrations."/".($active_registrations + $inactive_registrations)."\n"; echo "
\n"; echo "
\n"; if (empty($dashboard_details_state) || $dashboard_details_state != "disabled") { diff --git a/app/system/resources/dashboard/system_counts.php b/app/system/resources/dashboard/system_counts.php index 9749278af9..323e71dedb 100644 --- a/app/system/resources/dashboard/system_counts.php +++ b/app/system/resources/dashboard/system_counts.php @@ -328,7 +328,6 @@ legend: { display: true, position: 'right', - reverse: true, labels: { usePointStyle: true, pointStyle: 'rect', diff --git a/app/system/resources/dashboard/system_status.php b/app/system/resources/dashboard/system_status.php index f247f93535..22f8bcb3db 100644 --- a/app/system/resources/dashboard/system_status.php +++ b/app/system/resources/dashboard/system_status.php @@ -117,7 +117,7 @@ echo "
\n"; echo " ".$text['label-system_status']."\n"; - if (!isset($dashboard_chart_type) || $dashboard_chart_type == "doughnut") { + if ($dashboard_chart_type == "doughnut") { ?>
@@ -175,12 +175,12 @@ if ($dashboard_chart_type == "number") { echo " ".round($percent_disk_usage)."%"; } - if ($dashboard_chart_type == "progress_bar") { + if (!isset($dashboard_chart_type) || $dashboard_chart_type == "progress_bar") { //cpu usage if ($dashboard_row_span > 1) { echo " ".$text['label-processor_usage']."\n"; - echo "
\n"; - echo "
get('theme', 'dashboard_cpu_usage_chart_main_color') ?? '#03c04a').";'>".round($percent_cpu)."%
\n"; + echo "
\n"; + echo "
get('theme', 'dashboard_cpu_usage_chart_main_color') ?? '#03c04a').";'>".round($percent_cpu)."%
\n"; echo "
\n"; echo "
 
\n"; } @@ -188,8 +188,8 @@ //disk usage if ($dashboard_row_span >= 1) { echo " ".$text['label-disk_usage']."\n"; - echo "
\n"; - echo "
get('theme', 'dashboard_disk_usage_chart_main_color') ?? '#03c04a').";'>".round($percent_disk_usage)."%
\n"; + echo "
\n"; + echo "
get('theme', 'dashboard_disk_usage_chart_main_color') ?? '#03c04a').";'>".round($percent_disk_usage)."%
\n"; echo "
\n"; echo "
 
\n"; } @@ -197,8 +197,8 @@ //percent memory if ($dashboard_row_span > 1) { echo " ".$text['label-memory_usage']."\n"; - echo "
\n"; - echo "
get('theme', 'dashboard_disk_usage_chart_main_color') ?? '#03c04a').";'>".round($memory_details['memory_percent'])."%
\n"; + echo "
\n"; + echo "
get('theme', 'dashboard_disk_usage_chart_main_color') ?? '#03c04a').";'>".round($memory_details['memory_percent'])."%
\n"; echo "
\n"; } } diff --git a/app/voicemails/resources/dashboard/voicemails.php b/app/voicemails/resources/dashboard/voicemails.php index ad9d9f557e..7df02e2389 100644 --- a/app/voicemails/resources/dashboard/voicemails.php +++ b/app/voicemails/resources/dashboard/voicemails.php @@ -111,7 +111,7 @@ echo "\n"; echo "
\n"; echo " \n"; - echo " ".$messages['new']."\n"; + echo " ".$messages['new']."\n"; echo "
\n"; echo "
"; } diff --git a/app/xml_cdr/resources/dashboard/missed_calls.php b/app/xml_cdr/resources/dashboard/missed_calls.php index 6fb5eebdfa..0ead3fe9ef 100644 --- a/app/xml_cdr/resources/dashboard/missed_calls.php +++ b/app/xml_cdr/resources/dashboard/missed_calls.php @@ -149,7 +149,7 @@ echo "\n"; echo "
\n"; echo " \n"; - echo " ".$num_rows."\n"; + echo " ".$num_rows."\n"; echo "
\n"; echo "
"; } diff --git a/app/xml_cdr/resources/dashboard/recent_calls.php b/app/xml_cdr/resources/dashboard/recent_calls.php index 93cbf076f3..959a9361cb 100644 --- a/app/xml_cdr/resources/dashboard/recent_calls.php +++ b/app/xml_cdr/resources/dashboard/recent_calls.php @@ -147,7 +147,7 @@ echo "
\n"; echo "
\n"; echo " \n"; - echo " ".$num_rows."\n"; + echo " ".$num_rows."\n"; echo "
\n"; echo "
"; } diff --git a/core/dashboard/dashboard_edit.php b/core/dashboard/dashboard_edit.php index 04d0355490..d8532efa7b 100644 --- a/core/dashboard/dashboard_edit.php +++ b/core/dashboard/dashboard_edit.php @@ -805,6 +805,7 @@ $dashboard_path == "domain_limits/domain_limits" || $dashboard_path == "call_forward/call_forward" || $dashboard_path == "ring_groups/ring_group_forward" || + $dashboard_path == "registrations/registrations" || $dashboard_path == "extensions/caller_id" || $dashboard_path == "maintenance/maintenance" ) {