tyler.durden/icingaweb2
1
0
Fork 0
mirror of https://github.com/Icinga/icingaweb2.git synced 2025-07-12 16:34:25 +02:00
Code Issues Packages Projects Releases Wiki Activity

monitoring: Fix duration, date and time formatting for downtimes

Browse Source 
refs #6778
This commit is contained in:
Eric Lippmann 2015-05-22 10:06:55 +02:00
parent de9be044b3
commit da97523fa0
4 changed files with 75 additions and 75 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
modules/monitoring/application/views/scripts/downtime/show.phtml
View File

@ -44,7 +44,7 @@
</tr> </tr>
<tr title="<?= $this->translate('Date and time this downtime was entered'); ?>"> <tr title="<?= $this->translate('Date and time this downtime was entered'); ?>">
<th><?= $this->translate('Entry Time') ?></th> <th><?= $this->translate('Entry Time') ?></th>
<td> <?= date('d.m.y H:i' ,$this->escape($this->downtime->entry_time)) ?></td> <td><?= $this->formatDateTime($this->downtime->entry_time) ?></td>
</tr> </tr>
<tr class="newsection"> <tr class="newsection">
<th><?= $this->escape( <th><?= $this->escape(
@ -66,14 +66,14 @@
. 'this refers to the earliest possible time that the downtime' . 'this refers to the earliest possible time that the downtime'
. ' can start'); ?>"> . ' can start'); ?>">
<th><?= $this->translate('Scheduled start') ?></th> <th><?= $this->translate('Scheduled start') ?></th>
<td><?= date('d.m.y H:i', $this->downtime->scheduled_start) ?></td> <td><?= $this->formatDateTime($this->downtime->scheduled_start) ?></td>
</tr> </tr>
<tr title="<?= $this->translate('The date/time the scheduled downtime is ' <tr title="<?= $this->translate('The date/time the scheduled downtime is '
. 'supposed to end. If this is a flexible (non-fixed) downtime, ' . 'supposed to end. If this is a flexible (non-fixed) downtime, '
. 'this refers to the last possible time that the downtime can ' . 'this refers to the last possible time that the downtime can '
. 'start'); ?>"> . 'start'); ?>">
<th><?= $this->translate('Scheduled end') ?></th> <th><?= $this->translate('Scheduled end') ?></th>
<td><?= date('d.m.y H:i', $this->downtime->scheduled_end) ?></td> <td><?= $this->formatDateTime($this->downtime->scheduled_end) ?></td>
</tr> </tr>
<?php if ($this->downtime->is_flexible): ?> <?php if ($this->downtime->is_flexible): ?>
<tr title="<?= $this->translate('Indicates the number of seconds that the ' <tr title="<?= $this->translate('Indicates the number of seconds that the '
@ -81,17 +81,17 @@
. ' this is a flexible downtime, which can start at a variable ' . ' this is a flexible downtime, which can start at a variable '
. 'time, but lasts for the specified duration'); ?>"> . 'time, but lasts for the specified duration'); ?>">
<th tit><?= $this->translate('Duration') ?></th> <th tit><?= $this->translate('Duration') ?></th>
<td><?= $this->format()->duration($this->escape($this->downtime->duration)); ?></td> <td><?= $this->formatDuration($this->downtime->duration) ?></td>
</tr> </tr>
<tr title="<?= $this->translate('he date/time the scheduled downtime was' <tr title="<?= $this->translate('he date/time the scheduled downtime was'
. ' actually started'); ?>"> . ' actually started'); ?>">
<th><?= $this->translate('Actual start time') ?></th> <th><?= $this->translate('Actual start time') ?></th>
<td><?= date('d.m.y H:i', $downtime->start); ?></td> <td><?= $this->formatDateTime($downtime->start) ?></td>
</tr> </tr>
<tr title="<?= $this->translate('The date/time the scheduled downtime ' <tr title="<?= $this->translate('The date/time the scheduled downtime '
. 'actually ended'); ?>"> . 'actually ended'); ?>">
<th><?= $this->translate('Actual end time') ?></th> <th><?= $this->translate('Actual end time') ?></th>
<td><?= date('d.m.y H:i', $downtime->end); ?></td> <td><?= $this->formatDateTime($downtime->end) ?></td>
</tr> </tr>
<?php endif; ?> <?php endif; ?>

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

@ -74,20 +74,20 @@ if (count($downtimes) === 0) {
$isService $isService
? $this->translate('This flexible service downtime was started on %s at %s and lasts for %s until %s at %s.') ? $this->translate('This flexible service downtime was started on %s at %s and lasts for %s until %s at %s.')
: $this->translate('This flexible host downtime was started on %s at %s and lasts for %s until %s at %s.'), : $this->translate('This flexible host downtime was started on %s at %s and lasts for %s until %s at %s.'),
date('d.m.y', $downtime->start), $this->formatDate($downtime->start),
date('H:i', $downtime->start), $this->formatTime($downtime->start),
$this->format()->duration($downtime->duration), $this->formatDuration($downtime->duration),
date('d.m.y', $downtime->end), $this->formatDate($downtime->end),
date('H:i', $downtime->end) $this->formatTime($downtime->end)
); ?> ); ?>
<?php else: ?> <?php else: ?>
<?= sprintf( <?= sprintf(
$isService $isService
? $this->translate('This flexible service downtime has been scheduled to start between %s - %s and to last for %s.') ? $this->translate('This flexible service downtime has been scheduled to start between %s - %s and to last for %s.')
: $this->translate('This flexible host downtime has been scheduled to start between %s - %s and to last for %s.'), : $this->translate('This flexible host downtime has been scheduled to start between %s - %s and to last for %s.'),
date('d.m.y H:i', $downtime->scheduled_start), $this->formatDateTime($downtime->scheduled_start),
date('d.m.y H:i', $downtime->scheduled_end), $this->formatDateTime($downtime->scheduled_end),
$this->format()->duration($downtime->duration) $this->formatDuration($downtime->duration)
); ?> ); ?>
<?php endif ?> <?php endif ?>
<?php else: ?> <?php else: ?>
@ -96,20 +96,20 @@ if (count($downtimes) === 0) {
$isService $isService
? $this->translate('This fixed service downtime was started on %s at %s and expires on %s at %s.') ? $this->translate('This fixed service downtime was started on %s at %s and expires on %s at %s.')
: $this->translate('This fixed host downtime was started on %s at %s and expires on %s at %s.'), : $this->translate('This fixed host downtime was started on %s at %s and expires on %s at %s.'),
date('d.m.y', $downtime->start), $this->formatDate($downtime->start),
date('H:i', $downtime->start), $this->formatTime($downtime->start),
date('d.m.y', $downtime->end), $this->formatDate($downtime->end),
date('H:i', $downtime->end) $this->formatTime($downtime->end)
); ?> ); ?>
<?php else: ?> <?php else: ?>
<?= sprintf( <?= sprintf(
$isService $isService
? $this->translate('This fixed service downtime has been scheduled to start on %s at %s and to end on %s at %s.') ? $this->translate('This fixed service downtime has been scheduled to start on %s at %s and to end on %s at %s.')
: $this->translate('This fixed host downtime has been scheduled to start on %s at %s and to end on %s at %s.'), : $this->translate('This fixed host downtime has been scheduled to start on %s at %s and to end on %s at %s.'),
date('d.m.y', $downtime->scheduled_start), $this->formatDate($downtime->start),
date('H:i', $downtime->scheduled_start), $this->formatTime($downtime->start),
date('d.m.y', $downtime->scheduled_end), $this->formatDate($downtime->end),
date('H:i', $downtime->scheduled_end) $this->formatTime($downtime->end)
); ?> ); ?>
<?php endif ?> <?php endif ?>
<?php endif ?> <?php endif ?>

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

