From 863330e50d3aa79baed55915f237bb028e10be70 Mon Sep 17 00:00:00 2001
From: Alexander Fuhr <alexander.fuhr@netways.de>
Date: Mon, 3 Aug 2015 12:37:09 +0200
Subject: [PATCH] components/downtime: Add downtime end time information in
 view

fixes #8845
---
 .../views/scripts/show/components/downtime.phtml           | 7 ++++++-
 modules/monitoring/public/css/module.less                  | 2 +-
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/modules/monitoring/application/views/scripts/show/components/downtime.phtml b/modules/monitoring/application/views/scripts/show/components/downtime.phtml
index 46b0f5a3a..e4341d45a 100644
--- a/modules/monitoring/application/views/scripts/show/components/downtime.phtml
+++ b/modules/monitoring/application/views/scripts/show/components/downtime.phtml
@@ -103,7 +103,12 @@ if (isset($delDowntimeForm)) {
         <li class="comment-item">
             <h3>
                 <span class="author"><?= $this->escape($downtime->author_name) ?></span>
-                <?= $this->timeAgo($downtime->entry_time) ?>
+                <span class="info">
+                <? printf($this->translate('Added %s.'), $this->timeAgo($downtime->entry_time)) ?>
+                <? if ($downtime->is_in_effect) {
+                    printf($this->translate('Expires %s.'),  $this->timeUntil($downtime->end));
+                } ?>
+                </span>
                 <?= $deleteButton ?>
             </h3>
             <p>            <span class="sr-only"><?= $this->translate('Downtime'); ?></span><?= $state; ?> - <?= str_replace(array('\r\n', '\n'), '<br>', $commentText); ?></p>
diff --git a/modules/monitoring/public/css/module.less b/modules/monitoring/public/css/module.less
index 406031c19..0aa5ddb66 100644
--- a/modules/monitoring/public/css/module.less
+++ b/modules/monitoring/public/css/module.less
@@ -263,7 +263,7 @@ td.state {
     margin: 0;
     font-size: 0.857em;
 
-    .time-ago {
+    .info {
         font-style: italic;
         color: #919191;
     }