- [DEV-192] added filter to Status of triggers (Artem)

 - [DEV-191] monitoring screens inline update preparation (Artem)
 - [DEV-192] added severity filter in status of triggers (Artem)
 - [DEV-137] sql fixes for oracle (Artem)
 - [ZBX-396] fixed error maps message (Artem)
 - [ZBX-394] fixed showing hosts without group in status of triggers (Artem)
 - [DEV-137] small fixes (Artem)

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

1 files changed, 15 insertions, 11 deletions

diff --git a/frontends/php/dashboard.php b/frontends/php/dashboard.php
index 4cb276c0..d6807c7d 100644
--- a/frontends/php/dashboard.php
+++ b/frontends/php/dashboard.php
@@ -190,21 +190,14 @@ include_once "include/page_header.php";
 //	$time = new CSpan(date("[H:i:s]",time()));
 //	$time->AddOption('id','refreshed');
 
+	$p_elements = array();
 // Header	
-	$text = array(S_DASHBOARD_BIG);
-	
+
 	$url = '?fullscreen='.($_REQUEST['fullscreen']?'0':'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."';"));
-	
-	$icon_tab = new CTable();
-	$icon_tab->AddRow(array($fs_icon,SPACE,$text));
-	
-	$text = $icon_tab;
-
-	show_table_header($text,SPACE);
 //-------------
 
 	$left_tab = new CTable();
@@ -387,7 +380,7 @@ include_once "include/page_header.php";
 	$outer_table->SetCellSpacing(1);
 	$outer_table->AddRow(array($td_l,$td_r));
 	
-	$outer_table->Show();
+	$p_elements[] = $outer_table;
 
 	$fav_form = new CForm();
 	$fav_form->AddOption('name','fav_form');
@@ -396,7 +389,18 @@ include_once "include/page_header.php";
 	$fav_form->AddVar('favobj','');
 	$fav_form->AddVar('favid','');
 	$fav_form->AddVar('source','');
-	$fav_form->Show();
+	
+	$p_elements[] = $fav_form;
+	
+	$dashboard_hat = create_hat(
+			S_DASHBOARD_BIG,
+			$p_elements,
+			array($fs_icon),
+			'hat_dashboard',
+			get_profile('web.dashboard.hats.hat_dashboard.state',1)
+	);
+
+	$dashboard_hat->Show();
 
 	$jsmenu = new CPUMenu(null,170);
 	$jsmenu->InsertJavaScript();