diff --git a/modules/monitoring/application/views/scripts/list/comments.phtml b/modules/monitoring/application/views/scripts/list/comments.phtml index 9ca289ef7..3ed671fbe 100644 --- a/modules/monitoring/application/views/scripts/list/comments.phtml +++ b/modules/monitoring/application/views/scripts/list/comments.phtml @@ -13,6 +13,10 @@ $cf = $this->getHelper('CommandForm'); +if (count($comments) === 0) { + echo t('No comments matching the filter'); +} + foreach ($comments as $comment): ?> diff --git a/modules/monitoring/application/views/scripts/list/contactgroups.phtml b/modules/monitoring/application/views/scripts/list/contactgroups.phtml index 6c2346064..b29a5ab15 100644 --- a/modules/monitoring/application/views/scripts/list/contactgroups.phtml +++ b/modules/monitoring/application/views/scripts/list/contactgroups.phtml @@ -5,6 +5,13 @@
+ + + $groupInfo): ?>

diff --git a/modules/monitoring/application/views/scripts/list/contacts.phtml b/modules/monitoring/application/views/scripts/list/contacts.phtml index 096276c11..c2dfcd3ce 100644 --- a/modules/monitoring/application/views/scripts/list/contacts.phtml +++ b/modules/monitoring/application/views/scripts/list/contacts.phtml @@ -27,6 +27,11 @@ $contactHelper = $this->getHelper('ContactFlags'); + href('monitoring/show/contacts', array('contact' => $contact->contact_name)); ?> diff --git a/modules/monitoring/application/views/scripts/list/downtimes.phtml b/modules/monitoring/application/views/scripts/list/downtimes.phtml index 7b48366fb..6a6e7a3f6 100644 --- a/modules/monitoring/application/views/scripts/list/downtimes.phtml +++ b/modules/monitoring/application/views/scripts/list/downtimes.phtml @@ -12,6 +12,11 @@ $helper = $this->getHelper('CommandForm');
+downtimes as $downtime): ?>
diff --git a/modules/monitoring/application/views/scripts/list/eventhistory.phtml b/modules/monitoring/application/views/scripts/list/eventhistory.phtml index ba7034a1e..690de971e 100644 --- a/modules/monitoring/application/views/scripts/list/eventhistory.phtml +++ b/modules/monitoring/application/views/scripts/list/eventhistory.phtml @@ -14,6 +14,11 @@ +
+ +

diff --git a/modules/monitoring/application/views/scripts/list/hosts.phtml b/modules/monitoring/application/views/scripts/list/hosts.phtml index 672212ae3..841789796 100644 --- a/modules/monitoring/application/views/scripts/list/hosts.phtml +++ b/modules/monitoring/application/views/scripts/list/hosts.phtml @@ -20,14 +20,13 @@ if (! $this->compact): ?> count() === 0): ?> - translate('No host found') ?> - compact): ?> -

-count() === 0) { + echo t('No hosts matching the filter'); + if (! $this->compact) { + echo '
'; + } + return; +} ?>
notifications)) { service)) { diff --git a/modules/monitoring/application/views/scripts/list/servicegroups.phtml b/modules/monitoring/application/views/scripts/list/servicegroups.phtml index eb5c80f3a..059ea9dcb 100644 --- a/modules/monitoring/application/views/scripts/list/servicegroups.phtml +++ b/modules/monitoring/application/views/scripts/list/servicegroups.phtml @@ -5,6 +5,12 @@
+ +

diff --git a/modules/monitoring/application/views/scripts/list/servicematrix.phtml b/modules/monitoring/application/views/scripts/list/servicematrix.phtml index b6fc35170..62676a2d2 100644 --- a/modules/monitoring/application/views/scripts/list/servicematrix.phtml +++ b/modules/monitoring/application/views/scripts/list/servicematrix.phtml @@ -23,7 +23,7 @@ $hostFilter = '(' . implode('|', array_keys($pivotData)) . ')'; ?> - translate('No Service Found'); ?> + translate('No Services matching the filter'); ?> $serviceStates): ?> diff --git a/modules/monitoring/application/views/scripts/list/services.phtml b/modules/monitoring/application/views/scripts/list/services.phtml index aa3eb10d5..f2da63dca 100644 --- a/modules/monitoring/application/views/scripts/list/services.phtml +++ b/modules/monitoring/application/views/scripts/list/services.phtml @@ -29,6 +29,9 @@ if (!$this->compact): ?>

href( 'monitoring/show/service', diff --git a/modules/monitoring/application/views/scripts/list/statehistorysummary.phtml b/modules/monitoring/application/views/scripts/list/statehistorysummary.phtml index 40fd6fd2c..d7c5527d8 100644 --- a/modules/monitoring/application/views/scripts/list/statehistorysummary.phtml +++ b/modules/monitoring/application/views/scripts/list/statehistorysummary.phtml @@ -7,6 +7,10 @@ $grid->setColor('#FC0707'); $data = array(); + +if (count($summary) === 0) { + echo t('No history entry matching the filter'); +} foreach ($summary as $entry) { $day = $entry->day; $value = $entry->cnt_critical; diff --git a/modules/monitoring/application/views/scripts/multi/host.phtml b/modules/monitoring/application/views/scripts/multi/host.phtml index e473ba05a..bd824bd5a 100644 --- a/modules/monitoring/application/views/scripts/multi/host.phtml +++ b/modules/monitoring/application/views/scripts/multi/host.phtml @@ -9,8 +9,10 @@ $this->target = array('host' => $this->hostquery);
+ + +

Summary for hosts

- render('multi/components/objectlist.phtml'); ?>
@@ -47,6 +49,7 @@ $this->target = array('host' => $this->hostquery);
render('multi/components/flags.phtml') ?> + target = array(
+ + +

Summary for services

@@ -54,4 +57,5 @@ $this->target = array(
render('multi/components/flags.phtml') ?> +