- added "Data overview" for screens

 - added "Triggers overview" for screens (Eugene)
 - added blinking into Trigger overview (Eugene)
 - added screen displaying in other screen (Eugene)
 - improved Overview table header, vertical text added (Eugene)
 - developed "ZABBIX Clock" module for screens (Eugene)
 - developed "ZABBIX server info" module for screens (Eugene)
 - developed "Triggers info" module for screens (Eugene)
 - developed "Host info" module for screens (Eugene)
 - improved screens displaying, added item alignment (Eugene)
 - improved ZABBIX server report (Eugene)
 - improved images configuration (Eugene)
 - added onserver image resizing for thumbs by php (Eugene)
 - developed acknowledges system (Eugene)
 - added icons displaying for maps (Eugene)
 - added maps displaying for maps (Eugene)
 - improved maps (Eugene)


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

1 files changed, 7 insertions, 141 deletions

diff --git a/frontends/php/screenedit.php b/frontends/php/screenedit.php
index 3c6d2d52..0ce45d8c 100644
--- a/frontends/php/screenedit.php
+++ b/frontends/php/screenedit.php
@@ -39,7 +39,6 @@
 			show_page_footer();
 			exit;
 		}
-
 		if(isset($_REQUEST["save"]))
 		{
 			if(!isset($_REQUEST["elements"]))	$_REQUEST["elements"]=0;
@@ -49,7 +48,8 @@
 				$result=update_screen_item($_REQUEST["screenitemid"],
 					$_REQUEST["resource"],$_REQUEST["resourceid"],$_REQUEST["width"],
 					$_REQUEST["height"],$_REQUEST["colspan"],$_REQUEST["rowspan"],
-					$_REQUEST["elements"]);
+					$_REQUEST["elements"],$_REQUEST["valign"],
+					$_REQUEST["halign"],$_REQUEST["style"]);
 
 				show_messages($result, S_ITEM_UPDATED, S_CANNOT_UPDATE_ITEM);
 			}
@@ -59,7 +59,8 @@
 					$_REQUEST["resource"],$_REQUEST["screenid"],
 					$_REQUEST["x"],$_REQUEST["y"],$_REQUEST["resourceid"],
 					$_REQUEST["width"],$_REQUEST["height"],$_REQUEST["colspan"],
-					$_REQUEST["rowspan"],$_REQUEST["elements"]);
+					$_REQUEST["rowspan"],$_REQUEST["elements"],$_REQUEST["valign"],
+					$_REQUEST["halign"],$_REQUEST["style"]);
 
 				show_messages($result, S_ITEM_ADDED, S_CANNOT_ADD_ITEM);
 			}
@@ -71,148 +72,13 @@
 			show_messages($result, S_ITEM_DELETED, S_CANNOT_DELETE_ITEM);
 			unset($_REQUEST["x"]);
 		}
-?>
-
-<?php
-		$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++)
-		{
-			for($c=0;$c<$row["cols"];$c++)
-			{
-				if(isset($skip_field[$r][$c]))	continue;
-
-				$sql="select * from screens_items where screenid=$screenid and x=$c and y=$r";
-				$iresult=DBSelect($sql);
-				if(DBnum_rows($iresult)>0)
-				{
-					$irow=DBfetch($iresult);
-					$colspan=$irow["colspan"];
-					$rowspan=$irow["rowspan"];
-				} else {
-					$colspan=0;
-					$rowspan=0;
-				}
-				for($i=0; $i < $rowspan || $i==0; $i++){
-					for($j=0; $j < $colspan || $j==0; $j++){
-						if($i!=0 || $j!=0)
-							$skip_field[$r+$i][$c+$j]=1;
-					}
-				}
-			}
-		}
 
-		$table = new CTable(
-			new CLink("No rows in screen ".$row["name"],"screenconf.php?".
-				"form=update&screenid=".$screenid),
-			"screen_edit");
-	
-		for($r=0;$r<$row["rows"];$r++)
+		if($_REQUEST["screenid"] > 0)
 		{
-		$new_cols = array();
-		for($c=0;$c<$row["cols"];$c++)
-		{
-			if(isset($skip_field[$r][$c]))		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;
-				$screenitemid	= 0;
-				$resource	= 0;
-				$resourceid	= 0;
-				$width		= 0;
-				$height		= 0;
-				$colspan	= 0;
-				$rowspan	= 0;
-				$elements	= 0;
-			}
-
-			if(isset($_REQUEST["form"]) && 
-				isset($_REQUEST["x"]) && $_REQUEST["x"]==$c &&
-				isset($_REQUEST["y"]) && $_REQUEST["y"]==$r)
-			{
-				$item = get_screen_item_form();
-			}
-			elseif(isset($_REQUEST["form"]) && 
-				isset($_REQUEST["screenitemid"]) && $_REQUEST["screenitemid"]==$screenitemid)
-			{
-				$item = get_screen_item_form();
-			}
-			else if( ($screenitemid!=0) && ($resource==0) )
-			{
-
-				$item = new CLink(
-					new CImg("chart2.php?graphid=$resourceid&width=$width&height=$height".
-						"&period=3600' border=0"),
-					"screenedit.php?form=update".url_param("screenid").
-					"&screenitemid=$screenitemid#form"
-					);
-			}
-			else if( ($screenitemid!=0) && ($resource==1) )
-			{
-
-				$item = new CLink(
-					new CImg("chart.php?itemid=$resourceid&width=$width&height=$height".
-                                        	"&period=3600"),
-					"screenedit.php?form=update".url_param("screenid").
-					"&screenitemid=$screenitemid#form"
-					);
-			}
-			else if( ($screenitemid!=0) && ($resource==2) )
-			{
-
-				$item = new CLink(
-					new CImg("map.php?noedit=1&sysmapid=$resourceid".
-	                                        "&width=$width&height=$height&period=3600"),
-					"screenedit.php?form=update".url_param("screenid").
-					"&screenitemid=$screenitemid#form"
-					);
-			}
-			else if( ($screenitemid!=0) && ($resource==3) )
-			{
-				$item = array(get_screen_plaintext($resourceid,$elements));
-				array_push($item, new CLink(S_CHANGE,
-					"screenedit.php?form=update".url_param("screenid").
-					"&screenitemid=$screenitemid#form"
-					));
-			}
-			else
-			{
-				$item = new CLink(
-					S_EDIT,
-					"screenedit.php?form=update".url_param("screenid")."&x=$c&y=$r#form"
-					);
-			}
-			
-			$new_col = new CCol($item,"screen_edit");
-
-			if($colspan) $new_col->SetColSpan($colspan);
-			if($rowspan) $new_col->SetRowSpan($rowspan);
-
-			array_push($new_cols, $new_col);
-		}
-		$table->AddRow(new CRow($new_cols));
+			$table = get_screen($_REQUEST["screenid"], 1);
+			$table->Show();
 		}
 
-		$table->Show();
 	}
 ?>