From e1433505b3b14dded31307ded90df8b8b08e1f65 Mon Sep 17 00:00:00 2001
From: Eric Lippmann <eric.lippmann@netways.de>
Date: Fri, 20 Nov 2015 15:43:29 +0100
Subject: [PATCH] monitoring: Update comment-list styles in
 acknowledgement.phtml

---
 .../show/components/acknowledgement.phtml     | 23 ++++++++-----------
 1 file changed, 10 insertions(+), 13 deletions(-)

diff --git a/modules/monitoring/application/views/scripts/show/components/acknowledgement.phtml b/modules/monitoring/application/views/scripts/show/components/acknowledgement.phtml
index a48aac86d..3fd254e14 100644
--- a/modules/monitoring/application/views/scripts/show/components/acknowledgement.phtml
+++ b/modules/monitoring/application/views/scripts/show/components/acknowledgement.phtml
@@ -16,9 +16,9 @@ $acknowledgement = $object->acknowledgement;
     <td data-base-target="_self">
         <?php if ($acknowledgement): ?>
         <dl class="comment-list">
-            <dt class="comment-header">
+            <dt>
                 <?= $this->escape($acknowledgement->getAuthor()) ?>
-                <span class="comment-meta">
+                <span class="comment-time">
                     <?= $this->translate('acknowledged') ?>
                     <?= $this->timeAgo($acknowledgement->getEntryTime()) ?>
                 <?php if ($acknowledgement->expires()): ?>
@@ -28,6 +28,7 @@ $acknowledgement = $object->acknowledgement;
                         $this->timeUntil($acknowledgement->getExpirationTime())
                     ) ?>
                 <?php endif ?>
+                </span>
                 <?php if ($acknowledgement->getSticky()): ?>
                     <?= $this->icon('pin', sprintf(
                         $this->translate(
@@ -36,18 +37,14 @@ $acknowledgement = $object->acknowledgement;
                         $object->getType(true)
                     )) ?>
                 <?php endif ?>
-                <?php if (isset($removeAckForm)): // Form is unset if the current user lacks the respective permission ?>
-                    <span class="meta-icons">
-                        <?php
-                        $removeAckForm->setAttrib('class', $removeAckForm->getAttrib('class') . ' remove-action');
-                        echo $removeAckForm;
-                        ?>
-                    </span>
-                <?php endif ?>
-                </span>
+                <?php if (isset($removeAckForm)) {
+                    // Form is unset if the current user lacks the respective permission
+                    $removeAckForm->setAttrib('class', $removeAckForm->getAttrib('class') . ' remove-action');
+                    echo $removeAckForm;
+                } ?>
             </dt>
-            <dd class="comment-text">
-                <p><?= nl2br($this->createTicketLinks($this->escape($acknowledgement->getComment())), false) ?></p>
+            <dd>
+                <?= nl2br($this->createTicketLinks($this->escape($acknowledgement->getComment())), false) ?>
             </dd>
         </dl>
         <?php else: ?>