- [DEV-85] improvements to graph navigations (Artem)

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

12 files changed, 162 insertions, 107 deletions

diff --git a/frontends/php/charts.php b/frontends/php/charts.php
index 568405a1..37fc6926 100644
--- a/frontends/php/charts.php
+++ b/frontends/php/charts.php
@@ -48,12 +48,8 @@ include_once 'include/page_header.php';
 		'groupid'=>		array(T_ZBX_INT, O_OPT,	 P_SYS,		DB_ID,NULL),
 		'hostid'=>		array(T_ZBX_INT, O_OPT,  P_SYS,		DB_ID,NULL),
 		'graphid'=>		array(T_ZBX_INT, O_OPT,  P_SYS,		DB_ID,NULL),
-		'dec'=>			array(T_ZBX_INT, O_OPT,  P_SYS, 	BETWEEN(0,65535*65535),NULL),
-		'inc'=>			array(T_ZBX_INT, O_OPT,  P_SYS, 	BETWEEN(0,65535*65535),NULL),
-		'left'=>		array(T_ZBX_INT, O_OPT,  P_SYS, 	BETWEEN(0,65535*65535),NULL),
-		'right'=>		array(T_ZBX_INT, O_OPT,  P_SYS, 	BETWEEN(0,65535*65535),NULL),
 		'from'=>		array(T_ZBX_INT, O_OPT,  P_SYS, 	BETWEEN(0,65535*65535),NULL),
-		'period'=>		array(T_ZBX_INT, O_OPT,  P_SYS, 	BETWEEN(ZBX_MIN_PERIOD,ZBX_MAX_PERIOD),NULL),
+		'period'=>		array(T_ZBX_INT, O_OPT,  P_SYS, 	null,NULL),
 		'stime'=>		array(T_ZBX_STR, O_OPT,  P_SYS, 	NULL,NULL),
 		'action'=>		array(T_ZBX_STR, O_OPT,  P_SYS, 	IN("'go'"),NULL),
 		'reset'=>		array(T_ZBX_STR, O_OPT,  P_SYS, 	IN("'reset'"),NULL),
@@ -74,7 +70,7 @@ include_once 'include/page_header.php';
 
 	$_REQUEST["period"] = get_request("period",get_profile("web.graph[".$_REQUEST["graphid"]."].period", ZBX_PERIOD_DEFAULT));
 	$effectiveperiod = navigation_bar_calc();
-
+	
 	$options = array("allow_all_hosts","monitored_hosts","with_items");//, "always_select_first_host");
 	if(!$ZBX_WITH_SUBNODES)	array_push($options,"only_current_node");
 	
diff --git a/frontends/php/history.php b/frontends/php/history.php
index d77d74fc..8c3aab0f 100644
--- a/frontends/php/history.php
+++ b/frontends/php/history.php
@@ -46,7 +46,7 @@ include_once "include/page_header.php";
 		"itemid"=>	array(T_ZBX_INT, O_MAND, P_SYS,	DB_ID,	null),
 		
 		"from"=>	array(T_ZBX_INT, O_OPT,	 null,	'{}>=0', null),
-		"period"=>	array(T_ZBX_INT, O_OPT,	 null,	BETWEEN(ZBX_MIN_PERIOD,ZBX_MAX_PERIOD), null),
+		"period"=>	array(T_ZBX_INT, O_OPT,	 null,	null, null),
 		"dec"=>		array(T_ZBX_INT, O_OPT,	 null,	null, null),
 		"inc"=>		array(T_ZBX_INT, O_OPT,	 null,	null, null),
 		"left"=>	array(T_ZBX_INT, O_OPT,	 null,	null, null),
@@ -239,9 +239,9 @@ include_once "include/page_header.php";
 			$till = time(null) - $_REQUEST["from"] * 3600;
 			$hours=$effectiveperiod / 3600;
 
-			$l_header = array('Showing history of '.$effectiveperiod.' seconds('.$hours.' h)',
+			$l_header = array(S_SHOWING_HISTORY_OF.SPACE.$effectiveperiod.SPACE.S_SECONDS_SMALL.'('.$hours.' h)',
 								BR(),
-								'[from: '.date('Y.M.d H:i:s',$time).'] [till: '.date('Y.M.d H:i:s',$till).']'
+								'['.S_FROM_SMALL.': '.date('Y.M.d H:i:s',$time).'] ['.S_TILL_SMALL.': '.date('Y.M.d H:i:s',$till).']'
 							);
 		}
 		else
