diff --git a/modules/monitoring/application/views/helpers/HostFlags.php b/modules/monitoring/application/views/helpers/HostFlags.php index a4c5bc7d2..81d8ebcdf 100644 --- a/modules/monitoring/application/views/helpers/HostFlags.php +++ b/modules/monitoring/application/views/helpers/HostFlags.php @@ -1,9 +1,6 @@ view->icon('eye-off', $this->view->translate('Active Checks Disabled')); } } - return $icons; + return implode(' ', $icons); } } diff --git a/modules/monitoring/application/views/helpers/ServiceFlags.php b/modules/monitoring/application/views/helpers/ServiceFlags.php index e9bfd70ba..47a351c4c 100644 --- a/modules/monitoring/application/views/helpers/ServiceFlags.php +++ b/modules/monitoring/application/views/helpers/ServiceFlags.php @@ -3,30 +3,31 @@ class Zend_View_Helper_ServiceFlags extends Zend_View_Helper_Abstract { - public function serviceFlags($service) { + public function serviceFlags($service) + { $icons = array(); - if (!$service->service_handled && $service->service_state > 0) { + if (! $service->service_handled && $service->service_state > 0) { $icons[] = $this->view->icon('attention-alt', $this->view->translate('Unhandled')); } - if ($service->service_acknowledged && !$service->service_in_downtime) { + if ($service->service_acknowledged) { $icons[] = $this->view->icon('ok', $this->view->translate('Acknowledged')); } if ($service->service_is_flapping) { $icons[] = $this->view->icon('flapping', $this->view->translate('Flapping')); } - if (!$service->service_notifications_enabled) { + if (! $service->service_notifications_enabled) { $icons[] = $this->view->icon('bell-off-empty', $this->view->translate('Notifications Disabled')); } if ($service->service_in_downtime) { $icons[] = $this->view->icon('plug', $this->view->translate('In Downtime')); } - if (!$service->service_active_checks_enabled) { - if (!$service->service_passive_checks_enabled) { + if (! $service->service_active_checks_enabled) { + if (! $service->service_passive_checks_enabled) { $icons[] = $this->view->icon('eye-off', $this->view->translate('Active And Passive Checks Disabled')); } else { - $icons[] = $this->view->icon('eye-off', $this->view->translate('Active Checks Disabled')); + $icons[] = $this->view->icon('eye-off', $this->view->translate('Active Checks Disabled')); } } - return $icons; + return implode(' ', $icons); } -} \ No newline at end of file +} diff --git a/modules/monitoring/application/views/scripts/list/hosts.phtml b/modules/monitoring/application/views/scripts/list/hosts.phtml index 6de773435..da20cb990 100644 --- a/modules/monitoring/application/views/scripts/list/hosts.phtml +++ b/modules/monitoring/application/views/scripts/list/hosts.phtml @@ -82,7 +82,7 @@ if (! $this->compact): ?> ) ) ?>) -
+= $this->pluginOutput($this->ellipsis($host->host_output, 10000), true) ?>
diff --git a/modules/monitoring/application/views/scripts/list/services.phtml b/modules/monitoring/application/views/scripts/list/services.phtml index d8fd5d4b5..e6793db86 100644 --- a/modules/monitoring/application/views/scripts/list/services.phtml +++ b/modules/monitoring/application/views/scripts/list/services.phtml @@ -82,7 +82,7 @@ if (! $this->compact): ?> 'class' => 'rowaction' ) ) ?> - +