--- blocks.inc.php.bak	2010-03-11 14:07:57.000000000 -0300
+++ blocks.inc.php	2010-03-12 19:46:43.000000000 -0300
@@ -705,9 +705,29 @@
 		$menus = rtrim($menus,',');
 		$menus = 'show_popup_menu(event,['.$menus.'],180);';
 
-		$host = new CSpan($trigger['host'],'link_menu pointer');
-		$host->setAttribute('onclick','javascript: '.$menus);
+		//$host = new CSpan($trigger['host'],'link_menu pointer');
+		//$host->setAttribute('onclick','javascript: '.$menus);
 
+// Maintenance {{{
+		$host_span = new CSpan($trigger['host'],'link_menu pointer');
+		$host_span->setAttribute('onclick','javascript: '.$menus);
+                
+                $trigger_host = $triggers_hosts[$trigger['hostid']];
+
+		$maint_span = null;
+		if($trigger_host['maintenance_status']){
+                    $text = $trigger_host['maintenance_type'] ? S_NO_DATA_MAINTENANCE : S_NORMAL_MAINTENANCE;
+                    $text = ' ['.$text.']';
+                    $maint_span = new CSpan($text, 'orange pointer');
+                    $maintenance = CMaintenance::get(array('maintenanceids' => $trigger_host['maintenanceid'], 'extendoutput' => 1));
+                    $maintenance = reset($maintenance);
+                    $maint_hint = new CSpan($maintenance['name'].($maintenance['description']=='' ? '' : ': '.$maintenance['description']));
+                    $maint_span->setHint($maint_hint);
+                }
+
+                $host = new CCol(array($host_span, $maint_span));
+
+// }}} Maintenance
 		$event_sql = 'SELECT e.eventid, e.value, e.clock, e.objectid as triggerid, e.acknowledged'.
 					' FROM events e'.
 					' WHERE e.object='.EVENT_OBJECT_TRIGGER.