From 2e9e02509678a664ccf51b0332436f1f7581fd62 Mon Sep 17 00:00:00 2001
From: raulmateos <noreply@pandorafms.org>
Date: Wed, 9 Dec 2009 11:35:52 +0000
Subject: [PATCH] 2009-12-09  Raul Mateos  <raulofpandora@gmail.com>

	* godmode/db/db_info.php: Added icon to download database info.

	* include/style/tip.css: Removed unused style. Still help style is in
	the file. Not removed, maybe used some day...

	* operation/agentes/estado_grupo.php: Added colours to the numbers.
	Added the text "modules".

git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@2183 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
---
 pandora_console/ChangeLog                     | 10 ++++
 pandora_console/godmode/db/db_info.php        |  2 +-
 pandora_console/include/styles/tip.css        | 49 +++----------------
 .../operation/agentes/estado_grupo.php        | 45 ++++++++---------
 4 files changed, 38 insertions(+), 68 deletions(-)

diff --git a/pandora_console/ChangeLog b/pandora_console/ChangeLog
index 28dab8f038..871eb7d9c0 100644
--- a/pandora_console/ChangeLog
+++ b/pandora_console/ChangeLog
@@ -1,3 +1,13 @@
+2009-12-09  Raul Mateos  <raulofpandora@gmail.com>
+
+	* godmode/db/db_info.php: Added icon to download database info.
+
+	* include/style/tip.css: Removed unused style. Still help style is in
+	the file. Not removed, maybe used some day...
+
+	* operation/agentes/estado_grupo.php: Added colours to the numbers.
+	Added the text "modules".
+
 2009-12-09  Raul Mateos  <raulofpandora@gmail.com>
 
 	* include/fgraph2.php: Deleted test file, never used. Will ezComponents
diff --git a/pandora_console/godmode/db/db_info.php b/pandora_console/godmode/db/db_info.php
index b81a62c4fe..04604f9750 100644
--- a/pandora_console/godmode/db/db_info.php
+++ b/pandora_console/godmode/db/db_info.php
@@ -59,7 +59,7 @@ if ($config['flash_charts']) {
 	echo '<img src="include/fgraph.php?tipo=db_agente_paquetes&width=600&height=200"><br />';
 }
 echo '</table>';
-echo '<a href="#" onClick="toggleDiv(\'db_info_data\'); toggleDiv(\'db_info_graph\'); return false;">'.__('Press here to get database information as text').'</a></div>';
+echo '<a href="#" onClick="toggleDiv(\'db_info_data\'); toggleDiv(\'db_info_graph\'); return false;"><b>'.__('Press here to get database information as text').'</b>&nbsp;<img src="images/down.png" alt="down" title="down"></a></div>';
 echo '<div id="db_info_data" style="display:none">';
 
 //Merged from db_info_data.php because the queries are the same, so the cache
