- [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

4 files changed, 46 insertions, 79 deletions

diff --git a/frontends/php/include/events.inc.php b/frontends/php/include/events.inc.php
index 45a952ff..d860f480 100644
--- a/frontends/php/include/events.inc.php
+++ b/frontends/php/include/events.inc.php
@@ -304,16 +304,7 @@ function make_small_eventlist($triggerid,&$trigger_data){
 		
 		$duration = zbx_date2age($lclock,$clock);
 
-		if($row["value"] == TRIGGER_VALUE_FALSE){
-			$value=new CCol(S_FALSE_BIG,"off");
-		}
-		elseif($row["value"] == TRIGGER_VALUE_TRUE){
-			$value=new CCol(S_TRUE_BIG,"on");
-		}
-		else{
-			$value=new CCol(S_UNKNOWN_BIG,"unknown");
-		}
-		
+		$value = new CCol(trigger_value2str($row['value']), get_trigger_value_style($row["value"]));
 	
 		$ack = '-';
 		if(1 == $row['acknowledged']){
@@ -424,15 +415,7 @@ function get_history_of_triggers_events($start,$num, $groupid=0, $hostid=0){
 			continue;
 		}
 	
-		if($row["value"] == TRIGGER_VALUE_FALSE){
-			$value=new CCol(S_OFF,"off");
-		}
-		else if($row["value"] == TRIGGER_VALUE_TRUE){
-			$value=new CCol(S_ON,"on");
-		}
-		else{
-			$value=new CCol(S_UNKNOWN_BIG,"unknown");
-		}
+		$value = new CCol(trigger_value2str($row['value']), get_trigger_value_style($row['value']));
 
 		$row = array_merge($triggers[$row['triggerid']],$row);
 		if((0 == $show_unknown) && (!event_initial_time($row,$show_unknown))) continue;
@@ -471,16 +454,7 @@ function get_history_of_discovery_events($start,$num){
 			continue;
 		}
 
-		if($event_data["value"] == 0){
-			$value=new CCol(S_UP,"off");
-		}
-		else if($event_data["value"] == 1){
-			$value=new CCol(S_DOWN,"on");
-		}
-		else{
-			$value=new CCol(S_UNKNOWN_BIG,"unknown");
-		}
-
+		$value = new CCol(trigger_value2str($event_data['value']), get_trigger_value_style($event_data['value']));
 
 		switch($event_data['object']){
 			case EVENT_OBJECT_DHOST:
diff --git a/frontends/php/include/forms.inc.php b/frontends/php/include/forms.inc.php
index 7405b509..6098b482 100644
--- a/frontends/php/include/forms.inc.php
+++ b/frontends/php/include/forms.inc.php
@@ -2859,8 +2859,6 @@
 		$tblAct->AddRow(array(S_STATUS, $cmbStatus));
 
 		$tblAction = new CTableInfo();
-		$tblAction->AddOption('style','background-color: #CCC;');
-		
 		$tblAction->AddRow($tblAct);
 
 		$td = new CCol(array(new CButton('save',S_SAVE)));
@@ -2991,8 +2989,6 @@
 		$tblCond->AddRow(array(S_CONDITIONS, $cond_el));
 		
 		$tblConditions = new CTableInfo();
-		$tblConditions->AddOption('style','background-color: #CCC;');
-		
 		$tblConditions->AddRow($tblCond);
 
 		$td = new CCol($cond_buttons);
@@ -3007,7 +3003,6 @@
 	
 	function get_act_new_cond_form($action=null){
 		$tblCond = new CTable('','nowrap');
-		$tblCond->AddOption('style','background-color: #CCC;');
 
 		if(isset($_REQUEST['actionid']) && empty($action)){
 			$action = get_action_by_actionid($_REQUEST['actionid']);
@@ -3160,7 +3155,6 @@
 		$tblCond->AddRow($rowCondition);
 		
 		$tblConditions = new CTableInfo();
-		$tblConditions->AddOption('style','background-color: #CCC;');
 		
 		$tblConditions->AddRow($tblCond);
 
@@ -3298,8 +3292,9 @@
 		}
 		unset($operations);
 
+		$tblOperFooter = new CTableInfo(null);
+		
 		$oper_buttons = array();
-
 		if(!isset($_REQUEST['new_operation'])){
 			$oper_buttons[] = new CButton('new_operation',S_NEW);
 		}
@@ -3307,19 +3302,19 @@
 		if($tblOper->ItemsCount() > 0 ){
 			$oper_buttons[] = new CButton('del_operation',S_DELETE_SELECTED);
 		}
-
+		
 		$td = new CCol($oper_buttons);
 		$td->AddOption('colspan',isset($_REQUEST['escalation'])?6:3);
 		$td->AddOption('style','text-align: right;');
 		
-		$tblOper->SetFooter($td);
+
+		$tblOperFooter->SetFooter($td);
 // end of condition list preparation
-	return $tblOper;
+	return array($tblOper,$tblOperFooter);
 	}
 	
 	function get_act_new_oper_form($action=null){
 		$tblOper = new CTableInfo();
-		$tblOper->AddOption('style','background-color: #CCC;');
 
 		if(isset($_REQUEST['actionid']) && empty($action)){
 			$action = get_action_by_actionid($_REQUEST['actionid']);
@@ -3640,6 +3635,7 @@
 		
 		$tblOper->AddRow($tblNewOperation);
 
+
 		$td = new CCol(array(
 			new CButton('add_operation', isset($update_mode)?S_SAVE:S_ADD),
 			SPACE,
@@ -3656,7 +3652,6 @@
 	
 	function get_oper_new_cond_form($action=null){
 		$tblCond = new CTable('','nowrap');
-		$tblCond->AddOption('style','background-color: #CCC;');
 
 		if(isset($_REQUEST['actionid']) && empty($action)){
 			$action = get_action_by_actionid($_REQUEST['actionid']);
@@ -3713,8 +3708,7 @@
 		$tblCond->AddRow($rowCondition);
 		
 		$tblConditions = new CTableInfo();
-		$tblConditions->AddOption('style','background-color: #CCC;');
-		
+
 		$tblConditions->AddRow($tblCond);
 
 		$td = new CCol(array(new CButton('add_opcondition',S_ADD),new CButton('cancel_new_opcondition',S_CANCEL)));
@@ -3798,8 +3792,7 @@
 		$frmMeadia->Show();
 	}
 
-	function	insert_image_form()
-	{
+	function insert_image_form(){
 
 
 		$frmImages = new CFormTable(S_IMAGE,"config.php","post","multipart/form-data");
diff --git a/frontends/php/include/locales/en_gb.inc.php b/frontends/php/include/locales/en_gb.inc.php
index 395106b1..e190b6d3 100644
--- a/frontends/php/include/locales/en_gb.inc.php
+++ b/frontends/php/include/locales/en_gb.inc.php
@@ -937,8 +937,7 @@
 	'S_TYPE_ON'=>				'Type (ON)',
 	'S_COLOR_OFF'=>				'Color (OFF)',
 	'S_COLOR_ON'=>				'Color (ON)',
-	
-	
+
 
 //	sysmaps.php
 	'S_MAPS_BIG'=>						'MAPS',
@@ -951,7 +950,8 @@
 
 //	map.php
 	'S_OK_BIG'=>				'OK',
-	'S_PROBLEMS_SMALL'=>			'problems',
+	'S_PROBLEM_BIG'=>			'PROBLEM',
+	'S_PROBLEMS_SMALL'=>		'problems',
 	'S_ZABBIX_URL'=>			'http://www.zabbix.com',
 	'S_PROBLEM_BIG'=>			'PROBLEM',
 
@@ -1376,35 +1376,35 @@
 	'S_ADD'=>				'Add',
 
 //	tr_status.php
-	'S_SOUND'=>						'Sound',
-	'S_MUTE'=>						'Mute',
-	'S_STATUS_OF_TRIGGERS'=>		'Status of triggers',
-	'S_STATUS_OF_TRIGGERS_BIG'=>	'STATUS OF TRIGGERS',
-	'S_SHOW_ONLY_TRUE'=>			'Show only true',
-	'S_HIDE_ACTIONS'=>				'Hide actions',
-	'S_SHOW_ACTIONS'=>				'Show actions',
-	'S_SHOW_ALL'=>					'Show all',
-	'S_HIDE_ALL'=>					'Hide all',
-	'S_SHOW_ONLY_TRUE'=>			'Show only true',
-	'S_SHOW_NOFALSEFORB'=>			'Show all(no FALSE for B)',
-	'S_SHOW_UNACKNOWLEDGED'=>		'Show unacknowledged',
-	'S_SHOW_TRUE_UNACKNOWLEDGED'=>	'Show true-unacknowledged',
-	'S_NOT_ACKNOWLEDGED'=>			'Not acknowledged',
-	'S_HIDE_DETAILS'=>				'Hide details',
-	'S_SHOW_DETAILS'=>				'Show details',
-	'S_SELECT'=>					'Select',
-	'S_INVERSE_SELECT'=>			'Inverse Select',
-	'S_HIDE_SELECT'=>				'Hide select',
-	'S_TRIGGERS_BIG'=>				'TRIGGERS',
-	'S_NAME_BIG'=>					'NAME',
-	'S_SEVERITY_BIG'=>				'SEVERITY',
-	'S_LAST_CHANGE_BIG'=>			'LAST CHANGE',
-	'S_LAST_CHANGE'=>				'Last change',
-	'S_COMMENTS'=>					'Comments',
-	'S_ACKNOWLEDGED'=>				'Acknowledged',
-	'S_ACK'=>						'Ack',
-	'S_NOT_ACK'=>					'Not Ack',
-	'S_NEVER'=>						'Never',
+	'S_SOUND'=>							'Sound',
+	'S_MUTE'=>							'Mute',
+	'S_STATUS_OF_TRIGGERS'=>			'Status of triggers',
+	'S_STATUS_OF_TRIGGERS_BIG'=>		'STATUS OF TRIGGERS',
+	'S_SHOW_ONLY_TRUE'=>				'Show only true',
+	'S_HIDE_ACTIONS'=>					'Hide actions',
+	'S_SHOW_ACTIONS'=>					'Show actions',
+	'S_SHOW_ALL'=>						'Show all',
+	'S_HIDE_ALL'=>						'Hide all',
+	'S_SHOW_ONLY_PROBLEMS'=>			'Show only problems',
+	'S_SHOW_NOFALSEFORB'=>				'Show all(no FALSE for B)',
+	'S_SHOW_UNACKNOWLEDGED'=>			'Show unacknowledged',
+	'S_SHOW_PROBLEM_UNACKNOWLEDGED'=>	'Show problem-unacknowledged',
+	'S_NOT_ACKNOWLEDGED'=>				'Not acknowledged',
+	'S_HIDE_DETAILS'=>					'Hide details',
+	'S_SHOW_DETAILS'=>					'Show details',
+	'S_SELECT'=>						'Select',
+	'S_INVERSE_SELECT'=>				'Inverse Select',
+	'S_HIDE_SELECT'=>					'Hide select',
+	'S_TRIGGERS_BIG'=>					'TRIGGERS',
+	'S_NAME_BIG'=>						'NAME',
+	'S_SEVERITY_BIG'=>					'SEVERITY',
+	'S_LAST_CHANGE_BIG'=>				'LAST CHANGE',
+	'S_LAST_CHANGE'=>					'Last change',
+	'S_COMMENTS'=>						'Comments',
+	'S_ACKNOWLEDGED'=>					'Acknowledged',
+	'S_ACK'=>							'Ack',
+	'S_NOT_ACK'=>						'Not Ack',
+	'S_NEVER'=>							'Never',
 
 //	users.php
 	'S_ZABBIX_USER'=>			'ZABBIX User',
diff --git a/frontends/php/include/triggers.inc.php b/frontends/php/include/triggers.inc.php
index 892b3143..3ef8e0cf 100644
--- a/frontends/php/include/triggers.inc.php
+++ b/frontends/php/include/triggers.inc.php
@@ -354,8 +354,8 @@
 	 *
 	 */
 	function	trigger_value2str($value){
-		$str_val[TRIGGER_VALUE_FALSE]	= S_FALSE_BIG;
-		$str_val[TRIGGER_VALUE_TRUE]	= S_TRUE_BIG;
+		$str_val[TRIGGER_VALUE_FALSE]	= S_OK_BIG;
+		$str_val[TRIGGER_VALUE_TRUE]	= S_PROBLEM_BIG;
 		$str_val[TRIGGER_VALUE_UNKNOWN]	= S_UNKNOWN_BIG;
 
 		if(isset($str_val[$value]))