Minor changes.

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

4 files changed, 21 insertions, 4 deletions

diff --git a/frontends/php/charts.php b/frontends/php/charts.php
index b9244536..6f3be261 100644
--- a/frontends/php/charts.php
+++ b/frontends/php/charts.php
@@ -187,7 +187,7 @@
 		navigation_bar("charts.php");
 
 // BEGIN - IGMI - just another way of navigation
-	echo "<TABLE BORDER=0 align=center COLS=2 WIDTH=100% BGCOLOR=\"#CCCCCC\" cellspacing=1 cellpadding=1>";
+/*	echo "<TABLE BORDER=0 align=center COLS=2 WIDTH=100% BGCOLOR=\"#CCCCCC\" cellspacing=1 cellpadding=1>";
 	echo "<TR BGCOLOR=#FFFFFF>";
 	echo "<TD ALIGN=LEFT>";
 
@@ -322,6 +322,7 @@
 	echo "</TABLE>";
 
 // END - IGMI - just another way of navigation
+*/
 	}
 	
 ?>
diff --git a/frontends/php/include/config.inc.php b/frontends/php/include/config.inc.php
index 346f4701..696f2862 100644
--- a/frontends/php/include/config.inc.php
+++ b/frontends/php/include/config.inc.php
@@ -2423,9 +2423,11 @@ echo "</head>";
 		echo "</TR>";
 		echo "</TABLE>";
 		echo "</center>";
-		echo("<hr>");
-		insert_time_navigator($itemid,$period,$from);
-		echo("<hr>");
+//		echo("<hr>");
+		navigation_bar("history.php");
+//		insert_time_navigator($itemid,$period,$from);
+		
+//		echo("<hr>");
 	}
 
 	# Show history
diff --git a/frontends/php/include/graphs.inc.php b/frontends/php/include/graphs.inc.php
index def7e4fc..3dfa5b83 100644
--- a/frontends/php/include/graphs.inc.php
+++ b/frontends/php/include/graphs.inc.php
@@ -259,6 +259,19 @@
 		$h2=$h2."&nbsp;";
 		$h2=$h2."<input class=\"button\" type=\"submit\" name=\"action\" value=\"go\">";
 
+		if(isset($_GET["graphid"])&&($_GET["graphid"]!=0))
+		{
+			$h2=$h2."<input name=\"graphid\" type=\"hidden\" value=\"".$_GET["graphid"]."\" size=12>";
+		}
+		if(isset($_GET["itemid"])&&($_GET["itemid"]!=0))
+		{
+			$h2=$h2."<input name=\"itemid\" type=\"hidden\" value=\"".$_GET["itemid"]."\" size=12>";
+		}
+		if(isset($_GET["action"]))
+		{
+			$h2=$h2."<input name=\"action\" type=\"hidden\" value=\"".$_GET["action"]."\" size=22>";
+		}
+
 		show_header2($h1,$h2,"<form name=\"form2\" method=\"get\" action=\"$url\">","</form>");
 
 		return;
diff --git a/frontends/php/screens.php b/frontends/php/screens.php
index de8b9cec..2dbeb441 100644
--- a/frontends/php/screens.php
+++ b/frontends/php/screens.php
@@ -168,6 +168,7 @@
           echo "</TR>\n";
           }
           echo "</TABLE>";
+		navigation_bar("screens.php");
 	}
 	else
 	{