Revert of the revert #21977f32053a80466bbecdb050b8102e0fb2463c

Author: nook24

app/Controller/LoginController.php

@@ -69,8 +69,8 @@ public function login($redirectBack = 0){
 		}
 		if($this->request->referer(true) === '/') {
 			$this->Auth->loginRedirect = array(
-				'controller' => 'home',
-				'action' => 'demo'
+				'controller' => 'dashboards',
+				'action' => 'index'
 			);
 		}
 

app/View/Elements/Dashboard/host_piechart_180.ctp

@@ -38,14 +38,14 @@
 					'critical',
 					'unknown'
 				];
-				
+
 				$bgColors = [
 					1 => 'bg-color-red',
 					2 => 'bg-color-blueDark'
 				];
-				
+
 				?>
-				
+
 			</div>
 			<div class="col-xs-12 stats180 margin-top-10" style="display:none; position: absolute; top:0px;">
 				<?php foreach([1, 2] as $state): ?>
@@ -57,7 +57,7 @@
 								'plugin' => '',
 								'Filter.Hoststatus.current_state['.$state.']' => 1
 							]); ?>" style="color:#FFF;">
-								<?php echo __('( %s ) down', $widgetHostStateArray180['state'][$state]);?>
+								<?php echo __('( %s ) '.strtolower($this->Status->humanSimpleHostStatus($state)), $widgetHostStateArray180['state'][$state]);?>
 							</a>
 						</div>
 						<div class="col-xs-12">
@@ -109,7 +109,7 @@
 				<?php endforeach; ?>
 			</div>
 		</div>
-		
+
 			<div class="text-center font-xs">
 				<div class="col-xs-12">
 					<div class="toggleDetailsForPiechart"><i class="fa fa-angle-down"></i></div>

app/View/Elements/Dashboard/service_piechart_180.ctp

@@ -39,13 +39,13 @@
 					'critical',
 					'unknown'
 				];
-				
+
 				$bgColors = [
-					1 => 'bg-color-red',
-					2 => 'bg-color-orange',
+					1 => 'bg-color-orange',
+					2 => 'bg-color-red',
 					3 => 'bg-color-blueDark'
 				];
-				
+
 				?>
 			</div>
 			<div class="col-xs-12 stats180 margin-top-10" style="display:none; position: absolute; top:0px;">
@@ -58,7 +58,7 @@
 								'plugin' => '',
 								'Filter.Servicestatus.current_state['.$state.']' => 1
 							]); ?>" style="color:#FFF;">
-								<?php echo __('( %s ) warning', $widgetServiceStateArray180['state'][$state]);?>
+								<?php echo __('( %s ) '.strtolower($this->Status->humanSimpleServiceStatus($state)), $widgetServiceStateArray180['state'][$state]);?>
 							</a>
 						</div>
 						<div class="col-xs-12">