More tweaking of the colors @d22a7b1

lipl986927 · Sep 23, 2017 · 4934599 · 4934599
1 parent 3460af8
commit 4934599
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 5 deletions.
diff --git a/cabnavigator.php b/cabnavigator.php
@@ -174,8 +174,9 @@ function renderUnassignedTemplateOwnership($noTemplFlag, $noOwnerFlag, $device)
 	$totalWatts=$stats->Wattage;
 	$totalWeight=$stats->Weight;
 
-	// Set up the classes for color coding based upon status
+	$legend.='<div class="legenditem hide"><span style="background-color:'.$config->ParameterArray['CriticalColor'].'; text-align:center" class="error colorbox border">*</span> - '.__("Above defined rack height").'</div>'."\n";
 
+	// Set up the classes for color coding based upon status
 	$dsList=DeviceStatus::getStatusList();
 
 	$head.="        <style type=\"text/css\">
@@ -207,8 +208,6 @@ function renderUnassignedTemplateOwnership($noTemplFlag, $noOwnerFlag, $device)
 	// Generate rear rack view if needed
 	$body.=($backside)?BuildCabinet($cab->CabinetID,'rear'):'';
 
-	$legend.='<div class="legenditem hide"><span style="background-color:'.$config->ParameterArray['CriticalColor'].'; text-align:center" class="error colorbox border">*</span> - '.__("Above defined rack height").'</div>'."\n";
-
 	$used=$cab->CabinetOccupancy($cab->CabinetID);
 	@$SpacePercent=($cab->CabinetHeight>0)?number_format($used/$cab->CabinetHeight*100,0):0;
 	@$WeightPercent=number_format($totalWeight/$cab->MaxWeight*100,0);

diff --git a/css/inventory.php b/css/inventory.php
@@ -535,7 +535,7 @@
 .blackout { background-color: black; }
 .rowview .noprint span:last-child {display: none;}
 .rowview div.cabinet { vertical-align: bottom; }
-.cabinet .error { background-color: <?php echo $config->ParameterArray['CriticalColor']; ?>; }
+.cabinet .error { background-color: <?php echo $config->ParameterArray['CriticalColor']; ?> !important; }
 
 /* PICTURES */
 .disabled {pointer-events: none;cursor: default;}

diff --git a/scripts/common.js b/scripts/common.js
@@ -1592,7 +1592,7 @@ function InsertDevice(obj){
 		// Color the rack for the department
 		var StartingU=$('#cabinet'+obj.Cabinet+' #pos'+obj.Position);
 
-		if(StartingU.hasClass('error')){
+		if(StartingU.find('td.error').length){
 			$('#legend > .legenditem > span.error').parent('div').removeClass('hide');
 		}