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

downtime/views: Use ends instead of started ... 

refs #9266
This commit is contained in:
Alexander Fuhr 2015-08-10 10:58:21 +02:00
parent f0cabf059a
commit c88f0c7e37
4 changed files with 12 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -36,9 +36,9 @@ if (! $this->compact): ?>
<tr class="state <?= $stateName; ?><?= $downtime->is_in_effect ? ' handled' : ''; ?>"> <tr class="state <?= $stateName; ?><?= $downtime->is_in_effect ? ' handled' : ''; ?>">
<td class="state"> <td class="state">
<?php if ($downtime->start <= time() && ! $downtime->is_in_effect): ?> <?php if ($downtime->start <= time() && ! $downtime->is_in_effect): ?>
<strong><?= $this->translate('Started'); ?></strong> <strong><?= $this->translate('Ends'); ?></strong>
<br> <br>
<?= sprintf($this->translate('Ends %s'), $this->timeUntil($downtime->end, $this->compact)) ?> <?= $this->timeUntil($downtime->end, $this->compact) ?>
<?php else: ?> <?php else: ?>
<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>

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

@ -2,9 +2,9 @@
<tr class="state <?= $stateName; ?><?= $downtime->is_in_effect ? ' handled' : ''; ?>"> <tr class="state <?= $stateName; ?><?= $downtime->is_in_effect ? ' handled' : ''; ?>">
<td class="state"> <td class="state">
<?php if ($downtime->start <= time() && ! $downtime->is_in_effect): ?> <?php if ($downtime->start <= time() && ! $downtime->is_in_effect): ?>
<strong><?= $this->translate('Started'); ?></strong> <strong><?= $this->translate('Ends'); ?></strong>
<br> <br>
<?= sprintf($this->translate('Ends %s'), $this->timeUntil($downtime->end, $this->compact)) ?> <?= $this->timeUntil($downtime->end, $this->compact) ?>
<?php else: ?> <?php else: ?>
<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>

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

@ -7,9 +7,9 @@
<tr class="state <?= $downtime->stateText ?>"> <tr class="state <?= $downtime->stateText ?>">
<td class="state"> <td class="state">
<?php if ($downtime->start <= time() && ! $downtime->is_in_effect): ?> <?php if ($downtime->start <= time() && ! $downtime->is_in_effect): ?>
<strong><?= $this->translate('Started'); ?></strong> <strong><?= $this->translate('Ends'); ?></strong>
<br> <br>
<?= sprintf($this->translate('Ends %s'), $this->timeUntil($downtime->end, $this->compact)) ?> <?= $this->timeUntil($downtime->end, $this->compact) ?>
<?php else: ?> <?php else: ?>
<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>

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

@ -53,7 +53,12 @@ if (empty($object->comments) && ! $addLink) {
$this->timeUntil($downtime->end) $this->timeUntil($downtime->end)
); );
} else { } else {
if ((bool) $downtime->is_fixed) { if ($downtime->start <= time() && ! (bool) $downtime->is_in_effect) {
$state = sprintf(
$this->translate('ends %s', 'Last format parameter represents the end time'),
$this->timeUntil($downtime->end)
);
} elseif ((bool) $downtime->is_fixed) {
$state = sprintf( $state = sprintf(
$this->translate('scheduled %s', 'Last format parameter represents the time scheduled'), $this->translate('scheduled %s', 'Last format parameter represents the time scheduled'),
$this->timeUntil($downtime->start) $this->timeUntil($downtime->start)