@@ -274,7 +274,7 @@ include_once "include/page_header.php";
 				$cmbFTask->AddItem(FILTER_TAST_INVERT_MARK,S_MARK_OTHERS);
 
 				$r_header->AddItem(array(
-					"Select rows with value like",SPACE,
+					S_SELECT_ROWS_WITH_VALUE_LIKE,SPACE,
 					new CTextBox("filter",$filter,25),
 					$cmbFTask,SPACE));
 
@@ -300,7 +300,9 @@ include_once "include/page_header.php";
 		}
 		else
 		{
-			echo $l_header."\n";
+			$txt = new CTag('p','yes',$l_header);
+			$txt->Show();
+			echo "\n";
 		}
 
 		$cond_clock = "";
diff --git a/frontends/php/httpdetails.php b/frontends/php/httpdetails.php
index 35d3d736..753226a6 100644
--- a/frontends/php/httpdetails.php
+++ b/frontends/php/httpdetails.php
@@ -39,11 +39,7 @@ include_once "include/page_header.php";
 //		VAR			TYPE	OPTIONAL FLAGS	VALIDATION	EXCEPTION
 	$fields=array(
 		"from"=>	array(T_ZBX_INT, O_OPT,	 null,	'{}>=0', null),
-		"period"=>	array(T_ZBX_INT, O_OPT,	 null,	BETWEEN(ZBX_MIN_PERIOD,ZBX_MAX_PERIOD), null),
-		"dec"=>		array(T_ZBX_INT, O_OPT,	 null,	null, null),
-		"inc"=>		array(T_ZBX_INT, O_OPT,	 null,	null, null),
-		"left"=>	array(T_ZBX_INT, O_OPT,	 null,	null, null),
-		"right"=>	array(T_ZBX_INT, O_OPT,	 null,	null, null),
+		"period"=>	array(T_ZBX_INT, O_OPT,	 null,	null, null),
 		"stime"=>	array(T_ZBX_STR, O_OPT,	 null,	null, null),
 
 		"reset"=>	array(T_ZBX_STR, O_OPT, P_SYS|P_ACT,	null,	null),
diff --git a/frontends/php/include/config.inc.php b/frontends/php/include/config.inc.php
index 202ec64c..b0e6bdb3 100644
--- a/frontends/php/include/config.inc.php
+++ b/frontends/php/include/config.inc.php
@@ -646,11 +646,11 @@ function TODO($msg) { echo "TODO: ".$msg.SBR; }  // DEBUG INFO!!!
 					break;			
 				case PAGE_TYPE_HTML:
 				default:
-					echo "<p align=center>";
-					echo "<font color='".((!$bool) ? "#AA0000" : "#223344")."'>";
-					echo "<b>[".htmlspecialchars($msg)."]</b>";
-					echo "</font>";
-					echo "</p>";
+					$p = new CTag('p','yes');
+					$p->AddOption('align','center');
+					$p->AddOption('style','color: '.((!$bool)?'#AA0000;':'#223344;'));
+					$p->AddItem(bold('['.$msg.']'));
+					$p->Show();
 					break;
 			}
 		}
