From b3587b74393f9bc7dba721165c16c3a2e1b17d8e Mon Sep 17 00:00:00 2001
From: Eric Lippmann <eric.lippmann@netways.de>
Date: Fri, 20 Nov 2015 15:14:54 +0100
Subject: [PATCH] monitoring: Don't use pull-right in the comment overview for
 the show more link

Further, indent the view script w/ 4 spaces, remove class separated and don't render the table if there are no comments.
---
 .../views/scripts/list/comments.phtml         | 68 ++++++++++---------
 1 file changed, 36 insertions(+), 32 deletions(-)

diff --git a/modules/monitoring/application/views/scripts/list/comments.phtml b/modules/monitoring/application/views/scripts/list/comments.phtml
index b98bdd3a0..ad104e156 100644
--- a/modules/monitoring/application/views/scripts/list/comments.phtml
+++ b/modules/monitoring/application/views/scripts/list/comments.phtml
@@ -1,5 +1,5 @@
 <?php if (! $this->compact): ?>
-<div class="controls separated dont-print">
+<div class="controls">
     <?= $tabs ?>
     <?= $this->render('list/components/selectioninfo.phtml') ?>
     <div class="grid">
@@ -11,40 +11,44 @@
 </div>
 <?php endif ?>
 <div class="content">
-  <table data-base-target="_next"
-         class="table-row-selectable common-table multiselect"
-         data-icinga-multiselect-url="<?= $this->href('monitoring/comments/show'); ?>"
-         data-icinga-multiselect-related="<?= $this->href("monitoring/comments") ?>"
-         data-icinga-multiselect-data="comment_id">
+<?php if (! $comments->hasResult()): ?>
+    <p><?= $this->translate('No comments found matching the filter') ?></p>
+</div>
+<?php return; endif ?>
+    <table data-base-target="_next"
+           class="table-row-selectable common-table multiselect"
+           data-icinga-multiselect-url="<?= $this->href('monitoring/comments/show') ?>"
+           data-icinga-multiselect-related="<?= $this->href("monitoring/comments") ?>"
+           data-icinga-multiselect-data="comment_id">
     <tbody>
     <?php foreach ($comments->peekAhead($this->compact) as $comment): ?>
-      <tr href="<?=  $this->href('monitoring/comment/show', array('comment_id' => $comment->id)) ?>">
-        <td class="icon-col">
-          <?= $this->partial('partials/comment/comment-description.phtml', array('comment' => $comment)); ?>
-        </td>
-        <td>
-          <?= $this->partial(
-              'partials/comment/comment-detail.phtml',
-              array(
-                  'comment'        => $comment,
-                  'delCommentForm' => $delCommentForm // Form is unset if the current user lacks the respective permission
-          )) ?>
-        </td>
-      </tr>
+        <tr href="<?=  $this->href('monitoring/comment/show', array('comment_id' => $comment->id)) ?>">
+            <td class="icon-col">
+                <?= $this->partial('partials/comment/comment-description.phtml', array('comment' => $comment)) ?>
+            </td>
+            <td>
+                <?= $this->partial(
+                    'partials/comment/comment-detail.phtml',
+                    array(
+                        'comment'        => $comment,
+                        'delCommentForm' => $delCommentForm // Form is unset if the current user lacks the respective permission
+                )) ?>
+            </td>
+        </tr>
     <?php endforeach ?>
     </tbody>
-  </table>
-<?php if (! $comments->hasResult()): ?>
-  <?= $this->translate('No comments found matching the filter'); ?>
-<?php elseif ($comments->hasMore()): ?>
-  <?= $this->qlink(
-    $this->translate('Show More'),
-    $this->url()->without(array('view', 'limit')),
-    null,
-    array(
-      'data-base-target'    => '_next',
-      'class'               => 'pull-right action-link'
-    )
-  ); ?>
+    </table>
+<?php if ($comments->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>