tyler.durden
/
icingaweb2
mirror of https://github.com/Icinga/icingaweb2.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Don't show ago, since, ... for monitoring list views in the dashboard 

refs #6778
This commit is contained in:
Eric Lippmann 2015-05-19 10:00:27 +02:00
parent 3fdf1d2a5c
commit 7212c038f1
6 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
modules/monitoring/application/views/scripts/list/comments.phtml
View File

@ -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'): ?>

2
modules/monitoring/application/views/scripts/list/downtimes.phtml
View File

@ -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): ?>

2
modules/monitoring/application/views/scripts/list/eventhistory.phtml
View File

@ -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): ?>

2
modules/monitoring/application/views/scripts/list/hosts.phtml
View File

@ -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>

2
modules/monitoring/application/views/scripts/list/notifications.phtml
View File

@ -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): ?>

2
modules/monitoring/application/views/scripts/list/services.phtml
View File

@ -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>