tyler.durden/icingaweb2
1
0
Fork 0
mirror of https://github.com/Icinga/icingaweb2.git synced 2025-07-27 15:54:03 +02:00
Code Issues Packages Projects Releases Wiki Activity

monitoring: Fix usage of the dropped DateTimeRenderer

Browse Source 
refs #6778
This commit is contained in:
Eric Lippmann 2015-05-22 09:33:30 +02:00
parent d187d77a7f
commit d17842b485
2 changed files with 4 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
modules/monitoring/application/views/scripts/partials/downtime/downtime-header.phtml
View File

@ -3,16 +3,7 @@
<td class="state"> <td class="state">
<strong><?= $downtime->is_in_effect ? $this->translate('Expires') : $this->translate('Starts'); ?></strong> <strong><?= $downtime->is_in_effect ? $this->translate('Expires') : $this->translate('Starts'); ?></strong>
<br> <br>
<?= <?= $downtime->is_in_effect ? $this->timeSince($downtime->start, $this->compact) : $this->timeUntil($downtime->start, $this->compact) ?>
$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')
);
?>
</td> </td>
<td> <td>
<small> <small>

15
modules/monitoring/application/views/scripts/partials/downtime/downtimes-header.phtml
View File

@ -8,16 +8,7 @@
<td class="state"> <td class="state">
<strong><?= $downtime->is_in_effect ? $this->translate('Expires') : $this->translate('Starts'); ?></strong> <strong><?= $downtime->is_in_effect ? $this->translate('Expires') : $this->translate('Starts'); ?></strong>
<br> <br>
<?= <?= $downtime->is_in_effect ? $this->timeSince($downtime->start, $this->compact) : $this->timeUntil($downtime->start, $this->compact) ?>
$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')
);
?>
</td> </td>
<td class="name oneline"> <td class="name oneline">
<?php if ($downtime->isService): ?> <?php if ($downtime->isService): ?>
@ -27,7 +18,7 @@
<?= $this->icon('host', $this->translate('Host')) ?> <?= $this->icon('host', $this->translate('Host')) ?>
<b><?= $downtime->host_name ?>.</b> <b><?= $downtime->host_name ?>.</b>
<?php endif; ?> <?php endif; ?>
<?php if ($downtime->is_flexible): ?> <?php if ($downtime->is_flexible): ?>
<?php if ($downtime->is_in_effect): ?> <?php if ($downtime->is_in_effect): ?>
<?= sprintf( <?= sprintf(
@ -91,4 +82,4 @@
) )
) ?> ) ?>
<?php endif ?> <?php endif ?>
</p> </p>