From 22fb507a2e482b25d204b0969ca60258d5ca9cbf Mon Sep 17 00:00:00 2001 From: Eric Lippmann Date: Mon, 28 Sep 2015 17:55:57 +0200 Subject: [PATCH] monitoring: Indent the service groups overview w/ 4 spaces refs #5543 --- .../views/scripts/list/hostgroups.phtml | 2 +- .../views/scripts/list/servicegroups.phtml | 291 +++++++++--------- 2 files changed, 145 insertions(+), 148 deletions(-) diff --git a/modules/monitoring/application/views/scripts/list/hostgroups.phtml b/modules/monitoring/application/views/scripts/list/hostgroups.phtml index d076a175e..e226f96e9 100644 --- a/modules/monitoring/application/views/scripts/list/hostgroups.phtml +++ b/modules/monitoring/application/views/scripts/list/hostgroups.phtml @@ -12,7 +12,7 @@ if (! $this->compact): ?>
- hasResult()): ?> +hasResult()): ?>

translate('No host groups found matching the filter.') ?>

diff --git a/modules/monitoring/application/views/scripts/list/servicegroups.phtml b/modules/monitoring/application/views/scripts/list/servicegroups.phtml index fea6457e5..730a28e0b 100644 --- a/modules/monitoring/application/views/scripts/list/servicegroups.phtml +++ b/modules/monitoring/application/views/scripts/list/servicegroups.phtml @@ -2,171 +2,168 @@ if (! $this->compact): ?>
- tabs ?> - sortBox ?> - limiter ?> - paginator ?> - filterEditor ?> + tabs ?> + sortBox ?> + limiter ?> + paginator ?> + filterEditor ?>
-hasResult()): ?> -

translate('No servicegroups found matching the filter') ?>

+ hasResult()): ?> +

translate('No service groups found matching the filter.') ?>

