Set 1 as the minimum value for rack position. Also added in loop to s…

…earch for 0 height devices in rack view. #11
opendcim · Jul 5, 2012 · 734c585 · 734c585
1 parent 5261cfa
commit 734c585
Show file tree

Hide file tree

Showing 3 changed files with 37 additions and 13 deletions.
diff --git a/cabnavigator.php b/cabnavigator.php
@@ -12,7 +12,7 @@
 		exit;
 	}
 
-	$head=$legend="";
+	$head=$legend=$zeroheight="";
 	$cab=new Cabinet();
 	$audit=new CabinetAudit();
 	$pdu=new PowerDistribution();
@@ -78,9 +78,9 @@
 			$legend.='<p><span class="reserved border">&nbsp;&nbsp;&nbsp;&nbsp;</span> - Reservation</p>';
 		}
 		if($config->ParameterArray["FreeSpaceColor"] != "#FFFFFF"){
-			$legend.='<p><span class="freespace border">&nbsp;&nbsp;&nbsp;&nbsp;</span> - FreeSpace</p>';
+			$legend.='<p><span class="freespace border">&nbsp;&nbsp;&nbsp;&nbsp;</span> - Free Space</p>';
 		}
-		$legend.='<p><span class="border">&nbsp;&nbsp;&nbsp;&nbsp;</span> - Normal</p>';
+		$legend.='<p><span class="border">&nbsp;&nbsp;&nbsp;&nbsp;</span> - Occupied Space</p>';
 	}
 
 ?>
@@ -128,16 +128,22 @@ function verifyDelete(formname) {
 	<tr><th colspan=2>Cabinet <?php print $cab->Location; ?></th></tr>
 	<tr><td width="10%">Pos</td><td width="90%">Device</td></tr>
 <?php
-	while ( list( $devID, $device ) = each( $devList ) ) {
-		$devTop = $device->Position + $device->Height - 1;
+	while(list($devID,$device)=each($devList)){
+		$devTop=$device->Position + $device->Height - 1;
 
 		$templ->TemplateID = $device->TemplateID;
-		$templ->GetTemplateByID( $facDB );
+		$templ->GetTemplateByID($facDB);
 
-		if ( $device->NominalWatts > 0 )
-			$totalWatts += $device->NominalWatts;
-		else
-			$totalWatts += $templ->Wattage;
+		$highlight="<blink><font color=red>";
+		if($device->TemplateID==0){$highlight.="(T)";}
+		if($device->Owner==0){$highlight.="(O)";}
+		$highlight.= "</font></blink>";
+
+		if($device->NominalWatts >0){
+			$totalWatts+=$device->NominalWatts;
+		}else{
+			$totalWatts+=$templ->Wattage;
+		}
 
 		$totalWeight += $templ->Weight;
 		$totalMoment += ( $templ->Weight * ( $device->Position + ( $device->Height / 2 ) ) );
@@ -159,6 +165,9 @@ function verifyDelete(formname) {
 			}
 		} 
 
+		if($device->Height<1){
+			$zeroheight.="				<a href=\"devices.php?deviceid=$devID\">$highlight $device->Label</a>\n";
+		}
 		for($i = $devTop; $i >= $device->Position; $i--){
 			if($i==$devTop){
 				$highlight="<blink><font color=red>";
@@ -168,9 +177,10 @@ function verifyDelete(formname) {
 				if ($device->Owner==0) {
 					$highlight.="(O)";
 				}
-
 				$highlight .= "</font></blink>";
 				print "<tr><td>$i</td><td class=\"device $reserved\" rowspan=$device->Height><a href=\"devices.php?deviceid=$devID\">$highlight $device->Label</a></td></tr>\n";
+
+
 			}else{
 				print "<tr><td>$i</td></tr>\n";
 			}
@@ -259,6 +269,16 @@ function verifyDelete(formname) {
 <?php printf( "%s\n", $cab->Keylock ); ?>
 		</div>
 	</fieldset>
+<?php
+	if($zeroheight!=""){
+		print "	<fieldset>
+		<legend>Zero-U Devices</legend>
+		<div id=\"zerou\">
+			$zeroheight
+		</div>
+	</fieldset>\n";
+	}
+?>
 	<fieldset>
 		<legend>Power Distribution</legend>
 <?php

diff --git a/css/inventory.css b/css/inventory.css
@@ -404,6 +404,9 @@ textarea {
 	white-space: pre;
 	word-wrap: break-word;
 }
+#zerou a{
+	display: block;
+}
 /* devices.php  Device Detail */
 div.page.device {
 	min-width: 1350px; /* 1030 */

diff --git a/devices.php b/devices.php
@@ -458,7 +458,7 @@ function setPreferredLayout() {<?php if(isset($_COOKIE["layout"]) && strtolower(
 		</div>
 		<div>
 		   <div><label for="position">Position</label></div>
-		   <div><input type="number" class="required,validate[custom[onlyNumberSp]]" name="position" id="position" size="4" value="<?php echo $dev->Position; ?>"></div>
+		   <div><input type="number" class="required,validate[custom[onlyNumberSp],min[1]]" name="position" id="position" size="4" value="<?php echo $dev->Position; ?>"></div>
 		</div>
 		<div>
 		   <div><label for="height">Height</label></div>
@@ -496,7 +496,8 @@ function setPreferredLayout() {<?php if(isset($_COOKIE["layout"]) && strtolower(
 </fieldset>
 <?php
 	// Do not display ESX block if device isn't a virtual server and the user doesn't have write access
-	if($user->WriteAccess || $dev->ESX){
+//	if($user->WriteAccess || $dev->ESX){
+	if(($user->WriteAccess || $dev->ESX) && ($dev->DeviceType=="Server" || $dev->DeviceType=="")){
 		echo "<fieldset>\n	<legend>VMWare ESX Server Information</legend>";
 	// If the user doesn't have write access display the list of VMs but not the configuration information.
 		if($user->WriteAccess){