- [DEV-170] improved charts period & start time selection (Artem)

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

2 files changed, 5 insertions, 3 deletions

diff --git a/frontends/php/include/config.inc.php b/frontends/php/include/config.inc.php
index 0a1762cd..bae6c3e4 100644
--- a/frontends/php/include/config.inc.php
+++ b/frontends/php/include/config.inc.php
@@ -1034,7 +1034,8 @@ function TODO($msg) { echo "TODO: ".$msg.SBR; }  // DEBUG INFO!!!
 	# Show History Graph
 	function show_history($itemid,$from,$stime,$period){
 		$till=date(S_DATE_FORMAT_YMDHMS,time(NULL)-$from*3600);   
-		show_table_header(S_TILL.SPACE.$till.' ('.($period/3600).' HOURs)');
+		
+		show_table_header(S_TILL.SPACE.$till.' ( '.zbx_date2age($stime,$stime+$period).' )');
 
 		$td = new CCol(get_js_sizeable_graph('graph','chart.php?itemid='.$itemid.
 				url_param($from,false,'from').
diff --git a/frontends/php/include/screens.inc.php b/frontends/php/include/screens.inc.php
index 5a92c8ec..7a420e63 100644
--- a/frontends/php/include/screens.inc.php
+++ b/frontends/php/include/screens.inc.php
@@ -400,7 +400,8 @@
 						$g_img->AddOPtion('id',$dom_graph_id);
 
 						$item = new CLink($g_img,$action);
-						if(!is_null($graphid)){
+
+						if(!is_null($graphid) && ($editmode != 1)){
 							insert_js('	A_SBOX["'.$dom_graph_id.'"] = new Object;'.
 										'A_SBOX["'.$dom_graph_id.'"].shiftT = 17;'.
 										'A_SBOX["'.$dom_graph_id.'"].shiftL = '.$shiftXleft.';'
@@ -413,7 +414,7 @@
 							else{
 								$stime = 'null';
 							}
-							zbx_add_post_js('graph_zoom_init("'.$dom_graph_id.'",'.$stime.','.$effectiveperiod.','.$width.','.$height.');');
+							zbx_add_post_js('graph_zoom_init("'.$dom_graph_id.'",'.$stime.','.$effectiveperiod.','.$width.','.$height.', false);');
 						}
 					}
 				}