From bb776bd6809de09f42f8ef5f930b9033a30ef8d7 Mon Sep 17 00:00:00 2001
From: hugetoad <hugetoad@97f52cf1-0a1b-0410-bd0e-c28be96e8082>
Date: Wed, 29 Sep 2004 10:48:52 +0000
Subject: Frentend improvements.

git-svn-id: svn://svn.zabbix.com/trunk@1442 97f52cf1-0a1b-0410-bd0e-c28be96e8082
---
 frontends/php/graphs.php     | 27 ++++++++++-----------------
 frontends/php/screenconf.php | 28 ++++++++++------------------
 2 files changed, 20 insertions(+), 35 deletions(-)

(limited to 'frontends/php')

diff --git a/frontends/php/graphs.php b/frontends/php/graphs.php
index 49472e95..0512bd80 100644
--- a/frontends/php/graphs.php
+++ b/frontends/php/graphs.php
@@ -78,14 +78,8 @@
 
 <?php
 	show_table_header("GRAPHS");
-	echo "<TABLE BORDER=0 COLS=4 WIDTH=100% BGCOLOR=\"#AAAAAA\" cellspacing=1 cellpadding=3>";
-	echo "<TR BGCOLOR=\"#CCCCCC\">";
-	echo "<TD WIDTH=5% NOSAVE><B>".S_ID."</B></TD>";
-	echo "<TD><B>".S_NAME."</B></TD>";
-	echo "<TD WIDTH=5% NOSAVE><B>".S_WIDTH."</B></TD>";
-	echo "<TD WIDTH=5% NOSAVE><B>".S_HEIGHT."</B></TD>";
-	echo "<TD WIDTH=10% NOSAVE><B>".S_ACTIONS."</B></TD>";
-	echo "</TR>";
+	table_begin();
+	table_header(array(S_ID,S_NAME,S_WIDTH,S_HEIGHT,S_ACTIONS));
 
 	$result=DBselect("select g.graphid,g.name,g.width,g.height from graphs g order by g.name");
 	$col=0;
@@ -95,15 +89,14 @@
 		{
 			continue;
 		}
-		if($col++%2==0)	{ echo "<TR BGCOLOR=#EEEEEE>"; }
-		else		{ echo "<TR BGCOLOR=#DDDDDD>"; }
 	
-		echo "<TD>".$row["graphid"]."</TD>";
-		echo "<TD><a href=\"graph.php?graphid=".$row["graphid"]."\">".$row["name"]."</a></TD>";
-		echo "<TD>".$row["width"]."</TD>";
-		echo "<TD>".$row["height"]."</TD>";
-		echo "<TD><A HREF=\"graphs.php?graphid=".$row["graphid"]."#form\">Change</A></TD>";
-		echo "</TR>";
+		table_row(array(
+			$row["graphid"],
+			"<a href=\"graph.php?graphid=".$row["graphid"]."\">".$row["name"]."</a>",
+			$row["width"],
+			$row["height"],
+			"<A HREF=\"graphs.php?graphid=".$row["graphid"]."#form\">Change</A>"
+			),$col++);
 	}
 	if(DBnum_rows($result)==0)
 	{
@@ -111,7 +104,7 @@
 		echo "<TD COLSPAN=5 ALIGN=CENTER>".S_NO_GRAPHS_DEFINED."</TD>";
 		echo "<TR>";
 	}
-	echo "</TABLE>";
+	table_end();
 ?>
 
 <?php
diff --git a/frontends/php/screenconf.php b/frontends/php/screenconf.php
index e00ff0c8..ee8d36b8 100644
--- a/frontends/php/screenconf.php
+++ b/frontends/php/screenconf.php
@@ -64,14 +64,8 @@
 
 <?php
 	show_table_header("SCREENS");
-	echo "<TABLE BORDER=0 COLS=4 WIDTH=100% BGCOLOR=\"#AAAAAA\" cellspacing=1 cellpadding=3>";
-	echo "<TR BGCOLOR=\"#CCCCCC\">";
-	echo "<TD WIDTH=5% NOSAVE><B>".S_ID."</B></TD>";
-	echo "<TD><B>".S_NAME."</B></TD>";
-	echo "<TD WIDTH=5% NOSAVE><B>".S_COLUMNS."</B></TD>";
-	echo "<TD WIDTH=5% NOSAVE><B>".S_ROWS."</B></TD>";
-	echo "<TD WIDTH=10% NOSAVE><B>".S_ACTIONS."</B></TD>";
-	echo "</TR>";
+	table_begin();
+	table_header(array(S_ID,S_NAME,S_COLUMNS,S_ROWS,S_ACTIONS));
 
 	$result=DBselect("select screenid,name,cols,rows from screens order by name");
 	$col=0;
@@ -81,15 +75,13 @@
 		{
 			continue;
 		}
-		if($col++%2==0)	{ echo "<TR BGCOLOR=#EEEEEE>"; }
-		else		{ echo "<TR BGCOLOR=#DDDDDD>"; }
-	
-		echo "<TD>".$row["screenid"]."</TD>";
-		echo "<TD><a href=\"screenedit.php?screenid=".$row["screenid"]."\">".$row["name"]."</a></TD>";
-		echo "<TD>".$row["cols"]."</TD>";
-		echo "<TD>".$row["rows"]."</TD>";
-		echo "<TD><A HREF=\"screenconf.php?screenid=".$row["screenid"]."#form\">".S_CHANGE."</A></TD>";
-		echo "</TR>";
+		table_row(array(
+			$row["screenid"],
+			"<a href=\"screenedit.php?screenid=".$row["screenid"]."\">".$row["name"]."</a>",
+			$row["cols"],
+			$row["rows"],
+			"<A HREF=\"screenconf.php?screenid=".$row["screenid"]."#form\">".S_CHANGE."</A>"
+			),$col++);
 	}
 	if(DBnum_rows($result)==0)
 	{
@@ -97,7 +89,7 @@
 			echo "<TD COLSPAN=5 ALIGN=CENTER>".S_NO_SCREENS_DEFINED."</TD>";
 			echo "<TR>";
 	}
-	echo "</TABLE>";
+	table_end();
 ?>
 
 <?php
-- 
cgit