@ -13,20 +13,20 @@
$this->isService $this->isService
? $this->translate('This flexible service downtime was started on %s at %s and lasts for %s until %s at %s.') ? $this->translate('This flexible service downtime was started on %s at %s and lasts for %s until %s at %s.')
: $this->translate('This flexible host downtime was started on %s at %s and lasts for %s until %s at %s.'), : $this->translate('This flexible host downtime was started on %s at %s and lasts for %s until %s at %s.'),
date('d.m.y', $downtime->start), $this->formatDate($downtime->start),
date('H:i', $downtime->start), $this->formatTime($downtime->start),
$this->format()->duration($downtime->duration), $this->formatDuration($downtime->duration),
date('d.m.y', $downtime->end), $this->formatDate($downtime->end),
date('H:i', $downtime->end) $this->formatTime($downtime->end)
); ?> ); ?>
<?php else: ?> <?php else: ?>
<?= sprintf( <?= sprintf(
$this->isService $this->isService
? $this->translate('This flexible service downtime has been scheduled to start between %s - %s and to last for %s.') ? $this->translate('This flexible service downtime has been scheduled to start between %s - %s and to last for %s.')
: $this->translate('This flexible host downtime has been scheduled to start between %s - %s and to last for %s.'), : $this->translate('This flexible host downtime has been scheduled to start between %s - %s and to last for %s.'),
date('d.m.y H:i', $downtime->scheduled_start), $this->formatDateTime($downtime->scheduled_start),
date('d.m.y H:i', $downtime->scheduled_end), $this->formatDateTime($downtime->scheduled_end),
$this->format()->duration($downtime->duration) $this->formatDuration($downtime->duration)
); ?> ); ?>
<?php endif ?> <?php endif ?>
<?php else: ?> <?php else: ?>
@ -35,20 +35,20 @@
$this->isService $this->isService
? $this->translate('This fixed service downtime was started on %s at %s and expires on %s at %s.') ? $this->translate('This fixed service downtime was started on %s at %s and expires on %s at %s.')
: $this->translate('This fixed host downtime was started on %s at %s and expires on %s at %s.'), : $this->translate('This fixed host downtime was started on %s at %s and expires on %s at %s.'),
date('d.m.y', $downtime->start), $this->formatDate($downtime->start),
date('H:i', $downtime->start), $this->formatTime($downtime->start),
date('d.m.y', $downtime->end), $this->formatDate($downtime->end),
date('H:i', $downtime->end) $this->formatTime($downtime->end)
); ?> ); ?>
<?php else: ?> <?php else: ?>
<?= sprintf( <?= sprintf(
$this->isService $this->isService
? $this->translate('This fixed service downtime has been scheduled to start on %s at %s and to end on %s at %s.') ? $this->translate('This fixed service downtime has been scheduled to start on %s at %s and to end on %s at %s.')
: $this->translate('This fixed host downtime has been scheduled to start on %s at %s and to end on %s at %s.'), : $this->translate('This fixed host downtime has been scheduled to start on %s at %s and to end on %s at %s.'),
date('d.m.y', $downtime->scheduled_start), $this->formatDate($downtime->start),
date('H:i', $downtime->scheduled_start), $this->formatTime($downtime->start),
date('d.m.y', $downtime->scheduled_end), $this->formatDate($downtime->end),
date('H:i', $downtime->scheduled_end) $this->formatTime($downtime->end)
); ?> ); ?>
<?php endif ?> <?php endif ?>
<?php endif ?> <?php endif ?>

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

