- [DEV-137] changed trigger values definitions (Artem)

 - [DEV-191] latest data reverted to standart refresh (Artem)
 - [DEV-191] added hats to graphs, screens pages (Artem)

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

1 files changed, 32 insertions, 27 deletions

diff --git a/frontends/php/maps.php b/frontends/php/maps.php
index aa3699b6..3535d943 100644
--- a/frontends/php/maps.php
+++ b/frontends/php/maps.php
@@ -54,11 +54,9 @@ include_once('include/page_header.php');
 ?>
 <?php
 	if(isset($_REQUEST['favobj'])){
-		if(isset($_REQUEST['favobj'])){
-			if('hat' == $_REQUEST['favobj']){
-				update_profile('web.maps.hats.'.$_REQUEST['favid'].'.state',$_REQUEST['state'], PROFILE_TYPE_INT);
-			}
-		}	
+		if('hat' == $_REQUEST['favobj']){
+			update_profile('web.maps.hats.'.$_REQUEST['favid'].'.state',$_REQUEST['state'], PROFILE_TYPE_INT);
+		}
 		else if('sysmapid' == $_REQUEST['favobj']){
 			$result = false;
 			if('add' == $_REQUEST['action']){
@@ -124,28 +122,10 @@ include_once('include/page_header.php');
 <?php
 	$p_elements = array();
 	
+	$text = null;
 	if(isset($_REQUEST["sysmapid"])){
 		$sysmap = get_sysmap_by_sysmapid($_REQUEST["sysmapid"]);
-
-		$text = $all_maps[$_REQUEST["sysmapid"]];
-		
-		if(infavorites('web.favorite.sysmapids',$_REQUEST['sysmapid'],'sysmapid')){
-			$icon = new CDiv(SPACE,'iconminus');
-			$icon->AddOption('title',S_REMOVE_FROM.' '.S_FAVORITES);
-			$icon->AddAction('onclick',new CScript("javascript: rm4favorites('sysmapid','".$_REQUEST["sysmapid"]."',0);"));
-		}
-		else{
-			$icon = new CDiv(SPACE,'iconplus');
-			$icon->AddOption('title',S_ADD_TO.' '.S_FAVORITES);
-			$icon->AddAction('onclick',new CScript("javascript: add2favorites('sysmapid','".$_REQUEST["sysmapid"]."');"));
-		}
-		$icon->AddOption('id','addrm_fav');
-		
-		$url = '?sysmapid='.$_REQUEST['sysmapid'].($_REQUEST['fullscreen']?'':'&fullscreen=1');
-
-		$fs_icon = new CDiv(SPACE,'fullscreen');
-		$fs_icon->AddOption('title',$_REQUEST['fullscreen']?S_NORMAL.' '.S_VIEW:S_FULLSCREEN);
-		$fs_icon->AddAction('onclick',new CScript("javascript: document.location = '".$url."';"));	
+		$text = $all_maps[$_REQUEST["sysmapid"]];		
 	}
 
 	$form = new CForm();
@@ -161,9 +141,8 @@ include_once('include/page_header.php');
 	
 	if($cmbMaps->ItemsCount()>0){
 		$form->AddItem($cmbMaps);
+		$p_elements[] = get_table_header($text,$form);
 	}
-
-	$p_elements[] = get_table_header($text,$form);
 ?>
 <?php
 	$table = new CTable(S_NO_MAPS_DEFINED,"map");
@@ -177,6 +156,32 @@ include_once('include/page_header.php');
 	}
 		
 	$p_elements[] = $table;
+
+	$icon = null;
+	$fs_icon = null;
+	if(isset($_REQUEST["sysmapid"])){
+		$sysmap = get_sysmap_by_sysmapid($_REQUEST["sysmapid"]);
+
+		$text = $all_maps[$_REQUEST["sysmapid"]];
+		
+		if(infavorites('web.favorite.sysmapids',$_REQUEST['sysmapid'],'sysmapid')){
+			$icon = new CDiv(SPACE,'iconminus');
+			$icon->AddOption('title',S_REMOVE_FROM.' '.S_FAVORITES);
+			$icon->AddAction('onclick',new CScript("javascript: rm4favorites('sysmapid','".$_REQUEST["sysmapid"]."',0);"));
+		}
+		else{
+			$icon = new CDiv(SPACE,'iconplus');
+			$icon->AddOption('title',S_ADD_TO.' '.S_FAVORITES);
+			$icon->AddAction('onclick',new CScript("javascript: add2favorites('sysmapid','".$_REQUEST["sysmapid"]."');"));
+		}
+		$icon->AddOption('id','addrm_fav');
+		
+		$url = '?sysmapid='.$_REQUEST['sysmapid'].($_REQUEST['fullscreen']?'':'&fullscreen=1');
+
+		$fs_icon = new CDiv(SPACE,'fullscreen');
+		$fs_icon->AddOption('title',$_REQUEST['fullscreen']?S_NORMAL.' '.S_VIEW:S_FULLSCREEN);
+		$fs_icon->AddAction('onclick',new CScript("javascript: document.location = '".$url."';"));	
+	}
 	
 	$latest_hat = create_hat(
 			S_NETWORK_MAPS_BIG,