Screen builder related changes.

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

3 files changed, 48 insertions, 2 deletions

diff --git a/frontends/php/include/config.inc.php b/frontends/php/include/config.inc.php
index d9cd38cd..b9acfc03 100644
--- a/frontends/php/include/config.inc.php
+++ b/frontends/php/include/config.inc.php
@@ -906,6 +906,24 @@ where h.hostid=i.hostid and i.itemid=f.itemid and f.triggerid=$triggerid";
 				}
 ?>
 		</td>
+		<td colspan=1 bgcolor=FFFFFF align=center valign=top width=15%>
+<?php
+				if(check_right("Screen","R",0))
+				{
+					echo "<a href=\"screens.php\">";
+				}
+?>
+<?php
+				if($page["file"]=="screens.php")
+				{
+					echo "<b>[SCREENS]</b></a>";
+				}
+				else
+				{
+					echo "SCREENS</a>";
+				}
+?>
+		</td>
 
 		<td colspan=2 bgcolor=FFFFFF align=center valign=top width=15%>
 <?php
@@ -1004,6 +1022,8 @@ where h.hostid=i.hostid and i.itemid=f.itemid and f.triggerid=$triggerid";
 			||
 			check_right("Graph","U",0)
 			||
+			check_right("Screen","U",0)
+			||
 			check_right("Network map","U",0)
 			||
 			check_right("Service","U",0)
@@ -1128,6 +1148,23 @@ where h.hostid=i.hostid and i.itemid=f.itemid and f.triggerid=$triggerid";
 				}
 ?>
 		</td>
+		<td colspan=1 bgcolor=FFFFFF align=center valign=top width=15%>
+<?php
+				if(check_right("Screen","U",0))
+				{
+					echo "<a href=\"screenconf.php\">";
+				}
+				if(	($page["file"]=="screenedit.php")||
+					($page["file"]=="screenconf.php"))
+				{
+					echo "<b>[SCREENS]</b></a>";
+				}
+				else
+				{
+					echo "SCREENS</a>";
+				}
+?>
+		</td>
 
 		<td colspan=1 bgcolor=FFFFFF align=center valign=top width=15%>
 <?php
diff --git a/frontends/php/screenedit.php b/frontends/php/screenedit.php
index 6f7e82e2..5e369faa 100644
--- a/frontends/php/screenedit.php
+++ b/frontends/php/screenedit.php
@@ -47,7 +47,7 @@
 	$result=DBselect("select name,cols,rows from screens where scid=$scid");
 	$row=DBfetch($result);
 	show_table_header($row["name"]);
-	echo "<TABLE BORDER=1 COLS=".$row["cols"]." align=center WIDTH=100% BGCOLOR=\"#CCCCCC\"";
+	echo "<TABLE BORDER=1 COLS=".$row["cols"]." align=center WIDTH=100% BGCOLOR=\"#FFFFFF\"";
         for($r=0;$r<$row["rows"];$r++)
 	{
 	echo "<TR>";
@@ -128,7 +128,7 @@
 		}
 		else if($graphid!=0)
 		{
-			echo "<a href=screenedit.php?register=edit&scid=$scid&x=$c&y=$r><img src='chart2.php?graphid=$graphid&width=$width&height=$height&period=3600'></a>";
+			echo "<a href=screenedit.php?register=edit&scid=$scid&x=$c&y=$r><img src='chart2.php?graphid=$graphid&width=$width&height=$height&period=3600' border=0></a>";
 		}
 		else
 		{
diff --git a/frontends/php/screens.php b/frontends/php/screens.php
index bd701e7d..cb31cb16 100644
--- a/frontends/php/screens.php
+++ b/frontends/php/screens.php
@@ -65,6 +65,15 @@
           $scid=$HTTP_GET_VARS["scid"];
           $result=DBselect("select name,cols,rows from screens where scid=$scid");
           $row=DBfetch($result);
+	if(isset($HTTP_GET_VARS["fullscreen"]))
+	{
+		$map="<a href=\"screens.php?scid=".$HTTP_GET_VARS["scid"]."\">".$row["name"]."</a>";
+	}
+	else
+	{
+		$map="<a href=\"screens.php?scid=".$HTTP_GET_VARS["scid"]."&fullscreen=1\">".$row["name"]."</a>";
+	}
+	show_table_header($map);
           echo "<TABLE BORDER=1 COLS=".$row["cols"]." align=center WIDTH=100% BGCOLOR=\"#FFFFFF\"";
           for($r=0;$r<$row["rows"];$r++)
           {