From 7212c038f17f4b8c134234ca77d97d6226283cc3 Mon Sep 17 00:00:00 2001
From: Eric Lippmann <eric.lippmann@netways.de>
Date: Tue, 19 May 2015 10:00:27 +0200
Subject: [PATCH] Don't show ago, since, ... for monitoring list views in the
 dashboard

refs #6778
---
 .../monitoring/application/views/scripts/list/comments.phtml    | 2 +-
 .../monitoring/application/views/scripts/list/downtimes.phtml   | 2 +-
 .../application/views/scripts/list/eventhistory.phtml           | 2 +-
 modules/monitoring/application/views/scripts/list/hosts.phtml   | 2 +-
 .../application/views/scripts/list/notifications.phtml          | 2 +-
 .../monitoring/application/views/scripts/list/services.phtml    | 2 +-
 6 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/modules/monitoring/application/views/scripts/list/comments.phtml b/modules/monitoring/application/views/scripts/list/comments.phtml
index d74405f59..4a315a8a8 100644
--- a/modules/monitoring/application/views/scripts/list/comments.phtml
+++ b/modules/monitoring/application/views/scripts/list/comments.phtml
@@ -48,7 +48,7 @@
           <br>
           <strong><?= $this->escape($title); ?></strong>
           <br>
-          <?= $this->timeAgo($comment->timestamp); ?>
+          <?= $this->timeAgo($comment->timestamp, $this->compact); ?>
         </td>
         <td>
         <?php if ($comment->objecttype === 'service'): ?>
diff --git a/modules/monitoring/application/views/scripts/list/downtimes.phtml b/modules/monitoring/application/views/scripts/list/downtimes.phtml
index 0c1352aa5..25d68b459 100644
--- a/modules/monitoring/application/views/scripts/list/downtimes.phtml
+++ b/modules/monitoring/application/views/scripts/list/downtimes.phtml
@@ -42,7 +42,7 @@ use Icinga\Module\Monitoring\Object\Service;
         <td class="state">
           <strong><?= $downtime->is_in_effect ? $this->translate('Expires') : $this->translate('Starts'); ?></strong>
           <br>
-          <?= $downtime->is_in_effect ? $this->timeSince($downtime->start) : $this->timeUntil($downtime->start) ?>
+          <?= $downtime->is_in_effect ? $this->timeSince($downtime->start, $this->compact) : $this->timeUntil($downtime->start, $this->compact) ?>
         </td>
         <td>
         <?php if ($isService): ?>
diff --git a/modules/monitoring/application/views/scripts/list/eventhistory.phtml b/modules/monitoring/application/views/scripts/list/eventhistory.phtml
index 03a03557c..1f09f80d7 100644
--- a/modules/monitoring/application/views/scripts/list/eventhistory.phtml
+++ b/modules/monitoring/application/views/scripts/list/eventhistory.phtml
@@ -94,7 +94,7 @@ use Icinga\Module\Monitoring\Object\Service;
         <td class="state">
           <strong><?= $this->escape($title); ?></strong>
           <br>
-          <?= $this->timeAgo($event->timestamp); ?>
+          <?= $this->timeAgo($event->timestamp, $this->compact); ?>
         </td>
         <td>
         <?php if ($isService): ?>
diff --git a/modules/monitoring/application/views/scripts/list/hosts.phtml b/modules/monitoring/application/views/scripts/list/hosts.phtml
index 0448fb269..09b58cfa3 100644
--- a/modules/monitoring/application/views/scripts/list/hosts.phtml
+++ b/modules/monitoring/application/views/scripts/list/hosts.phtml
@@ -83,7 +83,7 @@ if ($hosts->count() === 0) {
         <strong><?= Host::getStateText($host->host_state, true); ?></strong>
         <?php if ((int) $host->host_state !== 99): ?>
           <br />
-          <?= $this->timeSince($host->host_last_state_change) ?>
+          <?= $this->timeSince($host->host_last_state_change, $this->compact) ?>
           <?php if ((int) $host->host_state > 0 && (int) $host->host_state_type === 0): ?>
             <br />
             <strong>Soft <?= $host->host_attempt ?></strong>
diff --git a/modules/monitoring/application/views/scripts/list/notifications.phtml b/modules/monitoring/application/views/scripts/list/notifications.phtml
index a037aca25..c934f674b 100644
--- a/modules/monitoring/application/views/scripts/list/notifications.phtml
+++ b/modules/monitoring/application/views/scripts/list/notifications.phtml
@@ -34,7 +34,7 @@ use Icinga\Module\Monitoring\Object\Service;
     ?>
         <tr class="state <?= $stateName ?>">
             <td class="state">
-                <?= $this->timeAgo($notification->notification_start_time) ?>
+                <?= $this->timeAgo($notification->notification_start_time, $this->compact) ?>
             </td>
             <td style="font-size: 0.8em">
                 <?php if ($isService): ?>
diff --git a/modules/monitoring/application/views/scripts/list/services.phtml b/modules/monitoring/application/views/scripts/list/services.phtml
index 38391bfc0..d6dd14815 100644
--- a/modules/monitoring/application/views/scripts/list/services.phtml
+++ b/modules/monitoring/application/views/scripts/list/services.phtml
@@ -59,7 +59,7 @@ foreach ($services as $service):
         <strong><?= Service::getStateText($service->service_state, true); ?></strong>
         <?php if ((int) $service->service_state !== 99): ?>
           <br />
-          <?= $this->timeSince($service->service_last_state_change) ?>
+          <?= $this->timeSince($service->service_last_state_change, $this->compact) ?>
           <?php if ((int) $service->service_state > 0 && (int) $service->service_state_type === 0): ?>
             <br />
             <strong>Soft <?= $service->service_attempt ?></strong>