- [DEV-1] added new graph navigation-bar (Artem)

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

5 files changed, 74 insertions, 160 deletions

diff --git a/frontends/php/include/classes/cimg.inc.php b/frontends/php/include/classes/cimg.inc.php
index bc1f130b..488c7b91 100644
--- a/frontends/php/include/classes/cimg.inc.php
+++ b/frontends/php/include/classes/cimg.inc.php
@@ -35,6 +35,7 @@
 				$name="image";
 
 			$this->AddOption('border',0);
+			$this->AddOption('alt',$name);
 			$this->SetName($name);
 			$this->SetAltText($name);
 			$this->SetSrc($src);
diff --git a/frontends/php/include/config.inc.php b/frontends/php/include/config.inc.php
index 1e20df98..1f191b0d 100644
--- a/frontends/php/include/config.inc.php
+++ b/frontends/php/include/config.inc.php
@@ -1,7 +1,7 @@
 <?php
 /*
 ** ZABBIX
-** Copyright (C) 2000-2005 SIA Zabbix
+** Copyright (C) 2000-2007 SIA Zabbix
 **
 ** This program is free software; you can redistribute it and/or modify
 ** it under the terms of the GNU General Public License as published by
@@ -1071,20 +1071,24 @@ function TODO($msg) { echo "TODO: ".$msg.BR; }  // DEBUG INFO!!!
 		$till=date(S_DATE_FORMAT_YMDHMS,time(NULL)-$from*3600);   
 		show_table_header("TILL $till (".($period/3600)." HOURs)");
 
-		echo "<center>";
-		echo "<TABLE BORDER=0 WIDTH=100% BGCOLOR=\"#CCCCCC\" cellspacing=1 cellpadding=3>";
-		echo "<TR BGCOLOR=#DDDDDD>";
-		echo "<TD ALIGN=CENTER>";
-
-		insert_sizeable_graph('chart.php?itemid='.$itemid.
-			url_param($from,false,'from').
-			url_param($stime,false,'stime').
-			url_param($period,false,'period'));
-
-		echo "</TD>";
-		echo "</TR>";
-		echo "</TABLE>";
-		echo "</center>";
+		$td = new CCol(get_js_sizeable_graph('chart.php?itemid='.$itemid.
+				url_param($from,false,'from').
+				url_param($stime,false,'stime').
+				url_param($period,false,'period')));
+		$td->AddOption('align','center');
+		
+		$tr = new CRow($td);
+		$tr->AddOption('bgcolor','$dddddd');
+		
+		$table = new CTable();
+		$table->AddOption('width','100%');
+		$table->AddOption('bgcolor','#cccccc');
+		$table->AddOption('cellspacing','1');
+		$table->AddOption('cellpadding','3');
+		
+		$table->AddRow($tr);
+		
+		$table->Show();
 	}
 
 
@@ -1484,143 +1488,6 @@ function TODO($msg) { echo "TODO: ".$msg.BR; }  // DEBUG INFO!!!
 	}
 
 
-	function time_navigator($resource="graphid",$id)
-	{
-	echo "<TABLE BORDER=0 align=center COLS=2 WIDTH=100% BGCOLOR=\"#CCCCCC\" cellspacing=1 cellpadding=1>";
-	echo "<TR BGCOLOR=#FFFFFF>";
-	echo "<TD ALIGN=LEFT>";
-
-	echo "<div align=left>";
-	echo "<b>".S_PERIOD.":</b>".SPACE;
-
-	$hour=3600;
-		
-		$a=array(S_1H=>3600,S_2H=>2*3600,S_4H=>4*3600,S_8H=>8*3600,S_12H=>12*3600,
-			S_24H=>24*3600,S_WEEK_SMALL=>7*24*3600,S_MONTH_SMALL=>31*24*3600,S_YEAR_SMALL=>365*24*3600);
-		foreach($a as $label=>$sec)
-		{
-			echo "[";
-			if($_REQUEST["period"]>$sec)
-			{
-				$tmp=$_REQUEST["period"]-$sec;
-				echo("<A HREF=\"charts.php?period=$tmp".url_param($resource).url_param("stime").url_param("from").url_param("keep").url_param("fullscreen")."\">-</A>");
-			}
-			else
-			{
-				echo "-";
-			}
-
-			echo("<A HREF=\"charts.php?period=$sec".url_param($resource).url_param("stime").url_param("from").url_param("keep").url_param("fullscreen")."\">");
-			echo($label."</A>");
-
-			$tmp=$_REQUEST["period"]+$sec;
-			echo("<A HREF=\"charts.php?period=$tmp".url_param($resource).url_param("stime").url_param("from").url_param("keep").url_param("fullscreen")."\">+</A>");
-
-			echo "]".SPACE;
-		}
-
-		echo("</div>");
-
-	echo "</TD>";
-	echo "<TD BGCOLOR=#FFFFFF WIDTH=15% ALIGN=RIGHT>";
-	echo "<b>".nbsp(S_KEEP_PERIOD).":</b>".SPACE;
-		if($_REQUEST["keep"] == 1)
-		{
-			echo("[<A HREF=\"charts.php?keep=0".url_param($resource).url_param("from").url_param("period").url_param("fullscreen")."\">".S_ON_C."</a>]");
-		}
-		else
-		{
-			echo("[<A HREF=\"charts.php?keep=1".url_param($resource).url_param("from").url_param("period").url_param("fullscreen")."\">".S_OFF_C."</a>]");
-		}
-	echo "</TD>";
-	echo "</TR>";
-	echo "<TR BGCOLOR=#FFFFFF>";
-	echo "<TD>";
-	if(isset($_REQUEST["stime"]))
-	{
-		echo "<div align=left>" ;
-		echo "<b>".S_MOVE.":</b>".SPACE;
-
-		$day=24;
-// $a already defined
-//		$a=array("1h"=>1,"2h"=>2,"4h"=>4,"8h"=>8,"12h"=>12,
-//			"24h"=>24,"week"=>7*24,"month"=>31*24,"year"=>365*24);
-		foreach($a as $label=>$hours)
-		{
-			echo "[";
-
-			$stime=$_REQUEST["stime"];
-			$tmp=mktime(substr($stime,8,2),substr($stime,10,2),0,substr($stime,4,2),substr($stime,6,2),substr($stime,0,4));
-			$tmp=$tmp-3600*$hours;
-			$tmp=date("YmdHi",$tmp);
-			echo("<A HREF=\"charts.php?stime=$tmp".url_param($resource).url_param("period").url_param("keep").url_param("fullscreen")."\">-</A>");
-
-			echo($label);
-
-			$stime=$_REQUEST["stime"];
-			$tmp=mktime(substr($stime,8,2),substr($stime,10,2),0,substr($stime,4,2),substr($stime,6,2),substr($stime,0,4));
-			$tmp=$tmp+3600*$hours;
-			$tmp=date("YmdHi",$tmp);
-			echo("<A HREF=\"charts.php?stime=$tmp".url_param($resource).url_param("period").url_param("keep").url_param("fullscreen")."\">+</A>");
-
-			echo "]".SPACE;
-		}
-		echo("</div>");
-	}
-	else
-	{
-		echo "<div align=left>";
-		echo "<b>".S_MOVE.":</b>".SPACE;
-
-		$day=24;
-// $a already defined
-//		$a=array("1h"=>1,"2h"=>2,"4h"=>4,"8h"=>8,"12h"=>12,
-//			"24h"=>24,"week"=>7*24,"month"=>31*24,"year"=>365*24);
-		foreach($a as $label=>$hours)
-		{
-			echo "[";
-			$tmp=$_REQUEST["from"]+$hours;
-			echo("<A HREF=\"charts.php?from=$tmp".url_param($resource).url_param("period").url_param("keep").url_param("fullscreen")."\">-</A>");
-
-			echo($label);
-
-			if($_REQUEST["from"]>=$hours)
-			{
-				$tmp=$_REQUEST["from"]-$hours;
-				echo("<A HREF=\"charts.php?from=$tmp".url_param($resource).url_param("period").url_param("keep").url_param("fullscreen")."\">+</A>");
-			}
-			else
-			{
-				echo "+";
-			}
-
-			echo "]".SPACE;
-		}
-		echo("</div>");
-	}
-	echo "</TD>";
-	echo "<TD BGCOLOR=#FFFFFF WIDTH=15% ALIGN=RIGHT>";
-//		echo("<div align=left>");
-		echo "<form method=\"put\" action=\"charts.php\">";
-		echo "<input name=\"graphid\" type=\"hidden\" value=\"".$_REQUEST[$resource]."\" size=12>";
-		echo "<input name=\"period\" type=\"hidden\" value=\"".(9*3600)."\" size=12>";
-		if(isset($_REQUEST["stime"]))
-		{
-			echo "<input name=\"stime\" class=\"biginput\" value=\"".$_REQUEST["stime"]."\" size=12>";
-		}
-		else
-		{
-			echo "<input name=\"stime\" class=\"biginput\" value=\"yyyymmddhhmm\" size=12>";
-		}
-		echo SPACE;
-		echo "<input class=\"button\" type=\"submit\" name=\"action\" value=\"go\">";
-		echo "</form>";
-//		echo("</div>");
-	echo "</TD>";
-	echo "</TR>";
-	echo "</TABLE>";
-	}
-
 	function	add_mapping_to_valuemap($valuemapid, $mappings)
 	{
 		DBexecute("delete from mappings where valuemapid=$valuemapid");
diff --git a/frontends/php/include/graphs.inc.php b/frontends/php/include/graphs.inc.php
index 2797a9c3..df1e621e 100644
--- a/frontends/php/include/graphs.inc.php
+++ b/frontends/php/include/graphs.inc.php
@@ -154,6 +154,47 @@
 			" order by itemid,drawtype,sortorder,color,yaxisside"); 
 	}
 
+	/*
+	 * Function: get_min_itemclock_by_graphid
+	 *
+	 * Description:
+	 *     Return the time of the 1st apearance of items included in graph in trends
+	 *
+	 * Author:
+	 *     Artem Suharev
+	 *
+	 */	
+	function get_min_itemclock_by_graphid($graphid){
+		$row = DBfetch(DBselect('SELECT MIN(t.clock) as clock '.
+						' FROM graphs_items gi, trends t '.
+						' WHERE gi.graphid='.$graphid.
+						  ' AND t.itemid = gi.itemid')); 
+						  
+		if(!empty($row) && $row) 
+			return  $row['clock'];
+	return 0;
+	}
+
+	/*
+	 * Function: get_min_itemclock_by_itemid
+	 *
+	 * Description:
+	 *     Return the time of the 1st apearance of item in trends
+	 *
+	 * Author:
+	 *     Artem Suharev
+	 *
+	 */	
+	function	get_min_itemclock_by_itemid($itemid){
+		$row = DBfetch(DBselect('SELECT MIN(t.clock) as clock '.
+						' FROM trends t '.
+						' WHERE t.itemid='.$itemid)); 
+						  
+		if(!empty($row) && $row) 
+			return  $row['clock'];
+	return 0;
+	}
+
 	function	get_graphitem_by_gitemid($gitemid)
 	{
 		$result=DBselect("SELECT * FROM graphs_items WHERE gitemid=$gitemid");
diff --git a/frontends/php/include/js.inc.php b/frontends/php/include/js.inc.php
index 3e8b9e46..04c04bf0 100644
--- a/frontends/php/include/js.inc.php
+++ b/frontends/php/include/js.inc.php
@@ -53,13 +53,15 @@ function zbx_add_post_js($script)
 	$ZBX_PAGE_POST_JS[] = $script;
 }
 