diff --git a/pandora_console/include/styles/tip.css b/pandora_console/include/styles/tip.css
index 541e4ca1ed..767a1c4156 100644
--- a/pandora_console/include/styles/tip.css
+++ b/pandora_console/include/styles/tip.css
@@ -1,13 +1,8 @@
-a.tip, a.tip2, a.tipp {
+a.tip {
 	cursor: help;
 	background: url(../../images/tip.png) no-repeat;
-}
-a.tip , a.tip2 {
 	padding: 5px 2px 5px 12px;
 }
-a.tipp {
-	padding: 2px 2px 2px 12px;
-}
 a.help {
 	cursor: help;
 	background: url(../../images/help2.png) no-repeat;
@@ -18,41 +13,21 @@ a.help {
 a.info {
 	padding: 25px 0px 0px 0px;
 }
-
-a.info_table { 
-    padding: 25px 0px 0px 0px;
-    margin: -50px 0px 0px 0px;
-}
-
-a.info2 {
-	padding: 2px 0px 0px 0px;
-}
-
-a.tip, a.tip2, a.tipp, a.help , a.info, a.info2, a.info_table {
+a.tip, a.help , a.info {
 	position: relative;
 	text-decoration: none;
 }
 a.tip:hover {
 	text-decoration: none;
-	background-color: #f9f9f9;
+	background-color: #efefef;
 }
-a.tip2:hover {
-	text-decoration: none;
-/*	background-color: #e6e9cd;*/
-	background-color: #efefef
-}
-a.tipp:hover {
-	text-decoration: none;
-	background-color: #778866;
-}
-a.info:hover, a.info2:hover, a.help:hover, a.info_table:hover {
+a.info:hover, a.help:hover {
 	text-decoration: none;
 }
-a.tip span, a.tip2 span, a.tipp span, a.info span, a.info2 span, a.help span, a.info_table span {
+a.tip span, a.info span, a.help span {
 	display: none;
 }
-a.tip:hover span, a.tip2:hover span,a.tipp:hover span, a.info:hover span, 
-a.info2:hover span, a.help:hover span, a.info_table:hover span {
+a.tip:hover span, a.info:hover span, a.help:hover span {
 	display: block;
 	text-decoration: none;
 	position: absolute;
@@ -66,15 +41,6 @@ a.info2:hover span, a.help:hover span, a.info_table:hover span {
 	padding: 2px;
 }
 
-a.info_table:hover span{
-    width: 1px;
-    height: 1px;
-    left: -140px;
-    top: 50px;
-    background-color: #fff;
-    border: 0px solid #fff;
-}
-
 a.info:hover span {
 	top: 45px;
 	left: 20px;
@@ -82,9 +48,6 @@ a.info:hover span {
 	background-color: #ffffff;
 	border: 1px solid #aaaaaa;
 }
-a.info2:hover span {
-	top: 8px;
-}
 a.help:hover span {
 	top: 15px;
 	width: 80px;
diff --git a/pandora_console/operation/agentes/estado_grupo.php b/pandora_console/operation/agentes/estado_grupo.php
index a1e01812e9..28dd5e24c6 100644
--- a/pandora_console/operation/agentes/estado_grupo.php
+++ b/pandora_console/operation/agentes/estado_grupo.php
@@ -186,23 +186,23 @@ for ($table = 0; $table < $ancho; $table++) {
 		}
 		
 		// By default green border
-		$celda = '<td class="top" style="border: 5px solid #aeff21;" width="100">';
+		$celda = '<td class="top" style="border: 5px solid #8ae234;" width="100">';
 		
 		// Grey border if agent down
 		if ($group_info["down"] > 0)
-			$celda = '<td class="top" style="border: 5px solid #aabbaa;" width="100">';
+			$celda = '<td class="top" style="border: 5px solid #aaa;" width="100">';
 		
 		// Yellow border if agents WARNING
 		if ($group_info["warning"] > 0)
-			$celda = '<td class="top" style="border: 5px solid #FFD800;" width="100">';
+			$celda = '<td class="top" style="border: 5px solid #ffb900;" width="100">';
 		
 		// Red border if agents CRITICAL
 		if ($group_info["critical"] > 0)
-			$celda = '<td class="top" style="border: 5px solid #FF0000;" width="100">';
+			$celda = '<td class="top" style="border: 5px solid #c00;" width="100">';
 		
 		// Magenta border if agents with alerts
 		if ($group_info["alerts"] > 0)
-			$celda = '<td class="top" style="border: 5px solid #F200FF;" width="100">';
+			$celda = '<td class="top" style="border: 5px solid #f200ff;" width="100">';
 		
 		// Black if alerts and down modules
 		if (($group_info["critical"] > 0) && ($group_info["alerts"] > 0))
@@ -214,25 +214,22 @@ for ($table = 0; $table < $ancho; $table++) {
 		$celda .= '<img class="top" src="images/groups_small/'.$icono_grupo.'.png" height="32" width="32" alt="" />';
 		
 		// Add float info table
-		$celda .= '<span><table cellspacing="0" cellpadding="0" style="margin-left:2px; background: #ffffff;">
-					<tr><th colspan="2" width="140">'.__('Agents').':</th></tr>
-					<tr><td colspan="2" class="datos" align="center"><b>'.$group_info["agent"].'</b></td></tr>
-				</table>
-				<table cellspacing="0" cellpadding="2" style="margin-left:2px">
-					
-					<tr><td class="datos"><img src="images/b_green.png" align="top" alt="" />'.__('Normal').'</td>
-					<td class="datos"><b>'.format_for_graph ($group_info["normal"] , 1).'</b></td></tr>
-					<tr><td class="datos"><img src="images/b_yellow.png" align="top" alt="" />'.__('Warning').'</td>
-					<td class="datos"><b>'.format_for_graph ($group_info["warning"] , 1).'</b></td></tr>
-					<tr><td class="datos"><img src="images/b_red.png" align="top" alt="" />'.__('Critical').'</td>
-					<td class="datos"><b>'.format_for_graph ($group_info["critical"] , 1).'</b></td></tr>';
-		
-			$celda .= '<tr><td class="datos"><img src="images/b_white.png" align="top" alt="" />'.__('Down').'</td>
-				<td class="datos"><b>'.format_for_graph ($group_info["down"] , 1).'</b></td></tr>';
-		
-			$celda .= '<tr><td class="datos"><img src="images/b_magenta.png" align="top" alt="" />'.__('Alerts').'</td>
-				<td class="datos"><b>'.$group_info["alerts"].'</b></td></tr>';
-		
+		$celda .= '<span><table cellspacing="1" cellpadding="1" style="margin-left:2px; background: #ffffff;">
+				<tr><th colspan="2" width="140">'.__('Agents').": ".$group_info["agent"].'</th></tr>
+				<tr class="datos2"><td class="datos2" colspan="2"><b>'.__('Modules').'</b></td>
+				<tr><td class="datos"><img src="images/b_red.png" align="top" alt="" />'.__('Critical').'</td>
+				<td class="datos"><b><font color="#c00">'.format_for_graph ($group_info["critical"] , 1).'</font></b></td></tr>
+				<tr><td class="datos"><img src="images/b_yellow.png" align="top" alt="" />'.__('Warning').'</td>
+				<td class="datos"><b><font color="#ffb900">'.format_for_graph ($group_info["warning"] , 1).'</font></b></td></tr>
+				<tr><td class="datos"><img src="images/b_green.png" align="top" alt="" />'.__('Normal').'</td>
+				<td class="datos"><b><font color="#8ae234">'.format_for_graph ($group_info["normal"] , 1).'</font></b></td></tr>';
+
+		$celda .= '<tr><td class="datos"><img src="images/b_white.png" align="top" alt="" />'.__('Down').'</td>
+			<td class="datos"><b><font color="#aaa">'.format_for_graph ($group_info["down"] , 1).'</font></b></td></tr>';
+
+		$celda .= '<tr><td class="datos"><img src="images/b_magenta.png" align="top" alt="" />'.__('Alerts').'</td>
+			<td class="datos"><b><font color="#ef2929">'.$group_info["alerts"].'</font></b></td></tr>';
+
 		$celda .= "</table></span></a>";
 		
 		// Render network exec module button, only when this group is writtable by user