From ad8cffcbbd75bd78a78c0f9065a2df1b14250bec Mon Sep 17 00:00:00 2001
From: Eric Lippmann <eric.lippmann@netways.de>
Date: Thu, 31 Mar 2016 09:59:36 +0200
Subject: [PATCH] monitoring: Update content markup in servicegroups

---
 .../views/scripts/list/servicegroups.phtml    | 310 +++++++++---------
 1 file changed, 156 insertions(+), 154 deletions(-)

diff --git a/modules/monitoring/application/views/scripts/list/servicegroups.phtml b/modules/monitoring/application/views/scripts/list/servicegroups.phtml
index 3bb9502aa..1100d7b0d 100644
--- a/modules/monitoring/application/views/scripts/list/servicegroups.phtml
+++ b/modules/monitoring/application/views/scripts/list/servicegroups.phtml
@@ -12,163 +12,165 @@ if (! $this->compact): ?>
 </div>
 <?php endif ?>
 <div class="content">
-<?php if (! $servicegroups->hasResult()): ?>
+<?php if (! $serviceGroups->hasResult()): ?>
     <p><?= $this->translate('No service groups found matching the filter.') ?></p>
 </div>
 <?php return; endif ?>
-<table class="table-row-selectable common-table" data-base-target="_next">
-<thead>
-    <tr>
-        <th></th>
-        <th><?= $this->translate('Service Group') ?></th>
-        <th><?= $this->translate('Service States') ?></th>
-    </tr>
-</thead>
-<tbody>
-<?php foreach ($servicegroups->peekAhead($this->compact) as  $serviceGroup): ?>
-    <tr>
-        <td class="count-col">
-            <span class="badge"><?= $serviceGroup->services_total ?></span>
-        </td>
-        <th>
-            <?= $this->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))
-            ) ?>
-        </th>
-        <td>
-            <?php
-            $stateBadges = new StateBadges();
-            $stateBadges
-                ->setUrl('monitoring/list/services')
-                ->setBaseFilter($this->filterEditor->getFilter())
-                ->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)
+    <table class="table-row-selectable common-table" data-base-target="_next">
+    <thead>
+        <tr>
+            <th></th>
+            <th><?= $this->translate('Service Group') ?></th>
+            <th><?= $this->translate('Service States') ?></th>
+        </tr>
+    </thead>
+    <tbody>
+    <?php foreach ($serviceGroups->peekAhead($this->compact) as  $serviceGroup): ?>
+        <tr>
+            <td class="count-col">
+                <span class="badge"><?= $serviceGroup->services_total ?></span>
+            </td>
+            <th>
+                <?= $this->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))
+                ) ?>
+            </th>
+            <td>
+                <?php
+                $stateBadges = new StateBadges();
+                $stateBadges
+                    ->setUrl('monitoring/list/services')
+                    ->setBaseFilter($this->filterEditor->getFilter())
+                    ->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();
-            ?>
-        </td>
-    </tr>
-<?php endforeach ?>
-</tbody>
-</table>
-<?php if ($servicegroups->hasMore()): ?>
-<?= $this->qlink(
-    $this->translate('Show More'),
-    $this->url()->without(array('view', 'limit')),
-    null,
-    array(
-        'data-base-target'    => '_next',
-        'class'               => 'pull-right action-link'
-    )
-) ?>
+                    )
+                    ->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();
+                ?>
+            </td>
+        </tr>
+    <?php endforeach ?>
+    </tbody>
+    </table>
+<?php if ($serviceGroups->hasMore()): ?>
+<div class="action-links">
+    <?= $this->qlink(
+        $this->translate('Show More'),
+        $this->url()->without(array('view', 'limit')),
+        null,
+        array(
+            'class'             => 'action-link',
+            'data-base-target'  => '_next'
+        )
+    ) ?>
+</div>
 <?php endif ?>
 </div>