-function	insert_sizeable_graph($url){
 
-	echo '<script language="JavaScript" type="text/javascript">
-		  <!--
-				insert_sizeable_graph('.zbx_jsvalue($url).');
-		  -->
-		  </script>';
+function	get_js_sizeable_graph($url){
+return '
+	<script language="JavaScript" type="text/javascript">
+	<!--
+		insert_sizeable_graph('.zbx_jsvalue($url).');
+	-->
+	</script>
+	';
 }
 
 
diff --git a/frontends/php/include/screens.inc.php b/frontends/php/include/screens.inc.php
index 9dcd35fb..050f901d 100644
--- a/frontends/php/include/screens.inc.php
+++ b/frontends/php/include/screens.inc.php
@@ -199,8 +199,10 @@
 		
 		if(!isset($step))
 		{
-			return new CIFrame('screens.php?config=1&fullscreen=2&elementid='.$slideshowid.'&step='.$curr_step.
+			$iframe = new CIFrame('screens.php?config=1&fullscreen=2&elementid='.$slideshowid.'&step='.$curr_step.
 					'&period='.$effectiveperiod.url_param('stime').url_param('from'));
+					
+			return $iframe;
 		}
 
 		$slide_data = DBfetch(DBselect('select sl.screenid,sl.delay,ss.delay as ss_delay from slides sl,slideshows ss '.
@@ -259,6 +261,7 @@
 		$table = new CTable(
 			new CLink("No rows in screen ".$row["name"],"screenconf.php?config=0&form=update&screenid=".$screenid),
 			($editmode == 0 || $editmode == 2) ? "screen_view" : "screen_edit");
+		$table->AddOption('id','iframe');
 	
 		for($r=0;$r<$row["vsize"];$r++)
 		{
@@ -271,7 +274,7 @@
 				$iresult=DBSelect("select * from screens_items".
 					" where screenid=$screenid and x=$c and y=$r");
 
-				$irow		= DBfetch($iresult);
+				$irow = DBfetch($iresult);
 				if($irow)
 				{
 					$screenitemid	= $irow["screenitemid"];