diff --git a/modules/monitoring/application/controllers/HostsController.php b/modules/monitoring/application/controllers/HostsController.php index bffbecc058..487f7246b1 100644 --- a/modules/monitoring/application/controllers/HostsController.php +++ b/modules/monitoring/application/controllers/HostsController.php @@ -52,21 +52,18 @@ public function init() protected function handleCommandForm(ObjectsCommandForm $form) { $this->hostList->setColumns(array( - 'host_icon_image', - 'host_icon_image_alt', - 'host_name', - 'host_address', - 'host_address6', - 'host_state', - 'host_problem', - 'host_handled', 'host_acknowledged', + 'host_active_checks_enabled', + 'host_display_name', + 'host_handled', 'host_in_downtime', 'host_is_flapping', - 'host_output', + 'host_last_state_change', + 'host_name', 'host_notifications_enabled', - 'host_active_checks_enabled', - 'host_passive_checks_enabled' + 'host_passive_checks_enabled', + 'host_problem', + 'host_state' )); $form @@ -90,24 +87,18 @@ public function showAction() ->handleRequest(); $this->view->checkNowForm = $checkNowForm; $this->hostList->setColumns(array( - 'host_icon_image', - 'host_icon_image_alt', - 'host_name', - 'host_address', - 'host_address6', - 'host_state', - 'host_problem', - 'host_handled', 'host_acknowledged', + 'host_active_checks_enabled', + 'host_display_name', + 'host_handled', 'host_in_downtime', 'host_is_flapping', - 'host_output', + 'host_last_state_change', + 'host_name', 'host_notifications_enabled', - 'host_active_checks_enabled', - 'host_passive_checks_enabled' - /*'host_event_handler_enabled', - 'host_flap_detection_enabled', - 'host_obsessing'*/ + 'host_passive_checks_enabled', + 'host_problem', + 'host_state' )); $acknowledgedObjects = $this->hostList->getAcknowledgedObjects(); diff --git a/modules/monitoring/application/views/scripts/partials/host/objects-header.phtml b/modules/monitoring/application/views/scripts/partials/host/objects-header.phtml index 0a3fdbaf67..720e2de40c 100644 --- a/modules/monitoring/application/views/scripts/partials/host/objects-header.phtml +++ b/modules/monitoring/application/views/scripts/partials/host/objects-header.phtml @@ -1,48 +1,41 @@ - - 0): ?> -
- = Host::getStateText($host->host_state, true); ?>
- - |
-
- = $this->iconImage()->host($host) ?>
- = implode(' ', $this->hostFlags($host)) ?>
- = $this->escape($host->getName()); ?> - = $this->escape($host->host_output) ?> - |
-
+ = Host::getStateText($host->host_state) ?> + + | ++ = $this->link()->host( + $host->host_name, + $host->host_display_name + ) ?> + = implode(' ', $this->hostFlags($host)) ?> + | +