@ -25,20 +25,20 @@
$this->isService $this->isService
? $this->translate('This flexible service downtime was started on %s at %s and lasts for %s until %s at %s.') ? $this->translate('This flexible service downtime was started on %s at %s and lasts for %s until %s at %s.')
: $this->translate('This flexible host downtime was started on %s at %s and lasts for %s until %s at %s.'), : $this->translate('This flexible host downtime was started on %s at %s and lasts for %s until %s at %s.'),
date('d.m.y', $downtime->start), $this->formatDate($downtime->start),
date('H:i', $downtime->start), $this->formatTime($downtime->start),
$this->format()->duration($downtime->duration), $this->formatDuration($downtime->duration),
date('d.m.y', $downtime->end), $this->formatDate($downtime->end),
date('H:i', $downtime->end) $this->formatTime($downtime->end)
); ?> ); ?>
<?php else: ?> <?php else: ?>
<?= sprintf( <?= sprintf(
$this->isService $this->isService
? $this->translate('This flexible service downtime has been scheduled to start between %s - %s and to last for %s.') ? $this->translate('This flexible service downtime has been scheduled to start between %s - %s and to last for %s.')
: $this->translate('This flexible host downtime has been scheduled to start between %s - %s and to last for %s.'), : $this->translate('This flexible host downtime has been scheduled to start between %s - %s and to last for %s.'),
date('d.m.y H:i', $downtime->scheduled_start), $this->formatDateTime($downtime->scheduled_start),
date('d.m.y H:i', $downtime->scheduled_end), $this->formatDateTime($downtime->scheduled_end),
$this->format()->duration($downtime->duration) $this->formatDuration($downtime->duration)
); ?> ); ?>
<?php endif ?> <?php endif ?>
<?php else: ?> <?php else: ?>
@ -47,20 +47,20 @@
$this->isService $this->isService
? $this->translate('This fixed service downtime was started on %s at %s and expires on %s at %s.') ? $this->translate('This fixed service downtime was started on %s at %s and expires on %s at %s.')
: $this->translate('This fixed host downtime was started on %s at %s and expires on %s at %s.'), : $this->translate('This fixed host downtime was started on %s at %s and expires on %s at %s.'),
date('d.m.y', $downtime->start), $this->formatDate($downtime->start),
date('H:i', $downtime->start), $this->formatTime($downtime->start),
date('d.m.y', $downtime->end), $this->formatDate($downtime->end),
date('H:i', $downtime->end) $this->formatTime($downtime->end)
); ?> ); ?>
<?php else: ?> <?php else: ?>
<?= sprintf( <?= sprintf(
$this->isService $this->isService
? $this->translate('This fixed service downtime has been scheduled to start on %s at %s and to end on %s at %s.') ? $this->translate('This fixed service downtime has been scheduled to start on %s at %s and to end on %s at %s.')
: $this->translate('This fixed host downtime has been scheduled to start on %s at %s and to end on %s at %s.'), : $this->translate('This fixed host downtime has been scheduled to start on %s at %s and to end on %s at %s.'),
date('d.m.y', $downtime->scheduled_start), $this->formatDate($downtime->start),
date('H:i', $downtime->scheduled_start), $this->formatTime($downtime->start),
date('d.m.y', $downtime->scheduled_end), $this->formatDate($downtime->end),
date('H:i', $downtime->scheduled_end) $this->formatTime($downtime->end)
); ?> ); ?>
<?php endif ?> <?php endif ?>
<?php endif ?> <?php endif ?>