From e84491d438c36c4023665f7a5f15e28aa934a0c5 Mon Sep 17 00:00:00 2001
From: Matthias Jentsch <matthias.jentsch@netways.de>
Date: Mon, 18 May 2015 14:49:06 +0200
Subject: [PATCH] Improve multi view layout

refs #8565
---
 .../views/scripts/comments/show.phtml         |   2 +-
 .../views/scripts/hosts/show.phtml            | 199 +++++++-------
 .../partials/host/objects-header.phtml        |  14 +-
 .../partials/service/objects-header.phtml     |  17 +-
 .../views/scripts/services/show.phtml         | 253 +++++++++---------
 public/css/icinga/monitoring-colors.less      |   2 +-
 6 files changed, 239 insertions(+), 248 deletions(-)

diff --git a/modules/monitoring/application/views/scripts/comments/show.phtml b/modules/monitoring/application/views/scripts/comments/show.phtml
index 6298749b2..f84f512b1 100644
--- a/modules/monitoring/application/views/scripts/comments/show.phtml
+++ b/modules/monitoring/application/views/scripts/comments/show.phtml
@@ -19,7 +19,7 @@
     <div>
     <?= $this->qlink(
         sprintf(
-            $this->translate('Remove all %d scheduled comments'),
+            $this->translate('Remove %d comments'),
             count($comments)
         ),
         $removeAllLink,
diff --git a/modules/monitoring/application/views/scripts/hosts/show.phtml b/modules/monitoring/application/views/scripts/hosts/show.phtml
index a5e1cff38..45bf19ebb 100644
--- a/modules/monitoring/application/views/scripts/hosts/show.phtml
+++ b/modules/monitoring/application/views/scripts/hosts/show.phtml
@@ -13,66 +13,61 @@
         <?= $this->icon('reschedule') ?>
         <?= $this->translate('Commands') ?>
     </h3>
+
+    <p>
     <?= sprintf($this->translatePlural(
         'Issue commands to %s selected host:',
         'Issue commands to all %s selected hosts:',
         count($objects)
     ), '<b>' . count($objects) . '</b>') ?>
+    </p>
 
     <?php if (($hostCount = count($objects)) === 0): ?>
         <?= $this->translate('No hosts found matching the filter'); ?>
     <?php else: ?>
+        <?= $checkNowForm; ?>
 
-      <p>
-        <div>
-            <?= $checkNowForm; ?>
-        </div>
+        <br>
+        <?= $this->qlink(
+            $this->translate('Reschedule next checks'),
+            $rescheduleAllLink,
+            null,
+            array('icon' => 'reschedule')
+        ); ?>
 
-        <div>
-            <?= $this->qlink(
-                $this->translate('Reschedule next checks'),
-                $rescheduleAllLink,
-                null,
-                array('icon' => 'reschedule')
-            ); ?>
-        </div>
+        <br>
+        <?= $this->qlink(
+            $this->translate('Schedule downtimes'),
+            $downtimeAllLink,
+            null,
+            array('icon' => 'plug')
+        ); ?>
 
-        <div>
-            <?= $this->qlink(
-                $this->translate('Schedule downtimes'),
-                $downtimeAllLink,
-                null,
-                array('icon' => 'plug')
-            ); ?>
-        </div>
+        <br>
+        <?= $this->qlink(
+            $this->translate('Submit passive check results'),
+            $processCheckResultAllLink,
+            null,
+            array('icon' => 'reply')
+        ); ?>
 
-        <div>
-            <?= $this->qlink(
-                $this->translate('Submit passive check results'),
-                $processCheckResultAllLink,
-                null,
-                array('icon' => 'reply')
-            ); ?>
-        </div>
-
-        <div>
-            <?= $this->qlink(
-                $this->translate('Add comments'),
-                $addCommentLink,
-                null,
-                array('icon' => 'comment')
-            ); ?>
-        </div>
+        <br>
+        <?= $this->qlink(
+            $this->translate('Add comments'),
+            $addCommentLink,
+            null,
+            array('icon' => 'comment')
+        ); ?>
 
         <?php if ($this->hasPermission('monitoring/command/send-custom-notification')): ?>
-            <div><?= $this->qlink(
+            <br>
+            <?= $this->qlink(
                     sprintf($this->translate('Send a custom notification for all %u hosts'), $hostCount),
                     $sendCustomNotificationLink,
                     null,
                     array('icon' => 'comment')
-            ); ?></div>
+            ); ?>
         <?php endif; ?>
-      </p>
 
         <?php
             $unhandledCount = count($unhandledObjects);
@@ -80,7 +75,6 @@
         ?>
 
         <?php if ($problemCount || $unhandledCount): ?>
-        <div>
             <h3>
                 <?= $this->icon('attention-alt') ?>
                 <?= $this->translatePlural(
@@ -92,16 +86,16 @@
 
             <?php if ($problemCount): ?>
                 <p>
-                    <?= sprintf(
-                        $this->translatePlural(
-                            'There is %s problem, issue commands to the problematic host:',
-                            'There are %s problems, issue commands to the problematic hosts:',
-                            $problemCount
-                        ),
-                        '<b>' . $problemCount . '</b>'
-                    ); ?>
-
-                <div><?= $this->qlink(
+                <?= sprintf(
+                    $this->translatePlural(
+                        'There is %s problem.',
+                        'There are %s problems.',
+                        $problemCount
+                    ),
+                    '<b>' . $problemCount . '</b>'
+                ); ?>
+                </p>
+                <?= $this->qlink(
                         sprintf(
                             $this->translatePlural(
                                 'Schedule a downtime for %u problem host',
@@ -113,13 +107,11 @@
                         $downtimeLink,
                         null,
                         array('icon' => 'plug')
-                    ); ?></div>
-
-                </p>
+                ); ?>
             <?php endif; ?>
 
             <?php if ($unhandledCount): ?>
-            <p>
+              <p>
               <?= sprintf(
                   $this->translatePlural(
                       'There is %s unhandled problem host, issue commands to the problematic host:',
@@ -128,8 +120,9 @@
                   ),
                   '<span class="badge badge-critical">' . $unhandledCount . '</span>'
               ); ?>
+              </p>
 
-              <div><?= $this->qlink(
+              <?= $this->qlink(
                   sprintf(
                       $this->translatePlural(
                           'Schedule a downtime for %u unhandled problem host',
@@ -141,10 +134,10 @@
                   $downtimeUnhandledLink,
                   null,
                   array('icon' => 'plug')
-              ); ?></div>
+              ); ?>
 
-
-              <div><?= $this->qlink(
+              <br>
+              <?= $this->qlink(
                     sprintf(
                         $this->translatePlural(
                             'Acknowledge %u unhandled problem host',
@@ -156,19 +149,16 @@
                     $acknowledgeUnhandledLink,
                     null,
                     array('icon' => 'ok')
-              ); ?></div>
-            </p>
+              ); ?>
 
             <?php endif; ?>
-
-        </div>
         <?php endif;?>
 
       <?php if (($acknowledgedCount = count($acknowledgedObjects)) > 0): ?>
         <div>
             <h3><?= $this->icon('ok', $this->translate('Acknowledgements')) ?> <?= $this->translate('Acknowledgements') ?></h3>
 
-            <p><?= sprintf(
+            <?= sprintf(
                 $this->translatePlural(
                     '%s Acknowledged Host Problem',
                     '%s Acknowledged Host Problems',
@@ -181,57 +171,60 @@
         </div>
       <?php endif ?>
 
-      <?php if (($inDowntimeCount = count($objectsInDowntime)) > 0): ?>
+      <?php $scheduledDowntimeCount = count($objects->getScheduledDowntimes()) ?>
 
-        <h3><?= $this->icon('plug', $this->translate('Downtimes'))?> <?=$this->translate('Downtimes')?></h3>
-        <p><?= sprintf(
-                $this->translatePlural(
-                    '%s Host currently in downtime.',
-                    '%s Hosts currently in downtime.',
-                    $inDowntimeCount
+      <?php if ($scheduledDowntimeCount): ?>
+          <h3><?= $this->icon('plug', $this->translate('Downtimes'))?> <?=$this->translate('Downtimes')?></h3>
+            <?= $this->qlink(
+                sprintf(
+                    $this->translatePlural(
+                        '%s scheduled downtime',
+                        '%s scheduled downtimes',
+                        $scheduledDowntimeCount
+                    ),
+                    $scheduledDowntimeCount
                 ),
-                '<b>' . $inDowntimeCount . '</b>'
-        ) ?>   <?= $this->qlink(
-                $this->translate('List all'),
-                $inDowntimeLink,
+                $showDowntimesLink,
                 null,
                 array('data-base-target' => '_next')
-            ); ?>
+            );?>
+            <?= sprintf($this->translate('on all selected hosts.')) ?>
 
-        </p>
+            <?php if (($inDowntimeCount = count($objectsInDowntime)) > 0): ?>
+                <br>
+                <?= $this->qlink(
+                    sprintf(
+                        $this->translatePlural(
+                            '%s host',
+                            '%s hosts',
+                            $inDowntimeCount
+                        ),
+                        $inDowntimeCount
+                    ),
+                    $inDowntimeLink,
+                    null,
+                    array('data-base-target' => '_next')
+                ); ?>
+            <?= $this->translate('are currently in downtime.') ?>
+            <?php endif; ?>
       <?php endif ?>
 
       <?php if (($commentCount = count($objects->getComments())) > 0): ?>
         <h3> <?= $this->icon('comment', $this->translate('Comments'))?> <?=$this->translate('Comments') ?></h3>
-        <p>
-            <?= sprintf(
+        <?= $this->qlink(
+            sprintf(
                 $this->translatePlural(
-                    'There is %s host comment.',
-                    'There are %s host comments.',
+                    '%s comment',
+                    '%s comments',
                     $commentCount
                 ),
-                '<b>' . $commentCount . '</b>'
-            ) ?>
-
-            <?= $this->qlink(
-                $this->translate('List all'),
-                $commentsLink,
-                null,
-                array('data-base-target' => '_next')
-            ); ?>
-
-        </p>
-
-        <!--
-        <p>
-        <div><?= $this->qlink(
-                $this->translate('Remove all'),
-                $deleteCommentLink,
-                null,
-                array('icon' => 'trash')
-            ); ?></div>
-        </p>
-        -->
+                $commentCount
+            ),
+            $commentsLink,
+            null,
+            array('data-base-target' => '_next')
+        ); ?>
+        <?= $this->translate('on all selected hosts.') ?>
       <?php endif ?>
 
     <?php endif ?>
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 ef48eefe0..17cf9f7fe 100644
--- a/modules/monitoring/application/views/scripts/partials/host/objects-header.phtml
+++ b/modules/monitoring/application/views/scripts/partials/host/objects-header.phtml
@@ -5,22 +5,22 @@ $i = 0;
 ?>
 
 <?php if (($hostCount = count($objects)) > 0): ?>
-    <table class="state statesummary">
-
+    <table class="action state statesummary">
         <tbody>
         <?php foreach ($objects as $host): /** @var Host $host */ ?>
             <?php
-            $i++;
-            if ($i > 5) {
+            if (++ $i > 5) {
                 continue;
             }
             ?>
 
             <tr class="state <?= Host::getStateText($host->host_state); ?><?= $host->host_handled ? ' handled' : '' ?>">
                 <td class="state"><?= Host::getStateText($host->host_state, true); ?><br /></td>
-                <td><?= implode(' ', $this->hostFlags($host)) ?></td>
-                <td class="name oneline"><?= $this->escape($host->getName()); ?></td>
-                <td><?= $this->escape($host->host_output) ?></td>
+                <td>
+                <?= implode(' ', $this->hostFlags($host)) ?>
+                <b><?= $this->escape($host->getName()); ?></b><br>
+                <?= $this->escape($host->host_output) ?>
+                </td>
             </tr>
         <?php endforeach ?>
     </tbody>
diff --git a/modules/monitoring/application/views/scripts/partials/service/objects-header.phtml b/modules/monitoring/application/views/scripts/partials/service/objects-header.phtml
index 7c707f0bf..e3c1227f3 100644
--- a/modules/monitoring/application/views/scripts/partials/service/objects-header.phtml
+++ b/modules/monitoring/application/views/scripts/partials/service/objects-header.phtml
@@ -4,20 +4,25 @@ use Icinga\Module\Monitoring\Object\Service;
 $i = 0;
 ?>
 <?php if (($serviceCount = count($objects)) > 0): ?>
-    <table class="state statesummary">
+    <table class="action state statesummary">
     <tbody>
     <?php foreach ($objects as $service): /** @var Service $service */ ?>
         <?php
-        if ($i ++ > 5) {
+        if (++ $i > 5) {
             continue;
         }
         ?>
         <tr class="state <?= Service::getStateText($service->service_state); ?><?= $service->service_handled ? ' handled' : '' ?>">
             <td class="state"><?= Service::getStateText($service->service_state, true); ?><br /></td>
-            <td><?= implode(' ', $this->serviceFlags($service)) ?></td>
-            <td class="name oneline"><?= $this->escape($service->getName()); ?></td>
-            <td class="name oneline"><?= $this->escape($service->getHost()->getName()); ?></b></td>
-            <td><?= $this->escape($service->service_output) ?></td>
+            <td>
+            <?= implode(' ', $this->serviceFlags($service)) ?>
+            <b>
+               <?= $this->escape($service->getName()); ?>
+               <?= $this->translate('on') ?>
+               <?= $this->escape($service->getHost()->getName()); ?><br>
+            </b>
+            <?= $this->escape($service->service_output) ?>
+            </td>
         </tr>
     <?php endforeach ?>
     </tbody>
diff --git a/modules/monitoring/application/views/scripts/services/show.phtml b/modules/monitoring/application/views/scripts/services/show.phtml
index 5159e65b3..9291f6ef3 100644
--- a/modules/monitoring/application/views/scripts/services/show.phtml
+++ b/modules/monitoring/application/views/scripts/services/show.phtml
@@ -17,62 +17,55 @@
     <?php if (($serviceCount = count($objects)) === 0): ?>
         <?= $this->translate('No services found matching the filter'); ?>
     <?php else: ?>
+        <p>
         <?= sprintf($this->translatePlural(
             'Issue commands to %s selected service:',
             'Issue commands to all %s selected services:',
             count($objects)
         ), '<b>' . count($objects) . '</b>') ?>
+        </p>
+        <?= $checkNowForm; ?>
+        <br>
+        <?= $this->qlink(
+            $this->translate('Reschedule next checks'),
+            $rescheduleAllLink,
+            null,
+            array('icon' => 'reschedule')
+        ); ?>
 
-        <p>
-        <div>
-            <?= $checkNowForm; ?>
-        </div>
+        <br>
+        <?= $this->qlink(
+            $this->translate('Schedule downtimes'),
+            $downtimeAllLink,
+            null,
+            array('icon' => 'plug')
+        ); ?>
 
-        <div>
-            <?= $this->qlink(
-                $this->translate('Reschedule next checks'),
-                $rescheduleAllLink,
-                null,
-                array('icon' => 'reschedule')
-            ); ?>
-        </div>
+        <br>
+        <?= $this->qlink(
+            $this->translate('Submit passive check results'),
+            $processCheckResultAllLink,
+            null,
+            array('icon' => 'reply')
+        ); ?>
 
-        <div>
-            <?= $this->qlink(
-                $this->translate('Schedule downtimes'),
-                $downtimeAllLink,
-                null,
-                array('icon' => 'plug')
-            ); ?>
-        </div>
-
-        <div>
-            <?= $this->qlink(
-                $this->translate('Submit passive check results'),
-                $processCheckResultAllLink,
-                null,
-                array('icon' => 'reply')
-            ); ?>
-        </div>
-
-        <div>
-            <?= $this->qlink(
-                $this->translate('Add comments'),
-                $addCommentLink,
-                null,
-                array('icon' => 'comment')
-            ); ?>
-        </div>
+        <br>
+        <?= $this->qlink(
+            $this->translate('Add comments'),
+            $addCommentLink,
+            null,
+            array('icon' => 'comment')
+        ); ?>
 
         <?php if ($this->hasPermission('monitoring/command/send-custom-notification')): ?>
-            <div><?= $this->qlink(
+            <br>
+            <?= $this->qlink(
                     sprintf($this->translate('Send a custom notification for all %u services'), $serviceCount),
                     $sendCustomNotificationLink,
                     null,
                     array('icon' => 'comment')
-                ); ?></div>
+            ); ?>
         <?php endif; ?>
-        </p>
 
         <?php
             $unhandledCount = count($unhandledObjects);
@@ -88,66 +81,65 @@
 
             <?php if ($problemCount): ?>
                 <p>
-                    <?= sprintf(
+                <?= sprintf(
+                    $this->translatePlural(
+                        'There is %s problem, issue commands to the problem service',
+                        'There are %s problems, issue commands to the problem services',
+                        $problemCount
+                    ),
+                    '<b>' . $problemCount . '</b>'
+                ); ?>
+                </p>
+                <?= $this->qlink(
+                    sprintf(
                         $this->translatePlural(
-                            'There is %s problem, issue commands to the problem service',
-                            'There are %s problems, issue commands to the problem services',
+                            'Schedule a downtime for %s problem service',
+                            'Schedule downtimes for %s problem services',
                             $problemCount
                         ),
-                        '<b>' . $problemCount . '</b>'
-                    ); ?>
-
-                <div>
-                    <?= $this->qlink(
-                        sprintf(
-                            $this->translatePlural(
-                                'Schedule a downtime for %s problem service',
-                                'Schedule downtimes for %s problem services',
-                                $problemCount
-                            ),
-                            $problemCount
-                        ),
-                        $downtimeLink,
-                        null,
-                        array('icon' => 'plug')
-                    ); ?>
-                </div>
+                        $problemCount
+                    ),
+                    $downtimeLink,
+                    null,
+                    array('icon' => 'plug')
+                ); ?>
             <?php endif ?>
 
             <?php if ($unhandledCount): ?>
-                <p><?= sprintf($this->translate('There are %s unhandled problems. ' .
+                <p>
+                <?= sprintf($this->translate('There are %s unhandled problem services. ' .
                         'Issue commands to the problematic services:'),
                         '<span class="badge badge-critical">' . $unhandledCount . '</span>') ?>
-                    <div>
-                    <?= $this->qlink(
-                        sprintf(
-                            $this->translatePlural(
-                                'Schedule a downtime for %u unhandled service problem',
-                                'Schedule a downtime for %u unhandled service problems',
-                                $unhandledCount
-                            ),
-                            $unhandledCount
-                        ),
-                        $downtimeUnhandledLink,
-                        null,
-                        array('icon' => 'plug')
-                    ); ?>
-                    </div>
 
-                    <div><?= $this->qlink(
-                        sprintf(
-                            $this->translatePlural(
-                                'Acknowledge %u unhandled service problem',
-                                'Acknowledge %u unhandled service problems',
-                                $unhandledCount
-                            ),
+                </p>
+                <?= $this->qlink(
+                    sprintf(
+                        $this->translatePlural(
+                            'Schedule a downtime for %u unhandled problem service',
+                            'Schedule a downtime for %u unhandled problem services',
                             $unhandledCount
                         ),
-                        $acknowledgeUnhandledLink,
-                        null,
-                        array('icon' => 'ok')
-                    ); ?></div>
-                </p>
+                        $unhandledCount
+                    ),
+                    $downtimeUnhandledLink,
+                    null,
+                    array('icon' => 'plug')
+                ); ?>
+
+                <br>
+                <?= $this->qlink(
+                    sprintf(
+                        $this->translatePlural(
+                            'Acknowledge %u unhandled problem service',
+                            'Acknowledge %u unhandled problem services',
+                            $unhandledCount
+                        ),
+                        $unhandledCount
+                    ),
+                    $acknowledgeUnhandledLink,
+                    null,
+                    array('icon' => 'ok')
+                ); ?>
             <?php endif ?>
 
         </div>
@@ -167,55 +159,56 @@
         </p>
     <?php endif ?>
 
+    <?php $scheduledDowntimeCount = count($objects->getScheduledDowntimes()) ?>
 
-    <?php if (($inDowntimeCount = count($objectsInDowntime)) > 0 /*&& $auth->hasPermission('monitoring/command/comment/delete')*/): ?>
-        <h3>  <?= $this->icon('plug', $this->translate('Downtimes')) ?> <?= $this->translate('Downtimes') ?>  </h3>
-        <p> <?= sprintf($this->translatePlural(
-                '%s service currently in downtime.',
-                '%s services currently in downtime.',
-                $inDowntimeCount
-            ), '<b>' . $inDowntimeCount . '</b>') ?>
+    <?php if ($scheduledDowntimeCount): ?>
+    <h3><?= $this->icon('plug', $this->translate('Downtimes')) ?> <?= $this->translate('Downtimes') ?></h3>
+        <?= $this->qlink(
+            sprintf(
+                $this->translatePlural(
+                    '%s scheduled downtime',
+                    '%s scheduled downtimes',
+                    $scheduledDowntimeCount
+                ),
+                $scheduledDowntimeCount
+            ),
+            $showDowntimesLink,
+            null,
+            array('data-base-target' => '_next')
+        );?>
+        <?= sprintf($this->translate('on all selected services.')) ?>
 
+        <?php if (($inDowntimeCount = count($objectsInDowntime)) > 0): ?>
+            <br>
             <?= $this->qlink(
-                $this->translate('List all'),
+                sprintf($this->translatePlural(
+                    '%s service',
+                    '%s services',
+                    $inDowntimeCount
+                ), $inDowntimeCount),
                 $inDowntimeLink,
                 null,
                 array('data-base-target' => '_next')
             );?>
-        </p>
+            <?= sprintf($this->translate('are currently in downtime.')) ?>
+        <?php endif ?>
     <?php endif ?>
 
-
-<?php $commentCount = count($objects->getComments()) ?>
-<?php if ($commentCount > 0): ?>
-    <h3> <?= $this->icon('comment') ?> <?= $this->translate('Comments') ?> </h3>
-    <p><?= sprintf(
-            $this->translatePlural(
-                'There is %s comment.',
-                'There are %s comments.',
-                $commentCount
-            ), '<b>' . $commentCount . '</b>');
-    ?>
-    <?= $this->qlink(
-        $this->translate('List all'),
-        $commentsLink,
-        null,
-        array('data-base-target' => '_next')
-    ); ?>
-    <p>
-
-    <!--
-    </p>
-    <div><?= $this->qlink(
-            $this->translate('Remove all'),
-            $deleteCommentLink,
+    <?php $commentCount = count($objects->getComments()) ?>
+    <?php if ($commentCount > 0): ?>
+        <h3> <?= $this->icon('comment') ?> <?= $this->translate('Comments') ?> </h3>
+        <?= $this->qlink(
+            sprintf(
+                $this->translatePlural(
+                    '%s comment.',
+                    '%s comments.',
+                    $commentCount
+            ), $commentCount),
+            $commentsLink,
             null,
-            array('icon' => 'trash')
-    ); ?></div>
-    </p>
-    -->
-
-    <?php endif ?>
-
+            array('data-base-target' => '_next')
+        ); ?>
+        <?= $this->translate('on all selected services.') ?>
     <?php endif ?>
+<?php endif ?>
 </div>
diff --git a/public/css/icinga/monitoring-colors.less b/public/css/icinga/monitoring-colors.less
index 3078fdec7..4902bebb1 100644
--- a/public/css/icinga/monitoring-colors.less
+++ b/public/css/icinga/monitoring-colors.less
@@ -944,7 +944,7 @@ table.statesummary {
   }
 
   td {
-    font-size: 0.85em;
+    font-size: 0.9em;
     line-height: 1.2em;
     padding-left: 0.2em;
     margin: 0;