mirror of
https://github.com/fusionpbx/fusionpbx.git
synced 2026-01-06 11:43:50 +00:00
Dashboard - Minor bug fixes (#7441)
* Dashboard - Minor bug fixes * Update config.php * Update config.php * Update config.php * Update dashboard_edit.php * Update index.php * Update index.php
This commit is contained in:
@@ -13,7 +13,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'] = 'doughnut';
|
||||
$array['dashboard'][$x]['dashboard_label_enabled'] = 'true';
|
||||
$array['dashboard'][$x]['dashboard_label_text_color'] = '';
|
||||
$array['dashboard'][$x]['dashboard_label_text_color_hover'] = '';
|
||||
@@ -22,7 +22,7 @@ $array['dashboard'][$x]['dashboard_label_background_color_hover'] = '';
|
||||
$array['dashboard'][$x]['dashboard_number_text_color'] = '';
|
||||
$array['dashboard'][$x]['dashboard_number_text_color_hover'] = '';
|
||||
$array['dashboard'][$x]['dashboard_number_background_color'] = '';
|
||||
$array['dashboard'][$x]['dashboard_background_color'] ='';
|
||||
$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';
|
||||
@@ -66,7 +66,7 @@ $array['dashboard'][$x]['dashboard_label_background_color_hover'] = '';
|
||||
$array['dashboard'][$x]['dashboard_number_background_color'] = '';
|
||||
$array['dashboard'][$x]['dashboard_number_text_color'] = '#0292ff';
|
||||
$array['dashboard'][$x]['dashboard_number_text_color_hover'] = '';
|
||||
$array['dashboard'][$x]['dashboard_background_color'] ='';
|
||||
$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';
|
||||
|
||||
@@ -26,7 +26,7 @@ $array['dashboard'][$x]['dashboard_background_color_hover'] = '';
|
||||
$array['dashboard'][$x]['dashboard_detail_background_color'] = '#ffffff';
|
||||
$array['dashboard'][$x]['dashboard_column_span'] = '1';
|
||||
$array['dashboard'][$x]['dashboard_row_span'] = '2';
|
||||
$array['dashboard'][$x]['dashboard_details_state'] = 'expanded';
|
||||
$array['dashboard'][$x]['dashboard_details_state'] = 'hidden';
|
||||
$array['dashboard'][$x]['dashboard_order'] = '120';
|
||||
$array['dashboard'][$x]['dashboard_enabled'] = 'false';
|
||||
$array['dashboard'][$x]['dashboard_description'] = '';
|
||||
|
||||
@@ -13,7 +13,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'] = 'doughnut';
|
||||
$array['dashboard'][$x]['dashboard_label_enabled'] = 'true';
|
||||
$array['dashboard'][$x]['dashboard_label_text_color'] = '#444444';
|
||||
$array['dashboard'][$x]['dashboard_label_text_color_hover'] = '';
|
||||
|
||||
@@ -828,10 +828,8 @@
|
||||
echo "<td class='vtable' style='position: relative;' align='left'>\n";
|
||||
echo " <select name='dashboard_chart_type' class='formfld'>\n";
|
||||
echo " <option value='doughnut'>".$text['label-doughnut']."</option>\n";
|
||||
if ($dashboard_chart_type === 'line') {
|
||||
echo " <option value='line' selected='selected'>".$text['label-line']."</option>\n";
|
||||
} else {
|
||||
echo " <option value='line'>".$text['label-line']."</option>\n";
|
||||
if ($dashboard_chart_type == 'line' || $dashboard_path == 'system/system_cpu_status') {
|
||||
echo " <option value='line' ".($dashboard_chart_type == "line" ? "selected='selected'" : null).">".$text['label-line']."</option>\n";
|
||||
}
|
||||
if ($dashboard_chart_type == "icon" || in_array($dashboard_path, ['domains/domains', 'xml_cdr/missed_calls', 'voicemails/voicemails', 'xml_cdr/recent_calls', 'registrations/registrations'])) {
|
||||
echo " <option value='icon' ".($dashboard_chart_type == "icon" ? "selected='selected'" : null).">".$text['label-icon']."</option>\n";
|
||||
@@ -931,7 +929,7 @@
|
||||
echo "</tr>\n";
|
||||
}
|
||||
|
||||
if ($dashboard_chart_type == "icon" || in_array($dashboard_path, ['domains/domains', 'xml_cdr/missed_calls', 'voicemails/voicemails', 'xml_cdr/recent_calls', 'registrations/registrations'])) {
|
||||
if ($dashboard_chart_type == "icon" || in_array($dashboard_path, ['active_calls/active_calls', 'domains/domains', 'xml_cdr/missed_calls', 'voicemails/voicemails', 'xml_cdr/recent_calls', 'registrations/registrations'])) {
|
||||
echo "<tr class='type_icon'>\n";
|
||||
echo "<td class='vncell' valign='top' align='left' nowrap='nowrap'>\n";
|
||||
echo $text['label-dashboard_number_text_color_hover']."\n";
|
||||
@@ -988,8 +986,8 @@
|
||||
echo "</td>\n";
|
||||
echo "</tr>\n";
|
||||
|
||||
if ($action == "add" || $dashboard_path == "dashboard/icon") {
|
||||
echo "<tr class='type_icon' ".($dashboard_path != 'dashboard/icon' ? "style='display: none;'" : null).">\n";
|
||||
if ($action == "add" || $dashboard_path == "dashboard/icon" || $dashboard_chart_type == "icon") {
|
||||
echo "<tr class='type_icon' ".($dashboard_path != "dashboard/icon" || $dashboard_chart_type != "icon" ? null : "style='display: none;'").">\n";
|
||||
echo "<td class='vncell' valign='top' align='left' nowrap='nowrap'>\n";
|
||||
echo $text['label-dashboard_background_color_hover']."\n";
|
||||
echo "</td>\n";
|
||||
|
||||
@@ -277,13 +277,13 @@ foreach ($dashboard as $row) {
|
||||
echo "}\n";
|
||||
}
|
||||
if (!empty($row['dashboard_label_text_color']) || !empty($row['dashboard_label_background_color'])) {
|
||||
echo "#".$dashboard_name." .hud_title {\n";
|
||||
echo "#".$dashboard_name." .hud_title:first-of-type {\n";
|
||||
if (!empty($row['dashboard_label_text_color'])) { echo " color: ".$row['dashboard_label_text_color'].";\n"; }
|
||||
if (!empty($row['dashboard_label_background_color'])) { echo " background-color: ".$row['dashboard_label_background_color'].";\n"; }
|
||||
echo "}\n";
|
||||
}
|
||||
if (!empty($row['dashboard_label_text_color_hover']) || !empty($row['dashboard_label_background_color_hover'])) {
|
||||
echo "#".$dashboard_name.":hover .hud_title {\n";
|
||||
echo "#".$dashboard_name.":hover .hud_title:first-of-type {\n";
|
||||
if (!empty($row['dashboard_label_text_color_hover'])) { echo " color: ".$row['dashboard_label_text_color_hover'].";\n"; }
|
||||
if (!empty($row['dashboard_label_background_color_hover'])) { echo " background-color: ".$row['dashboard_label_background_color_hover'].";\n"; }
|
||||
echo "}\n";
|
||||
@@ -335,7 +335,7 @@ foreach ($dashboard as $row) {
|
||||
echo "}\n";
|
||||
}
|
||||
if ($row['dashboard_label_enabled'] == 'false') {
|
||||
echo "#".$dashboard_name." .hud_title {\n";
|
||||
echo "#".$dashboard_name." .hud_title:first-of-type {\n";
|
||||
echo " display: none;\n";
|
||||
echo "}\n";
|
||||
echo "#".$dashboard_name." .hud_content {\n";
|
||||
|
||||
@@ -24,10 +24,8 @@
|
||||
//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 " <a href='".$dashboard_url."' onclick=\"window.open('".$dashboard_url."', '".$dashboard_target."', '".$window_parameters."'); return false;\" style=''>\n";
|
||||
echo " <span class='hud_title'>".escape($dashboard_label)."</span>\n";
|
||||
echo " <span class='hud_stat'><i class=\"fas ".$dashboard_icon."\"></i></span>\n";
|
||||
echo " </a>\n";
|
||||
echo " <span class='hud_title'><a style='padding: 10px 0;' onclick=\"window.open('".$dashboard_url."', '".$dashboard_target."', '".$window_parameters."'); return false;\">".escape($dashboard_label)."</a></span>\n";
|
||||
echo " <span class='hud_stat'><a style='padding: 10px 20px;' onclick=\"window.open('".$dashboard_url."', '".$dashboard_target."', '".$window_parameters."'); return false;\"><i class=\"fas ".$dashboard_icon."\"></i></a></span>\n";
|
||||
echo " </div>\n";
|
||||
|
||||
if (empty($dashboard_details_state) || $dashboard_details_state != "disabled") {
|
||||
|
||||
Reference in New Issue
Block a user