From 4adf059ed68f08ce2037d0344ed61145110e01b6 Mon Sep 17 00:00:00 2001 From: Eric Lippmann Date: Wed, 28 Oct 2015 13:01:19 +0100 Subject: [PATCH] monitoring: Fix downtimes markup refs #5543 --- .../application/views/scripts/list/downtimes.phtml | 2 +- .../views/scripts/partials/downtime/downtime-header.phtml | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/modules/monitoring/application/views/scripts/list/downtimes.phtml b/modules/monitoring/application/views/scripts/list/downtimes.phtml index 6b761fa52..725da06a8 100644 --- a/modules/monitoring/application/views/scripts/list/downtimes.phtml +++ b/modules/monitoring/application/views/scripts/list/downtimes.phtml @@ -16,7 +16,7 @@ if (! $this->compact): ?>
" data-icinga-multiselect-data="downtime_id"> diff --git a/modules/monitoring/application/views/scripts/partials/downtime/downtime-header.phtml b/modules/monitoring/application/views/scripts/partials/downtime/downtime-header.phtml index 8b1a941a3..cc5c79d9a 100644 --- a/modules/monitoring/application/views/scripts/partials/downtime/downtime-header.phtml +++ b/modules/monitoring/application/views/scripts/partials/downtime/downtime-header.phtml @@ -1,10 +1,10 @@
start <= time() && ! $downtime->is_in_effect): ?> - translate('Ends'); ?> -

timeUntil($downtime->is_flexible ? $downtime->scheduled_end : $downtime->end, $this->compact) ?>

+
translate('ENDS', 'Downtime status'); ?>
+
timeUntil($downtime->is_flexible ? $downtime->scheduled_end : $downtime->end, $this->compact) ?>
- is_in_effect ? $this->translate('Expires') : $this->translate('Starts'); ?> -

timeUntil($downtime->is_in_effect ? $downtime->end : $downtime->start, $this->compact) ?>

+
is_in_effect ? $this->translate('EXPIRES', 'Downtime status') : $this->translate('STARTS', 'Downtime status'); ?>
+
timeUntil($downtime->is_in_effect ? $downtime->end : $downtime->start, $this->compact) ?>