diff --git a/app/voicemails/resources/dashboard/config.php b/app/voicemails/resources/dashboard/config.php index 51bbfb7613..77eb506dfc 100644 --- a/app/voicemails/resources/dashboard/config.php +++ b/app/voicemails/resources/dashboard/config.php @@ -12,20 +12,20 @@ $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'] = 'doughnut'; +$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'] = ''; $array['dashboard'][$x]['dashboard_label_background_color'] = ''; $array['dashboard'][$x]['dashboard_label_background_color_hover'] = ''; $array['dashboard'][$x]['dashboard_number_background_color'] = ''; -$array['dashboard'][$x]['dashboard_number_text_color'] = ''; +$array['dashboard'][$x]['dashboard_number_text_color'] = '#bfbfbf'; $array['dashboard'][$x]['dashboard_number_text_color_hover'] = ''; $array['dashboard'][$x]['dashboard_background_color'] =''; $array['dashboard'][$x]['dashboard_background_color_hover'] = ''; $array['dashboard'][$x]['dashboard_detail_background_color'] = ''; $array['dashboard'][$x]['dashboard_column_span'] = '1'; -$array['dashboard'][$x]['dashboard_row_span'] = '2'; +$array['dashboard'][$x]['dashboard_row_span'] = '1'; $array['dashboard'][$x]['dashboard_details_state'] = 'hidden'; $array['dashboard'][$x]['dashboard_order'] = '70'; $array['dashboard'][$x]['dashboard_enabled'] = 'true'; diff --git a/app/voicemails/resources/dashboard/voicemails.php b/app/voicemails/resources/dashboard/voicemails.php index fc85dcac20..ad9d9f557e 100644 --- a/app/voicemails/resources/dashboard/voicemails.php +++ b/app/voicemails/resources/dashboard/voicemails.php @@ -100,9 +100,22 @@ ".$messages['new'].""; } + + //dashboard icon + if (!isset($dashboard_chart_type) || $dashboard_chart_type == "icon") { + echo "\n"; + echo "
\n"; + echo " \n"; + echo " ".$messages['new']."\n"; + echo "
\n"; + echo "
"; + } + echo "\n"; if ($dashboard_details_state != 'disabled') { diff --git a/app/xml_cdr/resources/dashboard/config.php b/app/xml_cdr/resources/dashboard/config.php index 26f00012bd..8ce2c4b69f 100644 --- a/app/xml_cdr/resources/dashboard/config.php +++ b/app/xml_cdr/resources/dashboard/config.php @@ -12,20 +12,20 @@ $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'] = 'doughnut'; +$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'] = ''; $array['dashboard'][$x]['dashboard_label_background_color'] = ''; $array['dashboard'][$x]['dashboard_label_background_color_hover'] = ''; $array['dashboard'][$x]['dashboard_number_background_color'] = ''; -$array['dashboard'][$x]['dashboard_number_text_color'] = ''; +$array['dashboard'][$x]['dashboard_number_text_color'] = '#bfbfbf'; $array['dashboard'][$x]['dashboard_number_text_color_hover'] = ''; $array['dashboard'][$x]['dashboard_background_color'] =''; $array['dashboard'][$x]['dashboard_background_color_hover'] = ''; $array['dashboard'][$x]['dashboard_detail_background_color'] = ''; $array['dashboard'][$x]['dashboard_column_span'] = '1'; -$array['dashboard'][$x]['dashboard_row_span'] = '2'; +$array['dashboard'][$x]['dashboard_row_span'] = '1'; $array['dashboard'][$x]['dashboard_details_state'] = 'hidden'; $array['dashboard'][$x]['dashboard_order'] = '70'; $array['dashboard'][$x]['dashboard_enabled'] = 'true'; @@ -56,10 +56,10 @@ $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'] = 'doughnut'; +$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'] = ''; +$array['dashboard'][$x]['dashboard_label_text_color_hover'] = '#bfbfbf'; $array['dashboard'][$x]['dashboard_label_background_color'] = ''; $array['dashboard'][$x]['dashboard_label_background_color_hover'] = ''; $array['dashboard'][$x]['dashboard_number_background_color'] = ''; @@ -69,7 +69,7 @@ $array['dashboard'][$x]['dashboard_background_color'] =''; $array['dashboard'][$x]['dashboard_background_color_hover'] = ''; $array['dashboard'][$x]['dashboard_detail_background_color'] = ''; $array['dashboard'][$x]['dashboard_column_span'] = '1'; -$array['dashboard'][$x]['dashboard_row_span'] = '2'; +$array['dashboard'][$x]['dashboard_row_span'] = '1'; $array['dashboard'][$x]['dashboard_details_state'] = 'hidden'; $array['dashboard'][$x]['dashboard_order'] = '70'; $array['dashboard'][$x]['dashboard_enabled'] = 'true'; diff --git a/app/xml_cdr/resources/dashboard/missed_calls.php b/app/xml_cdr/resources/dashboard/missed_calls.php index e27017cf78..6fb5eebdfa 100644 --- a/app/xml_cdr/resources/dashboard/missed_calls.php +++ b/app/xml_cdr/resources/dashboard/missed_calls.php @@ -138,9 +138,21 @@ ".$num_rows.""; } + + //dashboard icon + if (!isset($dashboard_chart_type) || $dashboard_chart_type == "icon") { + echo "\n"; + echo "
\n"; + echo " \n"; + echo " ".$num_rows."\n"; + echo "
\n"; + echo "
"; + } echo "\n"; if ($dashboard_details_state != 'disabled') { diff --git a/app/xml_cdr/resources/dashboard/recent_calls.php b/app/xml_cdr/resources/dashboard/recent_calls.php index 017bc8797b..93cbf076f3 100644 --- a/app/xml_cdr/resources/dashboard/recent_calls.php +++ b/app/xml_cdr/resources/dashboard/recent_calls.php @@ -136,9 +136,22 @@ ".$num_rows.""; } + + //dashboard icon + if (!isset($dashboard_chart_type) || $dashboard_chart_type == "icon") { + echo "
\n"; + echo "
\n"; + echo " \n"; + echo " ".$num_rows."\n"; + echo "
\n"; + echo "
"; + } + echo "\n"; if ($dashboard_details_state != 'disabled') { diff --git a/core/dashboard/dashboard_edit.php b/core/dashboard/dashboard_edit.php index 5f3e5a6c95..0675ba6333 100644 --- a/core/dashboard/dashboard_edit.php +++ b/core/dashboard/dashboard_edit.php @@ -602,11 +602,8 @@ echo "\n"; echo "\n"; - if ( - $action == "add" || - $dashboard_path == "dashboard/icon" - ) { - echo " "; + if ($action == "add" || $dashboard_path == "dashboard/icon" || $dashboard_chart_type == "icon") { + echo " "; // ".(($dashboard_path != 'dashboard/icon' || $dashboard_chart_type == "icon") ? "style='display: none;'" : null)." echo " ".$text['label-icon'].""; echo " "; if (file_exists($_SERVER["PROJECT_ROOT"].'/resources/fontawesome/fa_icons.php')) { @@ -818,6 +815,7 @@ echo "\n"; echo "