瀏覽代碼

Dashboard - Add disabled option to details state (#6962)

* Dashboard - Add disabled option to details state
Alex 1 年之前
父節點
當前提交
553d8b64d5
共有 3 個文件被更改,包括 22 次插入9 次删除
  1. 12 6
      core/dashboard/dashboard_edit.php
  2. 9 2
      core/dashboard/index.php
  3. 1 1
      core/dashboard/resources/dashboard/icon.php

+ 12 - 6
core/dashboard/dashboard_edit.php

@@ -584,12 +584,6 @@
 	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 "	<select name='dashboard_details_state' class='formfld'>\n";
 	echo "	<select name='dashboard_details_state' class='formfld'>\n";
-	if ($dashboard_details_state == "hidden") {
-		echo "		<option value='hidden' selected='selected'>".$text['option-hidden']."</option>\n";
-	}
-	else {
-		echo "		<option value='hidden'>".$text['option-hidden']."</option>\n";
-	}
 	if ($dashboard_details_state == "expanded") {
 	if ($dashboard_details_state == "expanded") {
 		echo "		<option value='expanded' selected='selected'>".$text['option-expanded']."</option>\n";
 		echo "		<option value='expanded' selected='selected'>".$text['option-expanded']."</option>\n";
 	}
 	}
@@ -602,6 +596,18 @@
 	else {
 	else {
 		echo "		<option value='contracted'>".$text['option-contracted']."</option>\n";
 		echo "		<option value='contracted'>".$text['option-contracted']."</option>\n";
 	}
 	}
+	if ($dashboard_details_state == "hidden") {
+		echo "		<option value='hidden' selected='selected'>".$text['option-hidden']."</option>\n";
+	}
+	else {
+		echo "		<option value='hidden'>".$text['option-hidden']."</option>\n";
+	}
+	if ($dashboard_details_state == "disabled" || empty($dashboard_details_state)) {
+		echo "		<option value='disabled' selected='selected'>".$text['label-disabled']."</option>\n";
+	}
+	else {
+		echo "		<option value='disabled'>".$text['label-disabled']."</option>\n";
+	}
 	echo "	</select>\n";
 	echo "	</select>\n";
 	echo "<br />\n";
 	echo "<br />\n";
 	echo $text['description-dashboard_details_state']."\n";
 	echo $text['description-dashboard_details_state']."\n";

+ 9 - 2
core/dashboard/index.php

@@ -163,7 +163,7 @@
 	$expanded_all = true;
 	$expanded_all = true;
 	if (is_array($dashboard) && @sizeof($dashboard) != 0) {
 	if (is_array($dashboard) && @sizeof($dashboard) != 0) {
 		foreach ($dashboard as $row) {
 		foreach ($dashboard as $row) {
-			if ($row['dashboard_details_state'] == 'contracted' || $row['dashboard_details_state'] == 'hidden') { $expanded_all = false; }
+			if ($row['dashboard_details_state'] == 'contracted' || $row['dashboard_details_state'] == 'hidden' || $row['dashboard_details_state'] == 'disabled') { $expanded_all = false; }
 		}
 		}
 	}
 	}
 
 
@@ -266,6 +266,12 @@
 				echo "	display: none;\n";
 				echo "	display: none;\n";
 				echo "}\n";
 				echo "}\n";
 			}
 			}
+			if ($row['dashboard_details_state'] == "disabled") {
+				echo "#".$dashboard_name." .hud_box .hud_expander, \n";
+				echo "#".$dashboard_name." .hud_box .hud_details {\n";
+				echo "	display: none;\n";
+				echo "}\n";
+			}
 		}
 		}
 	?>
 	?>
 }
 }
@@ -315,6 +321,7 @@
 		$dashboard_heading_text_color = $row['dashboard_heading_text_color'] ?? $settings->get('theme', 'dashboard_heading_text_color');
 		$dashboard_heading_text_color = $row['dashboard_heading_text_color'] ?? $settings->get('theme', 'dashboard_heading_text_color');
 		$dashboard_number_background_color = $row['dashboard_number_background_color'] ?? $settings->get('theme', 'dashboard_number_background_color');
 		$dashboard_number_background_color = $row['dashboard_number_background_color'] ?? $settings->get('theme', 'dashboard_number_background_color');
 		$dashboard_number_text_color = $row['dashboard_number_text_color'] ?? $settings->get('theme', 'dashboard_number_text_color');
 		$dashboard_number_text_color = $row['dashboard_number_text_color'] ?? $settings->get('theme', 'dashboard_number_text_color');
+		$dashboard_details_state = $row['dashboard_details_state'];
 		echo "<div class='widget' id='".str_replace(" ", "_", strtolower($dashboard_name))."' draggable='false'>\n";
 		echo "<div class='widget' id='".str_replace(" ", "_", strtolower($dashboard_name))."' draggable='false'>\n";
 		include($row['dashboard_path']);
 		include($row['dashboard_path']);
 		echo "</div>\n";
 		echo "</div>\n";
@@ -421,4 +428,4 @@
 //show the footer
 //show the footer
 	require_once "resources/footer.php";
 	require_once "resources/footer.php";
 
 
-?>
+?>

+ 1 - 1
core/dashboard/resources/dashboard/icon.php

@@ -11,7 +11,7 @@
 //dashboard icon
 //dashboard icon
 	echo "<div class='hud_box'>\n";
 	echo "<div class='hud_box'>\n";
 
 
-	echo "<div style='display: flex; flex-wrap: wrap; justify-content: center; padding-bottom: 13px; background-color: ".$dashboard_number_background_color.";' onclick=\"$('#hud_icon_details').slideToggle('fast');\">\n";
+	echo "<div style='display: flex; flex-wrap: wrap; justify-content: center; padding-bottom: 13px; background-color: ".$dashboard_number_background_color.";' ".($row['dashboard_details_state'] == "disabled" ?: "onclick=\"$('#hud_icon_details').slideToggle('fast');\"").">\n";
 	echo "	<span class='hud_title' style='background-color: ".$dashboard_heading_background_color."; color: ".$dashboard_heading_text_color.";' onclick=\"document.location.href='".$dashboard_url."'\">". $dashboard_name . "</span>"; // (isset($text['label-'.$dashboard_name])) ? $text['label-'.$dashboard_name] : $dashboard_name
 	echo "	<span class='hud_title' style='background-color: ".$dashboard_heading_background_color."; color: ".$dashboard_heading_text_color.";' onclick=\"document.location.href='".$dashboard_url."'\">". $dashboard_name . "</span>"; // (isset($text['label-'.$dashboard_name])) ? $text['label-'.$dashboard_name] : $dashboard_name
 	echo "	<a href='".$dashboard_url."'><span class='hud_stat' style='height: 150px; padding-bottom: 27px; color: ".$dashboard_number_text_color.";'><i class=\"fas ".$dashboard_icon."\" style=\"color: ".$dashboard_number_text_color."; font-size: 0.8em;\"></i></span></a>\n";
 	echo "	<a href='".$dashboard_url."'><span class='hud_stat' style='height: 150px; padding-bottom: 27px; color: ".$dashboard_number_text_color.";'><i class=\"fas ".$dashboard_icon."\" style=\"color: ".$dashboard_number_text_color."; font-size: 0.8em;\"></i></span></a>\n";
 	echo "</div>\n";
 	echo "</div>\n";