@@ -1028,7 +1028,7 @@ function TODO($msg) { echo "TODO: ".$msg.SBR; }  // DEBUG INFO!!!
 	function	show_history($itemid,$from,$stime,$period)
 	{
 		$till=date(S_DATE_FORMAT_YMDHMS,time(NULL)-$from*3600);   
-		show_table_header("TILL $till (".($period/3600)." HOURs)");
+		show_table_header(S_TILL.SPACE.$till.' ('.($period/3600).' HOURs)');
 
 		$td = new CCol(get_js_sizeable_graph('graph','chart.php?itemid='.$itemid.
 				url_param($from,false,'from').
@@ -1037,7 +1037,7 @@ function TODO($msg) { echo "TODO: ".$msg.SBR; }  // DEBUG INFO!!!
 		$td->AddOption('align','center');
 		
 		$tr = new CRow($td);
-		$tr->AddOption('bgcolor','$dddddd');
+		$tr->AddOption('bgcolor','#dddddd');
 		
 		$table = new CTable();
 		$table->AddOption('width','100%');
@@ -1051,17 +1051,14 @@ function TODO($msg) { echo "TODO: ".$msg.SBR; }  // DEBUG INFO!!!
 	}
 
 
-	function	get_status()
-	{
+	function	get_status(){
 		global $DB_TYPE;
 		$status = array();
 // server
-		if( (exec("ps -ef|grep zabbix_server|grep -v grep|wc -l")>0) || (exec("ps -ax|grep zabbix_server|grep -v grep|wc -l")>0) )
-		{
+		if( (exec('ps -ef|grep zabbix_server|grep -v grep|wc -l')>0) || (exec('ps -ax|grep zabbix_server|grep -v grep|wc -l')>0) ){
 			$status["zabbix_server"] = S_YES;
 		}
-		else
-		{
+		else{
 			$status["zabbix_server"] = S_NO;
 		}
 
diff --git a/frontends/php/include/graphs.inc.php b/frontends/php/include/graphs.inc.php
index b4d1bde0..77d8a3e9 100644
--- a/frontends/php/include/graphs.inc.php
+++ b/frontends/php/include/graphs.inc.php
@@ -805,42 +805,23 @@
 		return $result;
 	}
 
-	function	navigation_bar_calc()
-	{
-//		$workingperiod = 3600;
+	function navigation_bar_calc(){
 		if(!isset($_REQUEST["period"]))	$_REQUEST["period"]=ZBX_PERIOD_DEFAULT;
 		if(!isset($_REQUEST["from"]))	$_REQUEST["from"]=0;
 		if(!isset($_REQUEST["stime"]))	$_REQUEST["stime"]=null;
-
-//		if(isset($_REQUEST["inc"]))		$workingperiod= $_REQUEST["period"]+$_REQUEST["inc"];
-//		if(isset($_REQUEST["dec"]))		$workingperiod= $workingperiod-$_REQUEST["dec"];
-		if(isset($_REQUEST["inc"]))	$_REQUEST["period"] += $_REQUEST["inc"];
-		if(isset($_REQUEST["dec"]))	$_REQUEST["period"] -= $_REQUEST["dec"];
-
-		if(isset($_REQUEST["left"]))	$_REQUEST["from"] += $_REQUEST["left"];
-		if(isset($_REQUEST["right"]))	$_REQUEST["from"] -= $_REQUEST["right"];
-
-		//unset($_REQUEST["inc"]);
-		//unset($_REQUEST["dec"]);
-		unset($_REQUEST["left"]);
-		unset($_REQUEST["right"]);
-
-		if($_REQUEST["from"] <= 0)			$_REQUEST["from"]	= 0;
-		if($_REQUEST["period"] <= ZBX_MIN_PERIOD)	$_REQUEST["period"]	= ZBX_MIN_PERIOD;
-
-		if(isset($_REQUEST["reset"]))
-		{
-			$_REQUEST["period"]	= ZBX_PERIOD_DEFAULT;
-			$_REQUEST["from"]	= 0;
-//			$workingperiod		= 3600;
+		
+		if($_REQUEST['period']<ZBX_MIN_PERIOD){
+			show_message(S_WARNING.'. '.S_TIME_PERIOD.SPACE.S_MIN_VALUE_SMALL.': '.ZBX_MIN_PERIOD.' ('.(int)(ZBX_MIN_PERIOD/3600).'h)');
+			$_REQUEST['period'] = ZBX_MIN_PERIOD;
 		}
-
-		return $_REQUEST["period"];
-//		return $workingperiod;
+		else if($_REQUEST['period'] > ZBX_MAX_PERIOD){
+			show_message(S_WARNING.'. '.S_TIME_PERIOD.SPACE.S_MAX_VALUE_SMALL.': '.ZBX_MAX_PERIOD.' ('.(int)(ZBX_MAX_PERIOD/86400).'d)');
+			$_REQUEST['period'] = ZBX_MAX_PERIOD;
+		}
+	return $_REQUEST["period"];
 	}
 
-	function	navigation_bar($url,$ext_saved_request=NULL)
-	{
+	function navigation_bar($url,$ext_saved_request=NULL){
 		$saved_request = array("screenid","itemid","action","from","fullscreen");
 
 		if(is_array($ext_saved_request))
diff --git a/frontends/php/include/locales/en_gb.inc.php b/frontends/php/include/locales/en_gb.inc.php
index 4cfeca29..80fa4bff 100644
--- a/frontends/php/include/locales/en_gb.inc.php
+++ b/frontends/php/include/locales/en_gb.inc.php
@@ -218,6 +218,8 @@
 	'S_TRIGGER_SEVERITY'=>			'Trigger severity',
 	'S_TRIGGER_VALUE'=>			'Trigger value',
 	'S_TIME_PERIOD'=>			'Time period',
+	'S_MAX_VALUE_SMALL'=>		'max value',
+	'S_MIN_VALUE_SMALL'=>		'min value',
 	'S_TRIGGER_DESCRIPTION'=>		'Trigger description',
 	'S_CONDITIONS'=>			'Conditions',
 	'S_CONDITION'=>				'Condition',
@@ -554,6 +556,10 @@
 	'S_REQUIRED_ITEMS_FOR_GRAPH'=>		'Required items for graph',
 
 //	history.php
+	'S_SECONDS_SMALL'=>				'seconds',
+	'S_TILL_SMALL'=>				'till',
+	'S_SELECT_ROWS_WITH_VALUE_LIKE'=>'Select rows with value like',
+	'S_SHOWING_HISTORY_OF'=>		'Showing history of',
 	'S_LAST_HOUR_GRAPH'=>			'Last hour graph',
 	'S_LAST_WEEK_GRAPH'=>			'Last week graph',
 	'S_LAST_MONTH_GRAPH'=>			'Last month graph',
diff --git a/frontends/php/js/gmenu.js b/frontends/php/js/gmenu.js
index 89cb2f8a..a16c9299 100644
--- a/frontends/php/js/gmenu.js
+++ b/frontends/php/js/gmenu.js
@@ -151,6 +151,8 @@ minute: 00,				//minutes
 
 timestamp: 0,			//selected date in unix timestamp
 
+period_min: 3600,		// Minimal period value (seconds)
+
 period: 0,				//period in seconds
 bstime: 0,				//graph starttime in seconds
 
@@ -167,6 +169,7 @@ gm_day: null,			//html obj
 gm_month: null,			//html obj
 gm_year: null,			//html obj
 
+visible: 0,				//GMenu style state
 
 monthname: new Array('January','February','March','April','May','June','July','August','September','October','November','December'), // months
 
@@ -228,25 +231,36 @@ gmenuhide: function(e){
 		_PE_GM = null;
 	}
 	this.gm_gmenu.hide();
+	this.visible = 0;
 },
 
 gmenushow: function(period, bstime){
-	if(isset(period) && isset(bstime)){
-		this.initialize(period, bstime);
+	if(this.visible == 1){
+		this.gmenuhide();
+	}
+	else{
+		if(isset(period) && isset(bstime)){
+			this.initialize(period, bstime);
+			
+			this.syncBSDateByBSTime();
+			this.calcPeriodAndTypeByUnix(period);
+			this.setBSDate();
+			this.setPeriod();
+			this.setPeriodType();
+		}
 		
-		this.syncBSDateByBSTime();
-		this.calcPeriodAndTypeByUnix(period);
-		this.setBSDate();
-		this.setPeriod();
-		this.setPeriodType();
+		this.gm_gmenu.show();
+		this.visible = 1;
 	}
-	
-	this.gm_gmenu.show();
 },
 
 minuteup: function(){
-	if((this.bstime+60+this.period)>=parseInt(this.dt.getTime()/1000)){  // max date is date when script has been loaded
-		return;
+	var minuteinsec = 60;
+	if((this.bstime+minuteinsec+this.period)>=parseInt(this.dt.getTime()/1000)){  // max date is date when script has been loaded
+		if((this.period - 3600) < this.period_min) return;
+		this.period-=3600;
+		this.calcPeriodAndTypeByUnix(this.period)
+//		return;
 	}
 
 	this.minute++;
@@ -261,11 +275,23 @@ minuteup: function(){
 	
 	this.syncBSTime();
 	this.setBSDate();
+	
+	this.setPeriod();
+	this.setPeriodType();
 },
 
 hourup: function(){
-	if((this.bstime+3601+this.period)>=parseInt(this.dt.getTime()/1000)){  // max date is date when script has been loaded
-		return;
+	var hourinsec = 3600;
+	if((this.bstime+hourinsec+1+this.period)>=parseInt(this.dt.getTime()/1000)){  // max date is date when script has been loaded
+		if((this.period - hourinsec) < this.period_min){ 
+			if(((this.dt.getTime()/1000) - (this.bstime+hourinsec)) < this.period_min) return;
+			this.period = ((this.dt.getTime()/1000) - (this.bstime+hourinsec));
+		}
+		else{
+			this.period-=hourinsec;
+		}
+		this.calcPeriodAndTypeByUnix(this.period);
+//		return;
 	}
 
 	this.hour++;
@@ -280,11 +306,24 @@ hourup: function(){
 	
 	this.syncBSTime();
 	this.setBSDate();
+
+	this.setPeriod();
+	this.setPeriodType();
 },
 
 dayup: function(){
-	if((this.bstime+86400+this.period)>=parseInt(this.dt.getTime()/1000)){  // max date is date when script has been loaded
-		return;
+	var dayinsec = 86400;
+	if((this.bstime+dayinsec+this.period)>=parseInt(this.dt.getTime()/1000)){  // max date is date when script has been loaded
+
+		if((this.period - dayinsec) < this.period_min){ 
+			if(((this.dt.getTime()/1000) - (this.bstime+dayinsec)) < this.period_min) return;
+			this.period = ((this.dt.getTime()/1000) - (this.bstime+dayinsec));
+		}
+		else{
+			this.period-=dayinsec;
+		}
+		this.calcPeriodAndTypeByUnix(this.period);
+//		return;
 	}
 
 	this.day++;
@@ -299,12 +338,24 @@ dayup: function(){
 	
 	this.syncBSTime();
 	this.setBSDate();
+	
+	this.setPeriod();
+	this.setPeriodType();
 },
 
 monthup: function(){
 	var monthinsec = (86400*this.daysInMonth(this.month,this.year));
 	if((this.bstime+monthinsec+this.period)>=parseInt(this.dt.getTime()/1000)){  // max date is date when script has been loaded
-		return;
+
+		if((this.period - monthinsec) < this.period_min){ 
+			if(((this.dt.getTime()/1000) - (this.bstime+monthinsec)) < this.period_min) return;
+			this.period = ((this.dt.getTime()/1000) - (this.bstime+monthinsec));
+		}
+		else{
+			this.period-=monthinsec;
+		}
+		this.calcPeriodAndTypeByUnix(this.period);
+//		return;
 	}
 
 	var monthlastday = (this.day == this.daysInMonth(this.month,this.year));
@@ -327,20 +378,31 @@ monthup: function(){
 	this.syncBSTime();
 	this.period = this.calcPeriod();
 	this.setBSDate();
+	
+
+	this.setPeriod();
+	this.setPeriodType();
 },
 
 yearup: function(){
 	
-	var inc = this.calcPeriodIncByYear(1);
+	var yearinsec = this.calcPeriodIncByYear(1);
 
-	if((this.bstime+inc+this.period) >= parseInt(this.dt.getTime()/1000)){  // max date is date when script has been loaded
-		return ;
+	if((this.bstime+yearinsec+this.period) >= parseInt(this.dt.getTime()/1000)){  // max date is date when script has been loaded
+
+		if((this.period - yearinsec) < this.period_min) return;
+		this.period-=yearinsec;
+		this.calcPeriodAndTypeByUnix(this.period)
+//		return;
 	}
 
 	this.year++;
 	this.syncBSTime();
 	this.period = this.calcPeriod();
 	this.setBSDate();
+	
+	this.setPeriod();
+	this.setPeriodType();
 },
 
 minutedown: function(){
@@ -429,6 +491,9 @@ pvalueup: function(){
 	if(period){
 		this.period = period;
 		this.setPeriod();
+		
+		this.syncBSDateByBSTime();
+		this.setBSDate();
 		return;
 	}
 	this.period_value--;
@@ -450,6 +515,10 @@ ptypeup: function(){
 		
 		this.setPeriod();
 		this.setPeriodType();
+		
+		this.syncBSDateByBSTime();
+		this.setBSDate();
+
 		return;
 	}
 
@@ -459,6 +528,7 @@ ptypeup: function(){
 
 pvaluedown: function(){
 	if(this.period_value < 2){
+		this.ptypedown();
 		return;
 	}
 	this.period_value--;
@@ -516,7 +586,9 @@ calcPeriod: function(){
 	}
 
 	if((this.bstime + inc) > parseInt(this.dt.getTime()/1000)){ 
-		return false;
+		this.bstime = parseInt(this.dt.getTime()/1000) - inc;
+		this.cdt.setTime(this.bstime*1000);
+//		return false;
 	}
 	
 return inc;
@@ -629,7 +701,7 @@ calcPeriodAndTypeByUnix: function(time){
 			this.period_type = 0;
 		}
 		else{
-			this.period = 3600;
+			this.period = this.period_min;
 		}		
 	return;
 	}
@@ -664,7 +736,7 @@ calcPeriodAndTypeByUnix: function(time){
 		this.period = hours * 3600;	
 	}
 	else{
-		this.period = 3600*3;
+		this.period = this.period_min;
 	}
 },
 
diff --git a/frontends/php/js/sbinit.js b/frontends/php/js/sbinit.js
index 5713d5a5..52248ca5 100644
--- a/frontends/php/js/sbinit.js
+++ b/frontends/php/js/sbinit.js
@@ -44,13 +44,13 @@ function showgraphmenu(obj_id){
 //	G_MENU.gmenumouseout = function(){G_MENU.gmenuhide(); }
 	
 	var gmshow = function(){
-			if(SCROLL_BAR.changed == 1){
-				G_MENU.gmenushow(SCROLL_BAR.period,SCROLL_BAR.getsTimeInUnix());
-			}
-			else{
-				G_MENU.gmenushow();
-			}
+		if(SCROLL_BAR.changed == 1){
+			G_MENU.gmenushow(SCROLL_BAR.period,SCROLL_BAR.getsTimeInUnix());
 		}
+		else{
+			G_MENU.gmenushow();
+		}
+	}
 	if(IE){
 		$('scroll_calendar').attachEvent('onclick',gmshow);
 	}
@@ -105,7 +105,7 @@ function graph_zoom_init(graph_id,stime,period,width,height){
 	var boxongraph = create_box_on_obj(igraph.parentNode);
 	
 	boxongraph.style.top = (posxy.top+A_SBOX[graph_id].shiftT)+'px';
-	boxongraph.style.left = (posxy.left+A_SBOX[graph_id].shiftL)+'px';
+	boxongraph.style.left = (posxy.left+A_SBOX[graph_id].shiftL-1)+'px';
 	
 	width = width || 900;
 	height = height || 200;
@@ -113,7 +113,7 @@ function graph_zoom_init(graph_id,stime,period,width,height){
 	if(empty(width)) width = 900;
 	if(empty(height)) height = 900;
 	
-	A_SBOX[graph_id].sbox.obj.width = width;
+	A_SBOX[graph_id].sbox.obj.width = width-1;
 	A_SBOX[graph_id].sbox.obj.height = height;
 
 	boxongraph.style.height = A_SBOX[graph_id].sbox.obj.height+'px';
diff --git a/frontends/php/js/scrollbar.js b/frontends/php/js/scrollbar.js
index ebe2138a..7aec0670 100644
--- a/frontends/php/js/scrollbar.js
+++ b/frontends/php/js/scrollbar.js
@@ -163,7 +163,7 @@ initialize: function(stime,timel,period,bar_stime){ // where to put bar on start
 		
 		this.changed = 0; // we need to reset this attribute, becouse generaly we may already performe a movement.
 	} catch(e){
-		alert("Needed params haven't been initialized properly");
+		alert("ERROR: ScrollBar initialization failed!");
 		return false;
 	}
 },
@@ -190,7 +190,7 @@ onchange: function(){			//  executed every time the bar period or bar time is ch
 
 arrowmouseover: function(){
 	this.arrowmovetoX(this.arrowX);
-	var arrowflag = false;
+/*	var arrowflag = false;
 	if(this.barX > 12){
 		this.arrowleft.setStyle({display: 'inline'});
 		arrowflag = true;
@@ -201,6 +201,9 @@ arrowmouseover: function(){
 		arrowflag = true;
 	}
 	if(!arrowflag) this.arrowright.setStyle({display: 'inline'});
+*/	
+	this.arrowleft.setStyle({display: 'inline'});
+	this.arrowright.setStyle({display: 'inline'});
 	
 	this.scrollmsover = 1;
 	
@@ -355,6 +358,20 @@ mousemove: function(e){
 },
 //-------------------------------
 
+//--- scrollmoves
+scrollmoveleft: function(){
+	this.barmousedown();
+	this.movescroll(this.barX-1);
+	this.onbarchange();	
+},
+scrollmoveright: function(){
+	this.barmousedown();
+	this.movescroll(this.barX+1);
+	this.onbarchange();	
+},
+//-------------------------------
+
+
 /*-----------------------------------------------------------------------
 ------------------------------ FUNC IN USE ------------------------------
 -----------------------------------------------------------------------*/
@@ -506,15 +523,6 @@ period2bar: function(period){
 },
 //-------------------------------
 
-//--- scrollmoves
-scrollmoveleft: function(){
-	this.movescroll(this.barX-1);
-},
-scrollmoveright: function(){
-	this.movescroll(this.barX+1);
-},
-//-------------------------------
-
 movebarbydate: function(timestamp){
 	timestamp = parseInt(timestamp - this.starttime);
 	this.movescroll(this.time2px(timestamp));
diff --git a/frontends/php/screens.php b/frontends/php/screens.php
index 9b842599..6aa41c9d 100644
--- a/frontends/php/screens.php
+++ b/frontends/php/screens.php
@@ -56,12 +56,8 @@ include_once "include/page_header.php";
 
 		"elementid"=>	array(T_ZBX_INT, O_OPT,	P_SYS|P_NZERO,	DB_ID,NULL),
 		"step"=>		array(T_ZBX_INT, O_OPT,  P_SYS,		BETWEEN(0,65535),NULL),
-		"dec"=>			array(T_ZBX_INT, O_OPT,  P_SYS, 	BETWEEN(0,65535*65535),NULL),
-		"inc"=>			array(T_ZBX_INT, O_OPT,  P_SYS, 	BETWEEN(0,65535*65535),NULL),
 		"from"=>		array(T_ZBX_INT, O_OPT,  P_SYS, 	BETWEEN(0,65535*65535),NULL),
-		"left"=>		array(T_ZBX_INT, O_OPT,  P_SYS, 	BETWEEN(0,65535*65535),NULL),
-		"right"=>		array(T_ZBX_INT, O_OPT,  P_SYS, 	BETWEEN(0,65535*65535),NULL),
-		"period"=>		array(T_ZBX_INT, O_OPT,  P_SYS, 	BETWEEN(ZBX_MIN_PERIOD,ZBX_MAX_PERIOD),NULL),
+		"period"=>		array(T_ZBX_INT, O_OPT,  P_SYS, 	null,NULL),
 		"stime"=>		array(T_ZBX_STR, O_OPT,  P_SYS, 	NULL,NULL),
 		"action"=>		array(T_ZBX_STR, O_OPT,  P_SYS, 	IN("'go'"),NULL),
 		"reset"=>		array(T_ZBX_STR, O_OPT,  P_SYS, 	IN("'reset'"),NULL),
diff --git a/frontends/php/styles/gmenu.css b/frontends/php/styles/gmenu.css
index d4c192e4..156fb4c6 100644
--- a/frontends/php/styles/gmenu.css
+++ b/frontends/php/styles/gmenu.css
@@ -368,8 +368,8 @@ span#gmenu_period_value{
 	font-size: 11px;
 	border:#666666 1px solid;
 	top: 10px;
-	left: 60px;
-	width: 20px;
+	left: 52px;
+	width: 28px;
 }
 
 span#gmenu_period_type{
diff --git a/frontends/php/styles/sbox.css b/frontends/php/styles/sbox.css
index 52472974..0fc636c3 100644
--- a/frontends/php/styles/sbox.css
+++ b/frontends/php/styles/sbox.css
@@ -18,6 +18,7 @@ div#selection_box{
 
 div.box_on{
 	position: absolute;
+/*	border: 1px black solid;
 /*	background-color:#FF0000;*/
 	z-index:2;
 }