Centreon

### Eclipse Workspace Patch 1.0

#P Centreon-Trunk

Index: www/menu/templates/BlockHeader.ihtml

===================================================================

--- www/menu/templates/BlockHeader.ihtml	(revision 9417)

+++ www/menu/templates/BlockHeader.ihtml	(working copy)

@@ -34,7 +34,7 @@

 			<td>

 				<table class='Resume_light_table'>

 					<tr class='Resume_light_header' style="white-space:nowrap;">

-						<td>{$Hosts_States}</td>

+						<td><strong>{$Hosts}</strong></td>

 						<td>{$Up}</td>

 						<td>{$Down}</td>

 						<td>{$Unreachable}</td>

@@ -53,7 +53,7 @@

 			<td>

 				<table class='Resume_light_table'>

 					<tr class='Resume_light_header' style="white-space:nowrap;">

-						<td>{$Services_States}</td>

+						<td><strong>{$Services}</strong></td>

 						<td>{$Ok}</td>

 						<td>{$Warning}</td>

 						<td>{$Critical}</td>

Index: www/include/monitoring/status/TopCounter/statusCounter.php

===================================================================

--- www/include/monitoring/status/TopCounter/statusCounter.php	(revision 9417)

+++ www/include/monitoring/status/TopCounter/statusCounter.php	(working copy)

@@ -207,17 +207,23 @@

 		/*

 		 * Create Buffer

 		 */

+		 

+        $total_service = $svc_stat["0"]+$svc_stat["1"]+$svc_stat["2"]+$svc_stat["3"]+$svc_stat["4"];

+        $total_host = $host_stat["0"]+$host_stat["1"]+$host_stat["2"]+$host_stat["3"];

+		 

 		$buffer = new CentreonXML();

 		$buffer->startElement("reponse");

 		$buffer->startElement("infos");

 		$buffer->writeElement("filetime", time());

 		$buffer->endElement();

 		$buffer->startElement("s");

+        $buffer->writeElement("ts", $total_service);

 		$buffer->writeElement("o", $svc_stat["0"]);

 		$buffer->writeElement("w", $svc_stat["1"]);

 		$buffer->writeElement("c", $svc_stat["2"]);

 		$buffer->writeElement("un1", $svc_stat["3"]);

 		$buffer->writeElement("p1", $svc_stat["4"]);

+        $buffer->writeElement("th", $total_host);

 		$buffer->writeElement("up", $host_stat["0"]);

 		$buffer->writeElement("d", $host_stat["1"]);

 		$buffer->writeElement("un2", $host_stat["2"]);

Index: www/include/common/javascript/topCounterStatus/ajaxStatusCounter.js

===================================================================

--- www/include/common/javascript/topCounterStatus/ajaxStatusCounter.js	(revision 9417)

+++ www/include/common/javascript/topCounterStatus/ajaxStatusCounter.js	(working copy)

@@ -52,11 +52,13 @@

 			var stats = reponseC.getElementsByTagName("s");

 			for (var i = 0 ; i < stats.length ; i++) {

 				var stat = stats[i];

+				var _statistic_total_service = stat.getElementsByTagName("ts")[0].firstChild.nodeValue;

 				var _statistic_service_ok = stat.getElementsByTagName("o")[0].firstChild.nodeValue;

 				var _statistic_service_warning = stat.getElementsByTagName("w")[0].firstChild.nodeValue;

 				var _statistic_service_critical = stat.getElementsByTagName("c")[0].firstChild.nodeValue;

 				var _statistic_service_unknown = stat.getElementsByTagName("un1")[0].firstChild.nodeValue;

 				var _statistic_service_pending = stat.getElementsByTagName("p1")[0].firstChild.nodeValue;

+				var _statistic_total_host = stat.getElementsByTagName("th")[0].firstChild.nodeValue;

 				var _statistic_host_up = stat.getElementsByTagName("up")[0].firstChild.nodeValue;

 				var _statistic_host_down = stat.getElementsByTagName("d")[0].firstChild.nodeValue;

 				var _statistic_host_unreachable = stat.getElementsByTagName("un2")[0].firstChild.nodeValue;

@@ -65,6 +67,13 @@

 				/*

 				 * host

 				 */

+				document.getElementById('total_host').innerHTML = '';//_statistic_total_host;

+                var _text_total_host = document.createTextNode(_statistic_total_host);

+                var _link_total_host = document.createElement("a");

+                _link_total_host.href = 'main.php?p=20102&o=h';

+                _link_total_host.appendChild(_text_total_host);

+                document.getElementById('total_host').appendChild(_link_total_host);				 

+				 

 				document.getElementById('host_up').innerHTML = '';//_statistic_host_up;

 				var _text_host_up = document.createTextNode(_statistic_host_up);

 				var _linkHostup = document.createElement("a");

@@ -96,7 +105,12 @@

 				/* 

 				 * svc

 				 */

-				

+				document.getElementById('total_service').innerHTML = '';

+                var _text_total_service = document.createTextNode(_statistic_total_service);

+                var _link_total_service = document.createElement("a");

+                _link_total_service.href = 'main.php?p=20201&o=svc';

+                _link_total_service.appendChild(_text_total_service);

+                document.getElementById('total_service').appendChild(_link_total_service);				

 				// Ok service Stats

 				document.getElementById('service_ok').innerHTML = '';

 				var _text_service_ok = document.createTextNode(_statistic_service_ok);

Index: www/menu/Menu.php

===================================================================

--- www/menu/Menu.php	(revision 9417)

+++ www/menu/Menu.php	(working copy)

@@ -96,8 +96,8 @@

 	$tpl->assign("Up", _("Up"));

 	$tpl->assign("Down", _("Down"));

 	$tpl->assign("Unreachable", _("Unreachable"));

-	$tpl->assign("Hosts_States", _("Host States"));

-	$tpl->assign("Services_States", _("Service States"));

+    $tpl->assign("Hosts", _("Hosts"));

+    $tpl->assign("Services", _("Services"));

 	$tpl->assign("Logout", _("Logout"));

 	$tpl->assign("Help", _("Help"));

 	$tpl->assign("Documentation", _("Documentation"));