- + - - - - - - -peekAhead($this->compact); -foreach ($servicegroups as $serviceGroup): ?> - + + + + + + +peekAhead($this->compact) as $serviceGroup): ?> + - + - -
translate('Service Group') ?>translate('Total Services') ?>translate('Service States') ?>
translate('Service Group') ?>translate('Total Services') ?>translate('Service States') ?>
- qlink( - $serviceGroup->servicegroup_alias, - 'monitoring/list/services', - array('servicegroup_name' => $serviceGroup->servicegroup_name), - array('title' => sprintf($this->translate('List all services in the group "%s"'), $serviceGroup->servicegroup_alias)) - ) ?> + qlink( + $serviceGroup->servicegroup_alias, + 'monitoring/list/services', + array('servicegroup_name' => $serviceGroup->servicegroup_name), + array('title' => sprintf($this->translate('List all services in the group "%s"'), $serviceGroup->servicegroup_alias)) + ) ?> - services_total ?> + services_total ?> - setUrl('monitoring/list/services') - ->add( - StateBadges::STATE_OK, - $serviceGroup->services_ok, - array( - 'service_state' => 0, - 'servicegroup_name' => $serviceGroup->servicegroup_name, - 'sort' => 'service_severity' - ), - 'List %s service that is currently in state OK in service group "%s"', - 'List %s services which are currently in state OK in service group "%s"', - array($serviceGroup->services_ok, $serviceGroup->servicegroup_alias) - ) - ->add( - StateBadges::STATE_CRITICAL, - $serviceGroup->services_critical_unhandled, - array( - 'service_state' => 2, - 'service_acknowledged' => 0, - 'service_in_downtime' => 0, - 'host_problem' => 0, - 'servicegroup_name' => $serviceGroup->servicegroup_name, - 'sort' => 'service_severity' - ), - 'List %s service that is currently in state CRITICAL in service group "%s"', - 'List %s services which are currently in state CRITICAL in service group "%s"', - array($serviceGroup->services_critical_unhandled, $serviceGroup->servicegroup_alias) - ) - ->add( - StateBadges::STATE_CRITICAL_HANDLED, - $serviceGroup->services_critical_handled, - array( - 'service_state' => 2, - 'service_handled' => 1, - 'servicegroup_name' => $serviceGroup->servicegroup_name, - 'sort' => 'service_severity' - ), - 'List %s service that is currently in state CRITICAL (Acknowledged) in service group "%s"', - 'List %s services which are currently in state CRITICAL (Acknowledged) in service group "%s"', - array($serviceGroup->services_critical_unhandled, $serviceGroup->servicegroup_alias) - ) - ->add( - StateBadges::STATE_UNKNOWN, - $serviceGroup->services_unknown_unhandled, - array( - 'service_state' => 3, - 'service_acknowledged' => 0, - 'service_in_downtime' => 0, - 'host_problem' => 0, - 'servicegroup_name' => $serviceGroup->servicegroup_name, - 'sort' => 'service_severity' - ), - 'List %s service that is currently in state UNKNOWN in service group "%s"', - 'List %s services which are currently in state UNKNOWN in service group "%s"', - array($serviceGroup->services_unknown_unhandled, $serviceGroup->servicegroup_alias) - ) - ->add( - StateBadges::STATE_UNKNOWN_HANDLED, - $serviceGroup->services_unknown_handled, - array( - 'service_state' => 3, - 'service_handled' => 1, - 'servicegroup_name' => $serviceGroup->servicegroup_name, - 'sort' => 'service_severity' - ), - 'List %s service that is currently in state UNKNOWN (Acknowledged) in service group "%s"', - 'List %s services which are currently in state UNKNOWN (Acknowledged) in service group "%s"', - array($serviceGroup->services_unknown_handled, $serviceGroup->servicegroup_alias) + setUrl('monitoring/list/services') + ->add( + StateBadges::STATE_OK, + $serviceGroup->services_ok, + array( + 'service_state' => 0, + 'servicegroup_name' => $serviceGroup->servicegroup_name, + 'sort' => 'service_severity' + ), + 'List %s service that is currently in state OK in service group "%s"', + 'List %s services which are currently in state OK in service group "%s"', + array($serviceGroup->services_ok, $serviceGroup->servicegroup_alias) + ) + ->add( + StateBadges::STATE_CRITICAL, + $serviceGroup->services_critical_unhandled, + array( + 'service_state' => 2, + 'service_acknowledged' => 0, + 'service_in_downtime' => 0, + 'host_problem' => 0, + 'servicegroup_name' => $serviceGroup->servicegroup_name, + 'sort' => 'service_severity' + ), + 'List %s service that is currently in state CRITICAL in service group "%s"', + 'List %s services which are currently in state CRITICAL in service group "%s"', + array($serviceGroup->services_critical_unhandled, $serviceGroup->servicegroup_alias) + ) + ->add( + StateBadges::STATE_CRITICAL_HANDLED, + $serviceGroup->services_critical_handled, + array( + 'service_state' => 2, + 'service_handled' => 1, + 'servicegroup_name' => $serviceGroup->servicegroup_name, + 'sort' => 'service_severity' + ), + 'List %s service that is currently in state CRITICAL (Acknowledged) in service group "%s"', + 'List %s services which are currently in state CRITICAL (Acknowledged) in service group "%s"', + array($serviceGroup->services_critical_unhandled, $serviceGroup->servicegroup_alias) + ) + ->add( + StateBadges::STATE_UNKNOWN, + $serviceGroup->services_unknown_unhandled, + array( + 'service_state' => 3, + 'service_acknowledged' => 0, + 'service_in_downtime' => 0, + 'host_problem' => 0, + 'servicegroup_name' => $serviceGroup->servicegroup_name, + 'sort' => 'service_severity' + ), + 'List %s service that is currently in state UNKNOWN in service group "%s"', + 'List %s services which are currently in state UNKNOWN in service group "%s"', + array($serviceGroup->services_unknown_unhandled, $serviceGroup->servicegroup_alias) + ) + ->add( + StateBadges::STATE_UNKNOWN_HANDLED, + $serviceGroup->services_unknown_handled, + array( + 'service_state' => 3, + 'service_handled' => 1, + 'servicegroup_name' => $serviceGroup->servicegroup_name, + 'sort' => 'service_severity' + ), + 'List %s service that is currently in state UNKNOWN (Acknowledged) in service group "%s"', + 'List %s services which are currently in state UNKNOWN (Acknowledged) in service group "%s"', + array($serviceGroup->services_unknown_handled, $serviceGroup->servicegroup_alias) - ) - ->add( - StateBadges::STATE_WARNING, - $serviceGroup->services_warning_unhandled, - array( - 'service_state' => 1, - 'service_acknowledged' => 0, - 'service_in_downtime' => 0, - 'host_problem' => 0, - 'servicegroup_name' => $serviceGroup->servicegroup_name, - 'sort' => 'service_severity' - ), - 'List %s service that is currently in state WARNING in service group "%s"', - 'List %s services which are currently in state WARNING in service group "%s"', - array($serviceGroup->services_warning_unhandled, $serviceGroup->servicegroup_alias) - ) - ->add( - StateBadges::STATE_WARNING_HANDLED, - $serviceGroup->services_warning_handled, - array( - 'service_state' => 1, - 'service_handled' => 1, - 'servicegroup_name' => $serviceGroup->servicegroup_name, - 'sort' => 'service_severity' - ), - 'List %s service that is currently in state WARNING (Acknowledged) in service group "%s"', - 'List %s services which are currently in state WARNING (Acknowledged) in service group "%s"', - array($serviceGroup->services_warning_handled, $serviceGroup->servicegroup_alias) - ) - ->add( - StateBadges::STATE_PENDING, - $serviceGroup->services_pending, - array( - 'service_state' => 99, - 'servicegroup_name' => $serviceGroup->servicegroup_name, - 'sort' => 'service_severity' - ), - 'List %s service that is currenlty in state PENDING in service group "%s"', - 'List %s services which are currently in state PENDING in service group "%s"', - array($serviceGroup->services_pending, $serviceGroup->servicegroup_alias) - ); - echo $stateBadges->render(); - ?> + ) + ->add( + StateBadges::STATE_WARNING, + $serviceGroup->services_warning_unhandled, + array( + 'service_state' => 1, + 'service_acknowledged' => 0, + 'service_in_downtime' => 0, + 'host_problem' => 0, + 'servicegroup_name' => $serviceGroup->servicegroup_name, + 'sort' => 'service_severity' + ), + 'List %s service that is currently in state WARNING in service group "%s"', + 'List %s services which are currently in state WARNING in service group "%s"', + array($serviceGroup->services_warning_unhandled, $serviceGroup->servicegroup_alias) + ) + ->add( + StateBadges::STATE_WARNING_HANDLED, + $serviceGroup->services_warning_handled, + array( + 'service_state' => 1, + 'service_handled' => 1, + 'servicegroup_name' => $serviceGroup->servicegroup_name, + 'sort' => 'service_severity' + ), + 'List %s service that is currently in state WARNING (Acknowledged) in service group "%s"', + 'List %s services which are currently in state WARNING (Acknowledged) in service group "%s"', + array($serviceGroup->services_warning_handled, $serviceGroup->servicegroup_alias) + ) + ->add( + StateBadges::STATE_PENDING, + $serviceGroup->services_pending, + array( + 'service_state' => 99, + 'servicegroup_name' => $serviceGroup->servicegroup_name, + 'sort' => 'service_severity' + ), + 'List %s service that is currenlty in state PENDING in service group "%s"', + 'List %s services which are currently in state PENDING in service group "%s"', + array($serviceGroup->services_pending, $serviceGroup->servicegroup_alias) + ); + echo $stateBadges->render(); + ?>
+ + hasMore()): ?> - qlink( +qlink( $this->translate('Show More'), $this->url()->without(array('view', 'limit')), null, array( - 'data-base-target' => '_next', - 'class' => 'pull-right show-more' + 'data-base-target' => '_next', + 'class' => 'pull-right show-more' ) - ) ?> +) ?>