Update Chartjs and Sortablejs (#6978)
* minor bug fix * fix spacing of legend * remove extra line break * minor bug fix * Update dashboard_edit.php * Update chart.min.js * Update sortable.min.js
This commit is contained in:
parent
5286dbbb1b
commit
b35b447344
|
|
@ -301,7 +301,7 @@
|
||||||
if ($dashboard_chart_type == "doughnut") {
|
if ($dashboard_chart_type == "doughnut") {
|
||||||
//add doughnut chart
|
//add doughnut chart
|
||||||
?>
|
?>
|
||||||
<div class='hud_chart'><canvas id='system_counts_chart'></canvas></div>
|
<div class='hud_chart' style='width: 250px;'><canvas id='system_counts_chart'></canvas></div>
|
||||||
|
|
||||||
<script>
|
<script>
|
||||||
const system_counts_chart = new Chart(
|
const system_counts_chart = new Chart(
|
||||||
|
|
|
||||||
|
|
@ -584,7 +584,7 @@
|
||||||
echo $text['label-dashboard_heading_background_color']."\n";
|
echo $text['label-dashboard_heading_background_color']."\n";
|
||||||
echo "</td>\n";
|
echo "</td>\n";
|
||||||
echo "<td class='vtable' style='position: relative;' align='left'>\n";
|
echo "<td class='vtable' style='position: relative;' align='left'>\n";
|
||||||
echo " <input type='text' class='formfld colorpicker' name='dashboard_heading_background_color' value='".escape($dashboard_heading_background_color)."'><br />\n";
|
echo " <input type='text' class='formfld colorpicker' name='dashboard_heading_background_color' value='".escape($dashboard_heading_background_color)."'>\n";
|
||||||
echo "<br />\n";
|
echo "<br />\n";
|
||||||
echo $text['description-dashboard_heading_background_color']."\n";
|
echo $text['description-dashboard_heading_background_color']."\n";
|
||||||
echo "</td>\n";
|
echo "</td>\n";
|
||||||
|
|
@ -615,7 +615,9 @@
|
||||||
}
|
}
|
||||||
if (empty($dashboard_background_color) || count($dashboard_background_color) < 2) {
|
if (empty($dashboard_background_color) || count($dashboard_background_color) < 2) {
|
||||||
echo " <input type='text' class='formfld colorpicker' name='dashboard_background_color[]' value='' onclick=\"document.getElementById('second_input').style.display = 'block';\">\n";
|
echo " <input type='text' class='formfld colorpicker' name='dashboard_background_color[]' value='' onclick=\"document.getElementById('second_input').style.display = 'block';\">\n";
|
||||||
echo " <input id='second_input' style='display: none;' type='text' class='formfld colorpicker' name='dashboard_background_color[]'>\n";
|
if (empty($dashboard_background_color)) {
|
||||||
|
echo " <input id='second_input' style='display: none;' type='text' class='formfld colorpicker' name='dashboard_background_color[]'>\n";
|
||||||
|
}
|
||||||
}
|
}
|
||||||
echo "<br />\n";
|
echo "<br />\n";
|
||||||
echo $text['description-dashboard_background_color']."\n";
|
echo $text['description-dashboard_background_color']."\n";
|
||||||
|
|
@ -636,7 +638,9 @@
|
||||||
}
|
}
|
||||||
if (empty($dashboard_detail_background_color) || count($dashboard_detail_background_color) < 2) {
|
if (empty($dashboard_detail_background_color) || count($dashboard_detail_background_color) < 2) {
|
||||||
echo " <input type='text' class='formfld colorpicker' name='dashboard_detail_background_color[]' value='' onclick=\"document.getElementById('detail_second_input').style.display = 'block';\">\n";
|
echo " <input type='text' class='formfld colorpicker' name='dashboard_detail_background_color[]' value='' onclick=\"document.getElementById('detail_second_input').style.display = 'block';\">\n";
|
||||||
echo " <input id='detail_second_input' style='display: none;' type='text' class='formfld colorpicker' name='dashboard_detail_background_color[]'>\n";
|
if (empty($dashboard_detail_background_color)) {
|
||||||
|
echo " <input id='detail_second_input' style='display: none;' type='text' class='formfld colorpicker' name='dashboard_detail_background_color[]'>\n";
|
||||||
|
}
|
||||||
}
|
}
|
||||||
echo "<br />\n";
|
echo "<br />\n";
|
||||||
echo $text['description-dashboard_detail_background_color']."\n";
|
echo $text['description-dashboard_detail_background_color']."\n";
|
||||||
|
|
|
||||||
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
Loading…
Reference in New Issue