From d17842b48561c251ad73df864d6c7821520cad8e Mon Sep 17 00:00:00 2001
From: Eric Lippmann <eric.lippmann@netways.de>
Date: Fri, 22 May 2015 09:33:30 +0200
Subject: [PATCH] monitoring: Fix usage of the dropped DateTimeRenderer

refs #6778
---
 .../partials/downtime/downtime-header.phtml       | 11 +----------
 .../partials/downtime/downtimes-header.phtml      | 15 +++------------
 2 files changed, 4 insertions(+), 22 deletions(-)

diff --git a/modules/monitoring/application/views/scripts/partials/downtime/downtime-header.phtml b/modules/monitoring/application/views/scripts/partials/downtime/downtime-header.phtml
index 92759a12a..8544d36de 100644
--- a/modules/monitoring/application/views/scripts/partials/downtime/downtime-header.phtml
+++ b/modules/monitoring/application/views/scripts/partials/downtime/downtime-header.phtml
@@ -3,16 +3,7 @@
     <td class="state">
       <strong><?= $downtime->is_in_effect ? $this->translate('Expires') : $this->translate('Starts'); ?></strong>
       <br>
-        <?=
-        $this->dateTimeRenderer(
-            ($downtime->is_in_effect ? $downtime->end : $downtime->start),
-            true
-        )->render(
-            $this->translate('on %s', 'datetime'),
-            $this->translate('at %s', 'time'),
-            $this->translate('in %s', 'timespan')
-        );
-        ?>
+      <?= $downtime->is_in_effect ? $this->timeSince($downtime->start, $this->compact) : $this->timeUntil($downtime->start, $this->compact) ?>
     </td>
     <td>
       <small>
diff --git a/modules/monitoring/application/views/scripts/partials/downtime/downtimes-header.phtml b/modules/monitoring/application/views/scripts/partials/downtime/downtimes-header.phtml
index 5518e5022..ddc436c2c 100644
--- a/modules/monitoring/application/views/scripts/partials/downtime/downtimes-header.phtml
+++ b/modules/monitoring/application/views/scripts/partials/downtime/downtimes-header.phtml
@@ -8,16 +8,7 @@
           <td class="state">
             <strong><?= $downtime->is_in_effect ? $this->translate('Expires') : $this->translate('Starts'); ?></strong>
             <br>
-            <?=
-                $this->dateTimeRenderer(
-                    ($downtime->is_in_effect ? $downtime->end : $downtime->start),
-                    true
-                )->render(
-                    $this->translate('on %s', 'datetime'),
-                    $this->translate('at %s', 'time'),
-                    $this->translate('in %s', 'timespan')
-                );
-            ?>
+            <?= $downtime->is_in_effect ? $this->timeSince($downtime->start, $this->compact) : $this->timeUntil($downtime->start, $this->compact) ?>
           </td>
           <td class="name oneline">
             <?php if ($downtime->isService): ?>
@@ -27,7 +18,7 @@
                  <?= $this->icon('host', $this->translate('Host')) ?>
                 <b><?= $downtime->host_name ?>.</b>
             <?php endif; ?>
-                
+
             <?php if ($downtime->is_flexible): ?>
               <?php if ($downtime->is_in_effect): ?>
                 <?= sprintf(
@@ -91,4 +82,4 @@
         )
     ) ?>
     <?php endif ?>
-  </p>
\ No newline at end of file
+  </p>