Minor changes.

git-svn-id: svn://svn.zabbix.com/trunk@1674 97f52cf1-0a1b-0410-bd0e-c28be96e8082

4 files changed, 26 insertions, 19 deletions

diff --git a/frontends/php/include/html.inc.php b/frontends/php/include/html.inc.php
index a770b2af..d08b895a 100644
--- a/frontends/php/include/html.inc.php
+++ b/frontends/php/include/html.inc.php
@@ -104,4 +104,17 @@
 	{
 		echo "<td $attr>$text</td>";
 	}
+
+	function table_nodata($text="...")
+	{
+		cr();
+		echo "<TABLE BORDER=0 align=center WIDTH=\"100%\" BGCOLOR=\"#CCCCCC\" cellspacing=1 cellpadding=3>";
+		echo "<TR BGCOLOR=\"#DDDDDD\">";
+		echo "<TD ALIGN=CENTER>";
+		echo $text;
+		echo "</TD>";
+		echo "</TR>";
+		echo "</TABLE>";
+		cr();
+	}
 ?>
diff --git a/frontends/php/latest.php b/frontends/php/latest.php
index 9c0b3111..df5489c2 100644
--- a/frontends/php/latest.php
+++ b/frontends/php/latest.php
@@ -331,13 +331,7 @@
 	}
 	else
 	{
-		echo "<TABLE BORDER=0 align=center WIDTH=\"100%\" BGCOLOR=\"#CCCCCC\" cellspacing=1 cellpadding=3>";
-		echo "<TR BGCOLOR=\"#DDDDDD\">";
-		echo "<TD ALIGN=CENTER>";
-		echo "...";
-		echo "</TD>";
-		echo "</TR>";
-		echo "</TABLE>";
+		table_nodata();
 	}
 ?>
 
diff --git a/frontends/php/maps.php b/frontends/php/maps.php
index 3312517b..eeda2555 100644
--- a/frontends/php/maps.php
+++ b/frontends/php/maps.php
@@ -119,9 +119,9 @@
 	show_table_header($map);
 */
 
-	echo "<TABLE BORDER=0 COLS=4 align=center WIDTH=100% BGCOLOR=\"#CCCCCC\" cellspacing=1 cellpadding=3>";
-	echo "<TR BGCOLOR=#EEEEEE>";
-	echo "<TR BGCOLOR=#DDDDDD>";
+	echo "<TABLE BORDER=0 align=center WIDTH=\"100%\" BGCOLOR=\"#CCCCCC\" cellspacing=1 cellpadding=3>";
+	echo "<TR BGCOLOR=\"#EEEEEE\">";
+	echo "<TR BGCOLOR=\"#DDDDDD\">";
 	echo "<TD ALIGN=CENTER>";
 	if(isset($_GET["sysmapid"]))
 	{
diff --git a/frontends/php/overview.php b/frontends/php/overview.php
index 9de75767..08240b2e 100644
--- a/frontends/php/overview.php
+++ b/frontends/php/overview.php
@@ -26,6 +26,12 @@
 ?>
 
 <?php
+	define("SHOW_TRIGGERS",0);
+	define("SHOW_DATA",1);
+?>
+
+
+<?php
         if(!check_anyright("Host","R"))
         {
                 show_table_header("<font color=\"AA0000\">".S_NO_PERMISSIONS."</font>");
@@ -95,7 +101,7 @@
 		$_GET["sort"]="description";
 	}
 
-	if(isset($_GET["groupid"])&&isset($_GET["type"])&&($_GET["type"]==1))
+	if(isset($_GET["groupid"])&&isset($_GET["type"])&&($_GET["type"]==SHOW_DATA))
 	{
 		table_begin();
 		$header=array("&nbsp;");
@@ -162,7 +168,7 @@
 		}
 		table_end();
 	}
-	else if(isset($_GET["groupid"])&&isset($_GET["type"])&&($_GET["type"]==0))
+	else if(isset($_GET["groupid"])&&isset($_GET["type"])&&($_GET["type"]==SHOW_TRIGGERS))
 	{
 		table_begin();
 		$header=array("&nbsp;");
@@ -234,13 +240,7 @@
 	}
 	else
 	{
-		echo "<TABLE BORDER=0 align=center WIDTH=\"100%\" BGCOLOR=\"#CCCCCC\" cellspacing=1 cellpadding=3>";
-		echo "<TR BGCOLOR=\"#DDDDDD\">";
-		echo "<TD ALIGN=CENTER>";
-		echo "...";
-		echo "</TD>";
-		echo "</TR>";
-		echo "</TABLE>";
+		table_nodata();
 	}
 ?>