Procházet zdrojové kódy

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
Alex před 1 rokem
rodič
revize
ed0595567e

+ 7 - 3
core/dashboard/dashboard_edit.php

@@ -584,7 +584,7 @@
 	echo $text['label-dashboard_heading_background_color']."\n";
 	echo "</td>\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 $text['description-dashboard_heading_background_color']."\n";
 	echo "</td>\n";
@@ -615,7 +615,9 @@
 	}
 	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 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 $text['description-dashboard_background_color']."\n";
@@ -636,7 +638,9 @@
 	}
 	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 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 $text['description-dashboard_detail_background_color']."\n";

Rozdílová data souboru nebyla zobrazena, protože soubor je příliš velký
+ 2 - 2
resources/chartjs/chart.min.js


Rozdílová data souboru nebyla zobrazena, protože soubor je příliš velký
+ 0 - 1
resources/sortablejs/sortable.min.js


Některé soubory nejsou zobrazeny, neboť je v těchto rozdílových datech změněno mnoho souborů