- Frontend improvements (Eugene)

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

1 files changed, 279 insertions, 252 deletions

diff --git a/frontends/php/screenedit.php b/frontends/php/screenedit.php
index 2e2e4890..f3d11e57 100644
--- a/frontends/php/screenedit.php
+++ b/frontends/php/screenedit.php
@@ -27,312 +27,339 @@
 
 <?php
 	show_table_header(S_CONFIGURATION_OF_SCREEN_BIG);
-	echo BR;
-?>
 
-<?php
-	if(!check_right("Screen","U",$_REQUEST["screenid"]))
+	if(isset($_REQUEST["screenid"]))
 	{
-		show_table_header("<font color=\"AA0000\">".S_NO_PERMISSIONS."</font>");
-		show_page_footer();
-		exit;
-	}
+		echo BR;
 ?>
 
 <?php
-	if(isset($_REQUEST["register"]))
-	{
-		if($_REQUEST["register"]=="add")
+		if(!check_right("Screen","U",$_REQUEST["screenid"]))
 		{
-//			if(isset($_REQUEST["screenitemid"]))
-//			{
-//				delete_screen_item($_REQUEST["screenitemid"]);
-//				unset($_REQUEST["screenitemid"]);
-//			}
-			if(!isset($_REQUEST["elements"]))	$_REQUEST["elements"]=0;
-			$result=add_screen_item($_REQUEST["resource"],$_REQUEST["screenid"],$_REQUEST["x"],$_REQUEST["y"],$_REQUEST["resourceid"],$_REQUEST["width"],$_REQUEST["height"],$_REQUEST["colspan"],$_REQUEST["rowspan"],$_REQUEST["elements"]);
-			unset($_REQUEST["x"]);
-			show_messages($result, S_ITEM_ADDED, S_CANNOT_ADD_ITEM);
+			show_table_header("<font color=\"AA0000\">".S_NO_PERMISSIONS."</font>");
+			show_page_footer();
+			exit;
 		}
-		if($_REQUEST["register"]=="delete")
+
+		if(isset($_REQUEST["register"]))
 		{
-			$result=delete_screen_item($_REQUEST["screenitemid"]);
-			show_messages($result, S_ITEM_DELETED, S_CANNOT_DELETE_ITEM);
-			unset($_REQUEST["x"]);
-		}
-                if($_REQUEST["register"]=="update")
-                {
-			if(!isset($_REQUEST["elements"]))	$_REQUEST["elements"]=0;
-                        $result=update_screen_item($_REQUEST["screenitemid"],$_REQUEST["resource"],$_REQUEST["resourceid"],$_REQUEST["width"],$_REQUEST["height"],$_REQUEST["colspan"],$_REQUEST["rowspan"],$_REQUEST["elements"]);
-                        show_messages($result, S_ITEM_UPDATED, S_CANNOT_UPDATE_ITEM);
-			unset($_REQUEST["x"]);
-                }
-		unset($_REQUEST["register"]);
+			if($_REQUEST["register"]=="add")
+			{
+	//			if(isset($_REQUEST["screenitemid"]))
+	//			{
+	//				delete_screen_item($_REQUEST["screenitemid"]);
+	//				unset($_REQUEST["screenitemid"]);
+	//			}
+				if(!isset($_REQUEST["elements"]))	$_REQUEST["elements"]=0;
 
-	}
+				$result=add_screen_item(
+					$_REQUEST["resource"],$_REQUEST["screenid"],
+					$_REQUEST["x"],$_REQUEST["y"],$_REQUEST["resourceid"],
+					$_REQUEST["width"],$_REQUEST["height"],$_REQUEST["colspan"],
+					$_REQUEST["rowspan"],$_REQUEST["elements"]);
+
+				unset($_REQUEST["x"]);
+				show_messages($result, S_ITEM_ADDED, S_CANNOT_ADD_ITEM);
+			}
+			if($_REQUEST["register"]=="delete")
+			{
+				$result=delete_screen_item($_REQUEST["screenitemid"]);
+				show_messages($result, S_ITEM_DELETED, S_CANNOT_DELETE_ITEM);
+				unset($_REQUEST["x"]);
+			}
+			if($_REQUEST["register"]=="update")
+			{
+				if(!isset($_REQUEST["elements"]))	$_REQUEST["elements"]=0;
+
+				$result=update_screen_item($_REQUEST["screenitemid"],$_REQUEST["resource"],
+					$_REQUEST["resourceid"],$_REQUEST["width"],$_REQUEST["height"],
+					$_REQUEST["colspan"],$_REQUEST["rowspan"],$_REQUEST["elements"]);
+
+				show_messages($result, S_ITEM_UPDATED, S_CANNOT_UPDATE_ITEM);
+				unset($_REQUEST["x"]);
+			}
+			unset($_REQUEST["register"]);
+		}
 ?>
 
 <?php
