From 59599916b0714930bf7c227ad3ee2e507e86e7cd Mon Sep 17 00:00:00 2001 From: Eric Lippmann Date: Wed, 23 Sep 2015 14:02:39 +0200 Subject: [PATCH] monitoring: Re-indent the list/services view script refs #5543 --- .../views/scripts/list/services.phtml | 188 +++++++++--------- 1 file changed, 98 insertions(+), 90 deletions(-) diff --git a/modules/monitoring/application/views/scripts/list/services.phtml b/modules/monitoring/application/views/scripts/list/services.phtml index 1e88992cd0..f216285c7b 100644 --- a/modules/monitoring/application/views/scripts/list/services.phtml +++ b/modules/monitoring/application/views/scripts/list/services.phtml @@ -5,101 +5,109 @@ use Icinga\Module\Monitoring\Object\Service; $services->peekAhead($this->compact); if (! $this->compact): ?> -
- tabs ?> -
- render('list/components/selectioninfo.phtml') ?> -

compact ? ' data-base-target="col1"' : ''; ?>> - render('list/components/servicesummary.phtml') ?> -

-
- sortBox ?> - limiter ?> - paginator ?> - filterEditor ?> -
+
+ tabs ?> +
+ render('list/components/selectioninfo.phtml') ?> +

compact ? ' data-base-target="col1"' : ''; ?>> + render('list/components/servicesummary.phtml') ?> +

+
+ sortBox ?> + limiter ?> + paginator ?> + filterEditor ?> +
-" - data-icinga-multiselect-controllers="href("monitoring/services") ?>" - data-icinga-multiselect-data="service,host"> - -href( - 'monitoring/service/show', - array( - 'host' => $service->host_name, - 'service' => $service->service_description - ) - ); - $hostLink = $this->href( - 'monitoring/host/show', - array( - 'host' => $service->host_name, - ) - ); - $serviceStateName = Service::getStateText($service->service_state); -?> - - + addColumns as $col): ?> + + + + + +
-

- service_state, true) ?> + + + href( + 'monitoring/service/show', + array( + 'host' => $service->host_name, + 'service' => $service->service_description + ) + ); + $hostLink = $this->href( + 'monitoring/host/show', + array( + 'host' => $service->host_name, + ) + ); + $serviceStateName = Service::getStateText($service->service_state); + ?> + + +

+ - -addColumns as $col): ?> - - - - - -
+

+ service_state, true) ?> service_state !== 99): ?> -
- timeSince($service->service_last_state_change, $this->compact) ?> +
+ timeSince($service->service_last_state_change, $this->compact) ?> service_state > 0 && (int) $service->service_state_type === 0): ?> -
- Soft service_attempt ?> +
+ Soft service_attempt ?> -

-
- iconImage()->service($service) ?> - serviceFlags($service)) ?> -showHost): ?>qlink( - $service->host_display_name . ($service->host_state != 0 ? ' (' . Host::getStateText($service->host_state, true) . ')' : ''), - $hostLink, - null, - array('title' => sprintf($this->translate('Show detailed information for host %s'), $service->host_display_name)) - ) ?>: -qlink( - $service->service_display_name, - $serviceLink, - null, - array( - 'title' => sprintf( - $this->translate('Show detailed information for service %s on host %s'), - $service->service_display_name, - $service->host_display_name - ), - 'class' => 'rowaction' - ) -) ?>
-
perfdata($service->service_perfdata, true, 5) ?>
-

pluginOutput($this->ellipsis($service->service_output, 10000), true) ?>

-
escape($service->$col) ?>
-hasResult()): ?> - translate('No services found matching the filter'); ?> -hasMore()): ?> - qlink( - $this->translate('Show More'), - $this->url()->without(array('view', 'limit')), - null, - array( - 'data-base-target' => '_next', - 'class' => 'pull-right show-more' - ) - ); ?> - +

+ iconImage()->service($service) ?> + serviceFlags($service)) ?> + showHost): ?>qlink( + $service->host_display_name + . ($service->host_state != 0 ? ' (' . Host::getStateText($service->host_state, true) . ')' : ''), + $hostLink, + null, + array( + 'title' => sprintf( + $this->translate('Show detailed information for host %s'), + $service->host_display_name + ) + ) + ) ?>: + qlink( + $service->service_display_name, + $serviceLink, + null, + array( + 'title' => sprintf( + $this->translate('Show detailed information for service %s on host %s'), + $service->service_display_name, + $service->host_display_name + ), + 'class' => 'rowaction' + ) + ) ?>
+
perfdata($service->service_perfdata, true, 5) ?>
+

+ pluginOutput($this->ellipsis($service->service_output, 10000), true) ?> +

+
escape($service->$col) ?>
+ hasResult()): ?> + translate('No services found matching the filter'); ?> + hasMore()): ?> + qlink( + $this->translate('Show More'), + $this->url()->without(array('view', 'limit')), + null, + array( + 'data-base-target' => '_next', + 'class' => 'pull-right show-more' + ) + ) ?> +