Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Provide downtime header in remove and remove-all commands
Add new show script for downtimes and move downtime headers into partials to deduplicate code. refs #8902
- Loading branch information
Showing
6 changed files
with
187 additions
and
162 deletions.
There are no files selected for viewing
11 changes: 11 additions & 0 deletions
11
modules/monitoring/application/views/scripts/downtime/remove.phtml
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,11 @@ | ||
| <div class="controls"> | ||
|
|
||
| <?php if (! $this->compact): ?> | ||
| <?= $this->tabs; ?> | ||
| <?php endif ?> | ||
|
|
||
| <?= $this->render('partials/downtime/downtime-header.phtml'); ?> | ||
| </div> | ||
| <div class="content object-command"> | ||
| <?= $delDowntimeForm; ?> | ||
| </div> |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
12 changes: 12 additions & 0 deletions
12
modules/monitoring/application/views/scripts/downtimes/remove-all.phtml
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,12 @@ | ||
| <div class="controls"> | ||
|
|
||
| <?php if (! $this->compact): ?> | ||
| <?= $this->tabs; ?> | ||
| <?php endif ?> | ||
|
|
||
| <?= $this->render('partials/downtime/downtimes-header.phtml'); ?> | ||
| </div> | ||
|
|
||
| <div class="content object-command"> | ||
| <?= $delDowntimeForm ?> | ||
| </div> |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
67 changes: 67 additions & 0 deletions
67
modules/monitoring/application/views/scripts/partials/downtime/downtime-header.phtml
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,67 @@ | ||
| <table class="action"> | ||
| <tr class="state <?= $stateName; ?><?= $downtime->is_in_effect ? ' handled' : ''; ?>"> | ||
| <td class="state"> | ||
| <strong><?= $downtime->is_in_effect ? $this->translate('Expires') : $this->translate('Starts'); ?></strong> | ||
| <br> | ||
| <?= | ||
| $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> | ||
| <small> | ||
| <?php if ($downtime->is_flexible): ?> | ||
| <?php if ($downtime->is_in_effect): ?> | ||
| <?= sprintf( | ||
| $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 host downtime was started on %s at %s and lasts for %s until %s at %s.'), | ||
| date('d.m.y', $downtime->start), | ||
| date('H:i', $downtime->start), | ||
| $this->format()->duration($downtime->duration), | ||
| date('d.m.y', $downtime->end), | ||
| date('H:i', $downtime->end) | ||
| ); ?> | ||
| <?php else: ?> | ||
| <?= sprintf( | ||
| $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 host downtime has been scheduled to start between %s - %s and to last for %s.'), | ||
| date('d.m.y H:i', $downtime->scheduled_start), | ||
| date('d.m.y H:i', $downtime->scheduled_end), | ||
| $this->format()->duration($downtime->duration) | ||
| ); ?> | ||
| <?php endif ?> | ||
| <?php else: ?> | ||
| <?php if ($downtime->is_in_effect): ?> | ||
| <?= sprintf( | ||
| $this->isService | ||
| ? $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.'), | ||
| date('d.m.y', $downtime->start), | ||
| date('H:i', $downtime->start), | ||
| date('d.m.y', $downtime->end), | ||
| date('H:i', $downtime->end) | ||
| ); ?> | ||
| <?php else: ?> | ||
| <?= sprintf( | ||
| $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 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), | ||
| date('H:i', $downtime->scheduled_start), | ||
| date('d.m.y', $downtime->scheduled_end), | ||
| date('H:i', $downtime->scheduled_end) | ||
| ); ?> | ||
| <?php endif ?> | ||
| <?php endif ?> | ||
| </small> | ||
| </td> | ||
| </tr> | ||
| </table> |
92 changes: 92 additions & 0 deletions
92
modules/monitoring/application/views/scripts/partials/downtime/downtimes-header.phtml
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,92 @@ | ||
| <table class="action"> | ||
| <tbody> | ||
| <?php $i = 0; foreach ($downtimes as $downtime): | ||
| if (++ $i > 5) { | ||
| continue; | ||
| } ?> | ||
| <tr class="state <?= $downtime->stateText ?>"> | ||
| <td class="state"> | ||
| <strong><?= $downtime->is_in_effect ? $this->translate('Expires') : $this->translate('Starts'); ?></strong> | ||
| <br> | ||
| <?= | ||
| $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 class="name oneline"> | ||
| <?php if ($downtime->isService): ?> | ||
| <?= $this->icon('service', $this->translate('Service')) ?> | ||
| <b><?= $downtime->service ?> on <?= $downtime->host_name ?>.</b> | ||
| <?php else: ?> | ||
| <?= $this->icon('host', $this->translate('Host')) ?> | ||
| <b><?= $downtime->host_name ?>.</b> | ||
| <?php endif; ?> | ||
|
|
||
| <?php if ($downtime->is_flexible): ?> | ||
| <?php if ($downtime->is_in_effect): ?> | ||
| <?= sprintf( | ||
| $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 host downtime was started on %s at %s and lasts for %s until %s at %s.'), | ||
| date('d.m.y', $downtime->start), | ||
| date('H:i', $downtime->start), | ||
| $this->format()->duration($downtime->duration), | ||
| date('d.m.y', $downtime->end), | ||
| date('H:i', $downtime->end) | ||
| ); ?> | ||
| <?php else: ?> | ||
| <?= sprintf( | ||
| $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 host downtime has been scheduled to start between %s - %s and to last for %s.'), | ||
| date('d.m.y H:i', $downtime->scheduled_start), | ||
| date('d.m.y H:i', $downtime->scheduled_end), | ||
| $this->format()->duration($downtime->duration) | ||
| ); ?> | ||
| <?php endif ?> | ||
| <?php else: ?> | ||
| <?php if ($downtime->is_in_effect): ?> | ||
| <?= sprintf( | ||
| $this->isService | ||
| ? $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.'), | ||
| date('d.m.y', $downtime->start), | ||
| date('H:i', $downtime->start), | ||
| date('d.m.y', $downtime->end), | ||
| date('H:i', $downtime->end) | ||
| ); ?> | ||
| <?php else: ?> | ||
| <?= sprintf( | ||
| $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 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), | ||
| date('H:i', $downtime->scheduled_start), | ||
| date('d.m.y', $downtime->scheduled_end), | ||
| date('H:i', $downtime->scheduled_end) | ||
| ); ?> | ||
| <?php endif ?> | ||
| <?php endif ?> | ||
| </td> | ||
| </tr> | ||
| <?php endforeach; ?> | ||
| </tbody> | ||
| </table> | ||
|
|
||
| <p> | ||
| <?= $this->qlink( | ||
| sprintf($this->translate('List all %d downtimes …'), count($downtimes)), | ||
| $listAllLink, | ||
| null, | ||
| array( | ||
| 'title' => $this->translate('List all'), | ||
| 'data-base-target' => "_next" | ||
| ) | ||
| ) ?> | ||
| </p> |