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

monitoring: Fix date and time formatting for comments 

refs #6778
This commit is contained in:
Eric Lippmann 2015-05-22 10:22:14 +02:00
parent da97523fa0
commit 873bc22a1e
1 changed files with 14 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
modules/monitoring/application/views/scripts/comment/show.phtml
View File

@ -1,4 +1,4 @@
<div class="controls"> <div class="controls">
<?php if (! $this->compact): ?> <?php if (! $this->compact): ?>
<?= $this->tabs; ?> <?= $this->tabs; ?>
<?php endif ?> <?php endif ?>
@ -8,13 +8,13 @@
</div> </div>
</div> </div>
<div class="content"> <div class="content">
<h3><?= $this->translate('Comment detail information') ?></h3> <h3><?= $this->translate('Comment detail information') ?></h3>
<table class="avp"> <table class="avp">
<tbody> <tbody>
<tr data-base-target='_next'> <tr data-base-target='_next'>
<?php if ($this->comment->objecttype === 'service'): ?> <?php if ($this->comment->objecttype === 'service'): ?>
<th> <?= $this->translate('Service') ?> </th> <th> <?= $this->translate('Service') ?> </th>
<td> <td>
<?= $this->icon('service', $this->translate('Service')); ?> <?= $this->icon('service', $this->translate('Service')); ?>
<?= $this->link()->service( <?= $this->link()->service(
@ -26,7 +26,7 @@
?> ?>
</td> </td>
<?php else: ?> <?php else: ?>
<th> <?= $this->translate('Host') ?> </th> <th> <?= $this->translate('Host') ?> </th>
<td> <td>
<?= $this->icon('host', $this->translate('Host')); ?> <?= $this->icon('host', $this->translate('Host')); ?>
<?= $this->link()->host( <?= $this->link()->host(
@ -34,7 +34,7 @@
$this->comment->host_display_name $this->comment->host_display_name
); );
?> ?>
</td> </td>
<?php endif ?> <?php endif ?>
</tr> </tr>
@ -42,29 +42,29 @@
<th><?= $this->translate('Author') ?></th> <th><?= $this->translate('Author') ?></th>
<td><?= $this->icon('user', $this->translate('User')) ?> <?= $this->escape($this->comment->author) ?></td> <td><?= $this->icon('user', $this->translate('User')) ?> <?= $this->escape($this->comment->author) ?></td>
</tr> </tr>
<tr> <tr>
<th><?= $this->translate('Persistent') ?></th> <th><?= $this->translate('Persistent') ?></th>
<td><?= $this->escape($this->comment->persistent) ? $this->translate('Yes') : $this->translate('No') ?></td> <td><?= $this->escape($this->comment->persistent) ? $this->translate('Yes') : $this->translate('No') ?></td>
</tr> </tr>
<tr> <tr>
<th><?= $this->translate('Created') ?></th> <th><?= $this->translate('Created') ?></th>
<td><?= date('d.m.y H:i' ,$this->escape($this->comment->timestamp)) ?></td> <td><?= $this->formatDateTime($this->comment->timestamp) ?></td>
</tr> </tr>
<tr> <tr>
<th><?= $this->translate('Expires') ?></th> <th><?= $this->translate('Expires') ?></th>
<td> <td>
<?= $this->comment->expiration ? sprintf( <?= $this->comment->expiration ? sprintf(
$this->translate('This comment expires on %s at %s.'), $this->translate('This comment expires on %s at %s.'),
date('d.m.y', $this->comment->expiration), $this->formatDate($this->comment->expiration),
date('H:i', $this->comment->expiration) $this->formatTime($this->comment->expiration)
) : $this->translate('This comment does not expire.'); ) : $this->translate('This comment does not expire.');
?> ?>
</td> </td>
</tr> </tr>
<?php if (isset($delCommentForm)): // Form is unset if the current user lacks the respective permission ?> <?php if (isset($delCommentForm)): // Form is unset if the current user lacks the respective permission ?>
<tr class="newsection"> <tr class="newsection">
<th><?= $this->translate('Commands') ?></th> <th><?= $this->translate('Commands') ?></th>
@ -73,7 +73,7 @@
</td> </td>
</tr> </tr>
<?php endif ?> <?php endif ?>
</tbody> </tbody>
</table> </table>