From 6f4bda3bdb16f93c715b0236101a131867ba9dd3 Mon Sep 17 00:00:00 2001
From: raulmateos <noreply@pandorafms.org>
Date: Sun, 29 Apr 2007 13:19:45 +0000
Subject: [PATCH] 2007-04-29  Raul Mateos  <raulofpandora@gmail.com>

	* images/recon.png: Renamed file from chart_organization.png

	* include/pandora.css: Added styles for table in servers.

	* operation/servers/view_server.php: Used style added. Change order
	for table (now the legend is shown only if there are servers)

git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@445 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
---
 pandora_console/ChangeLog                     |   9 ++++
 .../{chart_organisation.png => recon.png}     | Bin
 pandora_console/include/styles/pandora.css    |  19 +++++++-
 .../operation/servers/view_server.php         |  43 +++++++++++-------
 4 files changed, 53 insertions(+), 18 deletions(-)
 rename pandora_console/images/{chart_organisation.png => recon.png} (100%)
 mode change 100644 => 100755

diff --git a/pandora_console/ChangeLog b/pandora_console/ChangeLog
index 889d2f38a6..7b2ae29ad1 100644
--- a/pandora_console/ChangeLog
+++ b/pandora_console/ChangeLog
@@ -1,3 +1,12 @@
+2007-04-29  Raul Mateos  <raulofpandora@gmail.com>
+
+	* images/recon.png: Renamed file from chart_organization.png
+
+	* include/pandora.css: Added styles for table in servers.
+
+	* operation/servers/view_server.php: Used style added. Change order
+	for table (now the legend is shown only if there are servers).
+
 2007-04-24  Raul Mateos  <raulofpandora@gmail.com>
 
 	* install.php: Changed typo in installation text. Homogenize boxes.
diff --git a/pandora_console/images/chart_organisation.png b/pandora_console/images/recon.png
old mode 100644
new mode 100755
similarity index 100%
rename from pandora_console/images/chart_organisation.png
rename to pandora_console/images/recon.png
diff --git a/pandora_console/include/styles/pandora.css b/pandora_console/include/styles/pandora.css
index 9cf1fa13c6..95c558a29f 100644
--- a/pandora_console/include/styles/pandora.css
+++ b/pandora_console/include/styles/pandora.css
@@ -542,7 +542,6 @@ div.data_box {
 	text-decoration: none;
 }
 
-
 span.users {
 	background: url(../../images/group.png) no-repeat;
 }
@@ -558,7 +557,23 @@ span.alerts {
 span.time {
 	background: url(../../images/hourglass.png) no-repeat;
 }
-span.users, span.agents, span.data, span.alerts, span.time {
+span.net {
+	background: url(../../images/network.gif) no-repeat;
+}
+span.master {
+	background: url(../../images/master.gif) no-repeat;
+}
+span.snmp {
+	background: url(../../images/snmp.gif) no-repeat;
+}
+span.binary {
+	background: url(../../images/binary.gif) no-repeat;
+}
+span.recon {
+	background: url(../../images/recon.png) no-repeat;
+}
+span.users, span.agents, span.data, span.alerts, span.time, span.net,
+span.master, span.snmp, span.binary, span.recon {
 	margin-left: 4px;
 	margin-top: 10px;
 	padding: 4px 8px 12px 30px;
diff --git a/pandora_console/operation/servers/view_server.php b/pandora_console/operation/servers/view_server.php
index a41d10857b..fe3cab0398 100644
--- a/pandora_console/operation/servers/view_server.php
+++ b/pandora_console/operation/servers/view_server.php
@@ -221,7 +221,7 @@ if (comprueba_login() == 0) {
 				echo "&nbsp; <img src='images/snmp.gif'>";
 			}
 			if ($recon_server == 1){
-				echo "&nbsp; <img src='images/chart_organisation.png'>";
+				echo "&nbsp; <img src='images/recon.png'>";
 			}
 			if ($master == 1){
 				echo "&nbsp; <img src='images/master.gif'>";
@@ -238,7 +238,31 @@ if (comprueba_login() == 0) {
 			// if ($status ==0)
 				echo substr($keepalive,0,25)."</td>";
 		}
-		echo '<tr><td colspan="11"><div class="raya"></div></td></tr></table>';	
+		echo '<tr><td colspan="11"><div class="raya"></div>
+		</td></tr></table>';
+		echo "<table cellpadding=2 cellspacing=0>";
+		echo "
+		<tr>
+		 <td>
+		  <span class='net'>".$lang_label["network_server"]."</span>
+		 </td>
+		 <td>
+		  <span class='master'>".$lang_label["master"]."</span>
+		 </td>
+		 <td>
+		  <span class='data'>".$lang_label["data_server"]."</span>
+		 </td>
+		 <td>
+		  <span class='binary'>".$lang_label["md5_checksum"]."</span>
+		 </td>
+		 <td>
+		  <span class='snmp'>".$lang_label["snmp_console"]."</span>
+		 </td>
+		 <td>
+		  <span class='recon'>".$lang_label["recon_server"]."</span>
+		 </td>
+		</tr>";
+		echo "</table>";
 	} else {
 		echo "<div class='nf'>".$lang_label["no_server"]."</div>";
 	}
@@ -247,19 +271,6 @@ if (comprueba_login() == 0) {
 	audit_db($id_user,$REMOTE_ADDR, "ACL Violation","Trying to access Agent view");
 		require ("general/noaccess.php");
 	}
-	echo "<table cellpadding=4 cellspacing=4>";
-	echo "<tr><td>";
-	echo "<img src='images/network.gif'><td>".$lang_label["network_server"];
-	echo "<td>";
-	echo "<img src='images/master.gif'><td>".$lang_label["master"];
-	echo "<td>";
-	echo "<img src='images/data.gif'><td>".$lang_label["data_server"];
-	echo "<td>";
-	echo "<img src='images/binary.gif'><td>".$lang_label["md5_checksum"];
-	echo "<td>";
-	echo "<img src='images/snmp.gif'><td>".$lang_label["snmp_console"];
-	echo "<td>";
-	echo "<img src='images/chart_organisation.png'><td>".$lang_label["recon_server"];
-	echo "</table>";
+
 }
 ?>