-	$screenid=$_REQUEST["screenid"];
-	$result=DBselect("select name,cols,rows from screens where screenid=$screenid");
-	$row=DBfetch($result);
-	show_table_header("<a href=\"screenedit.php?screenid=$screenid\">".$row["name"]."</a>");
-	for($r=0;$r<$row["rows"];$r++)
-	{
-		for($c=0;$c<$row["cols"];$c++)
-		{
-			$spancheck[$r][$c]=1;
-		}
-	}
-	for($r=0;$r<$row["rows"];$r++)
-	{
-		for($c=0;$c<$row["cols"];$c++)
+		$screenid=$_REQUEST["screenid"];
+		$result=DBselect("select name,cols,rows from screens where screenid=$screenid");
+		$row=DBfetch($result);
+		show_table_header(new CLink($row["name"],"screenedit.php?screenid=$screenid"));
+		for($r=0;$r<$row["rows"];$r++)
 		{
-			$sql="select * from screens_items where screenid=$screenid and x=$c and y=$r";
-			$iresult=DBSelect($sql);
-			$colspan=0;
-			$rowspan=0;
-			if(DBnum_rows($iresult)>0)
+			for($c=0;$c<$row["cols"];$c++)
 			{
-				$irow=DBfetch($iresult);
-				$colspan=$irow["colspan"];
-				$rowspan=$irow["rowspan"];
+				$spancheck[$r][$c]=1;
 			}
-			for($i=0;$i<$rowspan;$i++)
-				for($j=0;$j<$colspan;$j++)
-					if(($i!=0)||($j!=0))	$spancheck[$r+$i][$c+$j]=0;
-				
 		}
-	}
-
-	echo "<TABLE BORDER=1 COLS=".$row["cols"]." align=center WIDTH=100% BGCOLOR=\"#FFFFFF\">";
-        for($r=0;$r<$row["rows"];$r++)
-	{
-	echo "<TR>";
-	for($c=0;$c<$row["cols"];$c++)
-	{
-		if($spancheck[$r][$c]==0)	continue;
-		
-		$iresult=DBSelect("select * from screens_items where screenid=$screenid and x=$c and y=$r");
-        	if(DBnum_rows($iresult)>0)
-        	{
-        		$irow=DBfetch($iresult);
-        		$screenitemid=$irow["screenitemid"];
-			$resource=$irow["resource"];
-			$resourceid=$irow["resourceid"];
-			$width=$irow["width"];
-			$height=$irow["height"];
-			$colspan=$irow["colspan"];
-			$rowspan=$irow["rowspan"];
-			$elements=$irow["elements"];
-        	}
-		else
+		for($r=0;$r<$row["rows"];$r++)
 		{
-        		$screenitemid=0;
-			$resource=0;
-			$resourceid=0;
-			$width=500;
-			$height=100;
-			$colspan=0;
-			$rowspan=0;
-			$elements=25;
+			for($c=0;$c<$row["cols"];$c++)
+			{
+				$sql="select * from screens_items where screenid=$screenid and x=$c and y=$r";
+				$iresult=DBSelect($sql);
+				$colspan=0;
+				$rowspan=0;
+				if(DBnum_rows($iresult)>0)
+				{
+					$irow=DBfetch($iresult);
+					$colspan=$irow["colspan"];
+					$rowspan=$irow["rowspan"];
+				}
+				for($i=0;$i<$rowspan;$i++)
+					for($j=0;$j<$colspan;$j++)
+						if(($i!=0)||($j!=0))	$spancheck[$r+$i][$c+$j]=0;
+					
+			}
 		}
 
-		$tmp="";
-		if($colspan!=0)
+		$table = new CTable(
+			new CLink("No rows in screen ".$row["name"],"screenconf.php?form=0&screenid=".$screenid),
+			"screen");
+	
+		echo "<TABLE BORDER=1 COLS=".$row["cols"]." align=center WIDTH=100% BGCOLOR=\"#FFFFFF\">";
+		for($r=0;$r<$row["rows"];$r++)
 		{
-			$tmp=$tmp." colspan=\"$colspan\" ";
-			$c=$c+$colspan-1;
-		}
-		if($rowspan!=0)
+		echo "<TR>";
+		$new_cols = array();
+		for($c=0;$c<$row["cols"];$c++)
 		{
-			$tmp=$tmp." rowspan=\"$rowspan\" ";
-#			$r=$r+$rowspan-1;
-		}
 
-		echo "<TD align=\"center\" valign=\"top\" $tmp>\n";
-		echo "<a name=\"form\"></a>";
-		echo "<form method=\"get\" action=\"screenedit.php\">";
+			$item = "ITEM";
 
-		if(isset($_REQUEST["x"])&&($_REQUEST["x"]==$c)&&($_REQUEST["y"]==$r))
-		{
-			$resource=@iif(isset($_REQUEST["resource"]),$_REQUEST["resource"],$resource);
-			$resourceid=@iif(isset($_REQUEST["resourceid"]),$_REQUEST["resourceid"],$resourceid);
-			$screenitemid=@iif(isset($_REQUEST["screenitemid"]),$_REQUEST["screenitemid"],$screenitemid);
-			$width=@iif(isset($_REQUEST["width"]),$_REQUEST["width"],$width);
-			$height=@iif(isset($_REQUEST["height"]),$_REQUEST["height"],$height);
-			$colspan=@iif(isset($_REQUEST["colspan"]),$_REQUEST["colspan"],$colspan);
-			$rowspan=@iif(isset($_REQUEST["rowspan"]),$_REQUEST["rowspan"],$rowspan);
-			$elements=@iif(isset($_REQUEST["elements"]),$_REQUEST["elements"],$elements);
 
-        		show_form_begin("screenedit.cell");
-        		echo S_SCREEN_CELL_CONFIGURATION;
+			if($spancheck[$r][$c]==0)	continue;
+			
+			$iresult=DBSelect("select * from screens_items where screenid=$screenid and x=$c and y=$r");
+			if(DBnum_rows($iresult)>0)
+			{
+				$irow=DBfetch($iresult);
+				$screenitemid=$irow["screenitemid"];
+				$resource=$irow["resource"];
+				$resourceid=$irow["resourceid"];
+				$width=$irow["width"];
+				$height=$irow["height"];
+				$colspan=$irow["colspan"];
+				$rowspan=$irow["rowspan"];
+				$elements=$irow["elements"];
+			}
+			else
+			{
+				$screenitemid=0;
+				$resource=0;
+				$resourceid=0;
+				$width=500;
+				$height=100;
+				$colspan=0;
+				$rowspan=0;
+				$elements=25;
+			}
 
-        		echo "<input name=\"screenid\" type=\"hidden\" value=$screenid>";
-        		echo "<input name=\"screenitemid\" type=\"hidden\" value=$screenitemid>";
-			echo "<input name=\"x\" type=\"hidden\" value=$c>";
-			echo "<input name=\"y\" type=\"hidden\" value=$r>";
-//			echo "<input name=\"resourceid\" type=\"hidden\" value=$resourceid>";
-//			echo "<input name=\"resource\" type=\"hidden\" value='$resource'>";
+			$tmp="";
+			if($colspan!=0)
+			{
+				$tmp=$tmp." colspan=\"$colspan\" ";
+				$c=$c+$colspan-1;
+			}
+			if($rowspan!=0)
+			{
+				$tmp=$tmp." rowspan=\"$rowspan\" ";
+	#			$r=$r+$rowspan-1;
+			}
 
-			show_table2_v_delimiter();
-			echo S_RESOURCE;
-			show_table2_h_delimiter();
-			echo "<select name=\"resource\" size=1 onChange=\"submit()\">";
-			echo "<OPTION VALUE='0' ".iif($resource==0,"selected","").">".S_GRAPH;
-			echo "<OPTION VALUE='1' ".iif($resource==1,"selected","").">".S_SIMPLE_GRAPH;
-			echo "<OPTION VALUE='2' ".iif($resource==2,"selected","").">".S_MAP;
-			echo "<OPTION VALUE='3' ".iif($resource==3,"selected","").">".S_PLAIN_TEXT;
-			echo "</SELECT>";
+			echo "<TD align=\"center\" valign=\"top\" $tmp>\n";
+			echo "<a name=\"form\"></a>";
+			echo "<form method=\"get\" action=\"screenedit.php\">";
 
-// Simple graph
-			if($resource == 1)
+			if(isset($_REQUEST["x"])&&($_REQUEST["x"]==$c)&&($_REQUEST["y"]==$r))
 			{
+				$resource=@iif(isset($_REQUEST["resource"]),$_REQUEST["resource"],$resource);
+				$resourceid=@iif(isset($_REQUEST["resourceid"]),$_REQUEST["resourceid"],$resourceid);
+				$screenitemid=@iif(isset($_REQUEST["screenitemid"]),$_REQUEST["screenitemid"],$screenitemid);
+				$width=@iif(isset($_REQUEST["width"]),$_REQUEST["width"],$width);
+				$height=@iif(isset($_REQUEST["height"]),$_REQUEST["height"],$height);
+				$colspan=@iif(isset($_REQUEST["colspan"]),$_REQUEST["colspan"],$colspan);
+				$rowspan=@iif(isset($_REQUEST["rowspan"]),$_REQUEST["rowspan"],$rowspan);
+				$elements=@iif(isset($_REQUEST["elements"]),$_REQUEST["elements"],$elements);
+
+				show_form_begin("screenedit.cell");
+				echo S_SCREEN_CELL_CONFIGURATION;
+
+				echo "<input name=\"screenid\" type=\"hidden\" value=$screenid>";
+				echo "<input name=\"screenitemid\" type=\"hidden\" value=$screenitemid>";
+				echo "<input name=\"x\" type=\"hidden\" value=$c>";
+				echo "<input name=\"y\" type=\"hidden\" value=$r>";
+	//			echo "<input name=\"resourceid\" type=\"hidden\" value=$resourceid>";
+	//			echo "<input name=\"resource\" type=\"hidden\" value='$resource'>";
+
 				show_table2_v_delimiter();
-				echo nbsp(S_PARAMETER);
+				echo S_RESOURCE;
 				show_table2_h_delimiter();
-				$result=DBselect("select h.host,i.description,i.itemid,i.key_ from hosts h,items i where h.hostid=i.hostid and h.status=".HOST_STATUS_MONITORED." and i.status=0 order by h.host,i.description");
-				echo "<select name=\"resourceid\" size=1>";
-				echo "<OPTION VALUE='0'>(none)";
-				while($row=DBfetch($result))
+				echo "<select name=\"resource\" size=1 onChange=\"submit()\">";
+				echo "<OPTION VALUE='0' ".iif($resource==0,"selected","").">".S_GRAPH;
+				echo "<OPTION VALUE='1' ".iif($resource==1,"selected","").">".S_SIMPLE_GRAPH;
+				echo "<OPTION VALUE='2' ".iif($resource==2,"selected","").">".S_MAP;
+				echo "<OPTION VALUE='3' ".iif($resource==3,"selected","").">".S_PLAIN_TEXT;
+				echo "</SELECT>";
+
+	// Simple graph
+				if($resource == 1)
 				{
-					$host_=$row["host"];
-					$description_=item_description($row["description"],$row["key_"]);
-					$itemid_=$row["itemid"];
-					echo "<OPTION VALUE='$itemid_' ".iif($resourceid==$itemid_,"selected","").">$host_: $description_";
+					show_table2_v_delimiter();
+					echo nbsp(S_PARAMETER);
+					show_table2_h_delimiter();
+					$result=DBselect("select h.host,i.description,i.itemid,i.key_ from hosts h,items i where h.hostid=i.hostid and h.status=".HOST_STATUS_MONITORED." and i.status=0 order by h.host,i.description");
+					echo "<select name=\"resourceid\" size=1>";
+					echo "<OPTION VALUE='0'>(none)";
+					while($row=DBfetch($result))
+					{
+						$host_=$row["host"];
+						$description_=item_description($row["description"],$row["key_"]);
+						$itemid_=$row["itemid"];
+						echo "<OPTION VALUE='$itemid_' ".iif($resourceid==$itemid_,"selected","").">$host_: $description_";
+					}
+					echo "</SELECT>";
 				}
-				echo "</SELECT>";
-			}
-// Plain text
-			else if($resource == 3)
-			{
-				show_table2_v_delimiter();
-				echo nbsp(S_PARAMETER);
-				show_table2_h_delimiter();
-				$result=DBselect("select h.host,i.description,i.itemid,i.key_ from hosts h,items i where h.hostid=i.hostid and h.status=".HOST_STATUS_MONITORED." and i.status=0 order by h.host,i.description");
-				echo "<select name=\"resourceid\" size=1>";
-				echo "<OPTION VALUE='0'>(none)";
-				while($row=DBfetch($result))
+	// Plain text
+				else if($resource == 3)
 				{
-					$host_=$row["host"];
-					$description_=item_description($row["description"],$row["key_"]);
-					$itemid_=$row["itemid"];
-					echo "<OPTION VALUE='$itemid_' ".iif($resourceid==$itemid_,"selected","").">$host_: $description_";
+					show_table2_v_delimiter();
+					echo nbsp(S_PARAMETER);
+					show_table2_h_delimiter();
+					$result=DBselect("select h.host,i.description,i.itemid,i.key_ from hosts h,items i where h.hostid=i.hostid and h.status=".HOST_STATUS_MONITORED." and i.status=0 order by h.host,i.description");
+					echo "<select name=\"resourceid\" size=1>";
+					echo "<OPTION VALUE='0'>(none)";
+					while($row=DBfetch($result))
+					{
+						$host_=$row["host"];
+						$description_=item_description($row["description"],$row["key_"]);
+						$itemid_=$row["itemid"];
+						echo "<OPTION VALUE='$itemid_' ".iif($resourceid==$itemid_,"selected","").">$host_: $description_";
+					}
+					echo "</SELECT>";
+
+					show_table2_v_delimiter();
+					echo nbsp(S_SHOW_LINES);
+					show_table2_h_delimiter();
+					echo "<input class=\"biginput\" name=\"elements\" size=2 value=\"$elements\">";
+				}
+	// User-defined graph
+				else if($resource == 0)
+				{
+					show_table2_v_delimiter();
+					echo nbsp(S_GRAPH_NAME);
+					show_table2_h_delimiter();
+					$result=DBselect("select graphid,name from graphs order by name");
+					echo "<select name=\"resourceid\" size=1>";
+					echo "<OPTION VALUE='0'>(none)";
+					while($row=DBfetch($result))
+					{
+						$name_=$row["name"];
+						$graphid_=$row["graphid"];
+						echo "<OPTION VALUE='$graphid_' ".iif($resourceid==$graphid_,"selected","").">$name_";
+					}
+					echo "</SELECT>";
+				}
+	// Map
+				else if($resource == 2)
+				{
+					show_table2_v_delimiter();
+					echo S_MAP;
+					show_table2_h_delimiter();
+					$result=DBselect("select sysmapid,name from sysmaps order by name");
+					echo "<select name=\"resourceid\" size=1>";
+					echo "<OPTION VALUE='0'>(none)";
+					while($row=DBfetch($result))
+					{
+						$name_=$row["name"];
+						$sysmapid_=$row["sysmapid"];
+						echo "<OPTION VALUE='$sysmapid_' ".iif($resourceid==$sysmapid_,"selected","").">$name_";
+					}
+					echo "</SELECT>";
+				}
+				else
+				{
+					echo "<input class=\"biginput\" name=\"resourceid\" type=\"hidden\" size=1 value=\"$resourceid\">";
+				}
+
+				if($resource!=2)
+				{
+					show_table2_v_delimiter();
+					echo S_WIDTH;
+					show_table2_h_delimiter();
+					echo "<input class=\"biginput\" name=\"width\" size=5 value=\"$width\">";
+					show_table2_v_delimiter();
+					echo S_HEIGHT;
+					show_table2_h_delimiter();
+					echo "<input class=\"biginput\" name=\"height\" size=5 value=\"$height\">";
+				}
+				else
+				{
+					echo "<input class=\"biginput\" name=\"width\" type=\"hidden\" size=5 value=\"$width\">";
+					echo "<input class=\"biginput\" name=\"height\" type=\"hidden\" size=5 value=\"$height\">";
 				}
-				echo "</SELECT>";
 
 				show_table2_v_delimiter();
-				echo nbsp(S_SHOW_LINES);
+				echo S_COLUMN_SPAN;
 				show_table2_h_delimiter();
-				echo "<input class=\"biginput\" name=\"elements\" size=2 value=\"$elements\">";
-			}
-// User-defined graph
-			else if($resource == 0)
-			{
+				echo "<input class=\"biginput\" name=\"colspan\" size=2 value=\"$colspan\">";
+
 				show_table2_v_delimiter();
-				echo nbsp(S_GRAPH_NAME);
+				echo S_ROW_SPAN;
 				show_table2_h_delimiter();
-				$result=DBselect("select graphid,name from graphs order by name");
-				echo "<select name=\"resourceid\" size=1>";
-				echo "<OPTION VALUE='0'>(none)";
-				while($row=DBfetch($result))
-				{
-					$name_=$row["name"];
-					$graphid_=$row["graphid"];
-					echo "<OPTION VALUE='$graphid_' ".iif($resourceid==$graphid_,"selected","").">$name_";
+				echo "<input class=\"biginput\" name=\"rowspan\" size=2 value=\"$rowspan\">";
+
+				show_table2_v_delimiter2();
+				echo "<input class=\"button\" type=\"submit\" name=\"register\" value=\"add\">";
+				if($resourceid!=0) 
+				{ 
+					echo "<input class=\"button\" type=\"submit\" name=\"register\" value=\"update\">";
 				}
-				echo "</SELECT>";
+				echo "<input class=\"button\" type=\"submit\" name=\"register\" value=\"delete\">";
+
+				show_table2_header_end();
 			}
-// Map
-			else if($resource == 2)
+			else if( ($screenitemid!=0) && ($resource==0) )
 			{
-				show_table2_v_delimiter();
-				echo S_MAP;
-				show_table2_h_delimiter();
-				$result=DBselect("select sysmapid,name from sysmaps order by name");
-				echo "<select name=\"resourceid\" size=1>";
-				echo "<OPTION VALUE='0'>(none)";
-				while($row=DBfetch($result))
-				{
-					$name_=$row["name"];
-					$sysmapid_=$row["sysmapid"];
-					echo "<OPTION VALUE='$sysmapid_' ".iif($resourceid==$sysmapid_,"selected","").">$name_";
-				}
-				echo "</SELECT>";
+				echo "<a href=screenedit.php?register=edit&screenid=$screenid&x=$c&y=$r><img src='chart2.php?graphid=$resourceid&width=$width&height=$height&period=3600' border=0></a>";
 			}
-			else
+			else if( ($screenitemid!=0) && ($resource==1) )
 			{
-				echo "<input class=\"biginput\" name=\"resourceid\" type=\"hidden\" size=1 value=\"$resourceid\">";
+				echo "<a href=screenedit.php?register=edit&screenid=$screenid&x=$c&y=$r><img src='chart.php?itemid=$resourceid&width=$width&height=$height&period=3600' border=0></a>";
 			}
-
-			if($resource!=2)
+			else if( ($screenitemid!=0) && ($resource==2) )
 			{
-				show_table2_v_delimiter();
-				echo S_WIDTH;
-				show_table2_h_delimiter();
-				echo "<input class=\"biginput\" name=\"width\" size=5 value=\"$width\">";
-				show_table2_v_delimiter();
-				echo S_HEIGHT;
-				show_table2_h_delimiter();
-				echo "<input class=\"biginput\" name=\"height\" size=5 value=\"$height\">";
+				echo "<a href=screenedit.php?register=edit&screenid=$screenid&x=$c&y=$r><img src='map.php?noedit=1&sysmapid=$resourceid&width=$width&height=$height&period=3600' border=0></a>";
 			}
-			else
+			else if( ($screenitemid!=0) && ($resource==3) )
 			{
-				echo "<input class=\"biginput\" name=\"width\" type=\"hidden\" size=5 value=\"$width\">";
-				echo "<input class=\"biginput\" name=\"height\" type=\"hidden\" size=5 value=\"$height\">";
+				show_screen_plaintext($resourceid,$elements);
+				echo "<p align=center>";
+				echo "<a href=screenedit.php?register=edit&screenid=$screenid&x=$c&y=$r>".S_CHANGE."</a>";
 			}
-
-			show_table2_v_delimiter();
-			echo S_COLUMN_SPAN;
-			show_table2_h_delimiter();
-			echo "<input class=\"biginput\" name=\"colspan\" size=2 value=\"$colspan\">";
-
-			show_table2_v_delimiter();
-			echo S_ROW_SPAN;
-			show_table2_h_delimiter();
-			echo "<input class=\"biginput\" name=\"rowspan\" size=2 value=\"$rowspan\">";
-
-			show_table2_v_delimiter2();
-			echo "<input class=\"button\" type=\"submit\" name=\"register\" value=\"add\">";
-			if($resourceid!=0) 
-			{ 
-				echo "<input class=\"button\" type=\"submit\" name=\"register\" value=\"update\">";
+			else
+			{
+				echo "<a href=screenedit.php?register=edit&screenid=$screenid&x=$c&y=$r>".S_EMPTY."</a>";
 			}
-			echo "<input class=\"button\" type=\"submit\" name=\"register\" value=\"delete\">";
-
-			show_table2_header_end();
-		}
-		else if( ($screenitemid!=0) && ($resource==0) )
-		{
-			echo "<a href=screenedit.php?register=edit&screenid=$screenid&x=$c&y=$r><img src='chart2.php?graphid=$resourceid&width=$width&height=$height&period=3600' border=0></a>";
-		}
-		else if( ($screenitemid!=0) && ($resource==1) )
-		{
-			echo "<a href=screenedit.php?register=edit&screenid=$screenid&x=$c&y=$r><img src='chart.php?itemid=$resourceid&width=$width&height=$height&period=3600' border=0></a>";
-		}
-		else if( ($screenitemid!=0) && ($resource==2) )
-		{
-			echo "<a href=screenedit.php?register=edit&screenid=$screenid&x=$c&y=$r><img src='map.php?noedit=1&sysmapid=$resourceid&width=$width&height=$height&period=3600' border=0></a>";
-		}
-		else if( ($screenitemid!=0) && ($resource==3) )
-		{
-			show_screen_plaintext($resourceid,$elements);
-			echo "<p align=center>";
-			echo "<a href=screenedit.php?register=edit&screenid=$screenid&x=$c&y=$r>".S_CHANGE."</a>";
+			echo "</form>\n";
+		
+			echo "</TD>";
+			
+			$form = new CForm("screenedit.php");
+			$form->AddItem($item);
+			array_push($new_cols, new CCol($form,"screen"));
 		}
-		else
-		{
-			echo "<a href=screenedit.php?register=edit&screenid=$screenid&x=$c&y=$r>".S_EMPTY."</a>";
+		echo "</TR>\n";
+		$table->AddRow(new CRow($new_cols));
 		}
-		echo "</form>\n";
-        
-		echo "</TD>";
-        }
-        echo "</TR>\n";
-        }
-        echo "</TABLE>";
+		echo "</TABLE>";
 
+		echo BR;
 
+		$table->Show();
+	}
 ?>
 
 <?php