Эх сурвалжийг харах

Update parent.php (#7109)

* Update parent.php

* Update dashboard_edit.php

* Update app_defaults.php
Alex 1 жил өмнө
parent
commit
9dae490d01

+ 1 - 2
core/dashboard/app_defaults.php

@@ -74,7 +74,7 @@ if ($domains_processed == 1) {
 				if (!empty($row['dashboard_label_background_color'])) { $array['dashboard'][$x]['dashboard_label_background_color'] = $row['dashboard_label_background_color']; }
 				if (!empty($row['dashboard_label_background_color_hover'])) { $array['dashboard'][$x]['dashboard_label_background_color'] = $row['dashboard_label_background_color_hover']; }
 				if (!empty($row['dashboard_background_color'])) { $array['dashboard'][$x]['dashboard_background_color'] = $row['dashboard_background_color']; }
-				if (!empty($row['dashboard_background_color_hover'])) { $array['dashboard'][$x]['dashboard_background_color'] = $row['dashboard_background_color_hover']; }
+				if (!empty($row['dashboard_background_color_hover'])) { $array['dashboard'][$x]['dashboard_background_color_hover'] = $row['dashboard_background_color_hover']; }
 				if (!empty($row['dashboard_detail_background_color'])) { $array['dashboard'][$x]['dashboard_detail_background_color'] = $row['dashboard_detail_background_color']; }
 				if (!empty($row['dashboard_content'])) { $array['dashboard'][$x]['dashboard_content'] = $row['dashboard_content']; }
 				if (!empty($row['dashboard_content_details'])) { $array['dashboard'][$x]['dashboard_content_details'] = $row['dashboard_content_details']; }
@@ -131,4 +131,3 @@ if ($domains_processed == 1) {
 }
 
 ?>
-

+ 6 - 7
core/dashboard/dashboard_edit.php

@@ -751,7 +751,6 @@
 	echo "</tr>\n";
 
 	if (
-		$action == "add" ||
 		$dashboard_path == "voicemails/voicemails" ||
 		$dashboard_path == "xml_cdr/missed_calls" ||
 		$dashboard_path == "xml_cdr/recent_calls" ||
@@ -886,9 +885,9 @@
 		}
 	}
 	if (empty($dashboard_background_color) || (is_array($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('background_color_gradient').style.display = 'block';\">\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 "	<input id='background_color_gradient' style='display: none;' type='text' class='formfld colorpicker' name='dashboard_background_color[]'>\n";
 		}
 		echo "<br />\n";
 	}
@@ -908,9 +907,9 @@
 			}
 		}
 		if (empty($dashboard_background_color_hover) || (is_array($dashboard_background_color_hover) && count($dashboard_background_color_hover) < 2)) {
-			echo "	<input type='text' class='formfld colorpicker' name='dashboard_background_color_hover[]' value='' onclick=\"document.getElementById('second_input').style.display = 'block';\">\n";
+			echo "	<input type='text' class='formfld colorpicker' name='dashboard_background_color_hover[]' value='' onclick=\"document.getElementById('background_color_hover_gradient').style.display = 'block';\">\n";
 			if (empty($dashboard_background_color_hover)) {
-				echo "	<input id='second_input' style='display: none;' type='text' class='formfld colorpicker' name='dashboard_background_color_hover[]'>\n";
+				echo "	<input id='background_color_hover_gradient' style='display: none;' type='text' class='formfld colorpicker' name='dashboard_background_color_hover[]'>\n";
 			}
 			echo "<br />\n";
 		}
@@ -930,9 +929,9 @@
 		}
 	}
 	if (empty($dashboard_detail_background_color) || (is_array($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_background_color_gradient').style.display = 'block';\">\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 "	<input id='detail_background_color_gradient' style='display: none;' type='text' class='formfld colorpicker' name='dashboard_detail_background_color[]'>\n";
 		}
 		echo "<br />\n";
 	}

+ 8 - 7
core/dashboard/resources/dashboard/parent.php

@@ -90,14 +90,14 @@
 		}
 		if (!empty($row['dashboard_background_color'])) {
 			$background_color = json_decode($row['dashboard_background_color'], true);
-			echo "#".$dashboard_name." .hud_content {\n";
+			echo "#".$dashboard_name." {\n";
 			echo "	background: ".$background_color[0].";\n";
 			echo "	background-image: linear-gradient(to right, ".$background_color[1]." 0%, ".$background_color[0]." 30%, ".$background_color[0]." 70%, ".$background_color[1]." 100%);\n";
 			echo "}\n";
 		}
 		if (!empty($row['dashboard_background_color_hover'])) {
 			$background_color_hover = json_decode($row['dashboard_background_color_hover'], true);
-			echo "#".$dashboard_name.":hover .hud_content {\n";
+			echo "#".$dashboard_name.":hover {\n";
 			echo "	background: ".$background_color_hover[0].";\n";
 			echo "	background-image: linear-gradient(to right, ".$background_color_hover[1]." 0%, ".$background_color_hover[0]." 30%, ".$background_color_hover[0]." 70%, ".$background_color_hover[1]." 100%);\n";
 			echo "}\n";
@@ -118,10 +118,11 @@
 			echo "}\n";
 		}
 		if ($row['dashboard_path'] == "core/dashboard/resources/dashboard/icon.php") {
-			echo "#".$dashboard_name." div.hud_content,\n";
+			echo "#".$dashboard_name.",\n";
 			echo "#".$dashboard_name." span.hud_title,\n";
 			echo "#".$dashboard_name." span.hud_stat {\n";
 			echo "	transition: .4s;\n";
+			echo "	border-radius: 5px;\n";
 			echo "}\n";
 		}
 		switch ($row['dashboard_row_span']) {
@@ -158,8 +159,8 @@
 	echo "</style>\n";
 
 //include the dashboards
-	echo "<div class='hud_box'>\n";
-	echo "	<div class='hud_content' style='flex-direction: row; justify-content: center; align-content: start; width: 100%;' ".(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 "<div class='hud_box' style='width: 100%; overflow: scroll;'>\n";
+	echo "	<div class='hud_content'>\n";
 
 	$x = 0;
 	foreach ($parent_widgets as $row) {
@@ -182,9 +183,9 @@
 		//	$dashboard_row_span += 3;
 		//}
 
-		echo "<div class='widget' style='width: 120px; margin: 13px;' id='".trim(preg_replace("/[^a-z]/", '_', strtolower($dashboard_name)),'_')."' onclick=\"window.open('".$dashboard_url."', '".$dashboard_target."', '".$window_parameters."')\" draggable='false'>\n";
+		echo "<div class='icon_widget' style='width: 120px; margin: 15px 15px 8px 15px;' id='".trim(preg_replace("/[^a-z]/", '_', strtolower($dashboard_name)),'_')."' onclick=\"window.open('".$dashboard_url."', '".$dashboard_target."', '".$window_parameters."')\" draggable='false'>\n";
 		echo "	<span class='hud_title'>".escape($dashboard_label)."</span>";
-		echo "	<span class='hud_stat' style='padding: 0;'><i class=\"fas ".$dashboard_icon."\" style='font-size: 24pt;'></i></span>\n";
+		echo "	<span class='hud_stat' style='padding: 0 0 7px 0;'><i class=\"fas ".$dashboard_icon."\" style='font-size: 24pt;'></i></span>\n";
 		echo "</div>\n";
 	}