Display host and service state in downtime detail area

refs #8902

modules/monitoring/application/controllers/DowntimeController.php

@@ -2,6 +2,8 @@
 /* Icinga Web 2 | (c) 2013-2015 Icinga Development Team | GPLv2+ */
 
 use Icinga\Module\Monitoring\Controller;
+use Icinga\Module\Monitoring\Object\Service;
+use Icinga\Module\Monitoring\Object\Host;
 use Icinga\Module\Monitoring\Forms\Command\Object\DeleteDowntimeCommandForm;
 use Icinga\Web\Url;
 use Icinga\Web\Widget\Tabextension\DashboardAction;
@@ -76,6 +78,10 @@ class Monitoring_DowntimeController extends Controller
     {
         $this->view->downtime = $this->downtime;
         $this->view->isService = $this->isService;
+        $this->view->stateName = isset($this->downtime->service_description) ? 
+                Service::getStateText($this->downtime->service_state) :
+                Host::getStateText($this->downtime->host_state);
+        
         $this->view->delDowntimeForm = $this->createDelDowntimeForm();
         $this->view->listAllLink = Url::fromPath('monitoring/list/downtimes');
         $this->view->showHostLink = Url::fromPath('monitoring/host/show')

modules/monitoring/application/views/scripts/downtime/show.phtml

@@ -2,6 +2,75 @@
   <?php if (! $this->compact): ?>
     <?= $this->tabs; ?>
   <?php endif ?>
+    
+    <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>
+    
   <h1 data-base-target="_next">
     <?php if ($this->isService): ?>
        <?php 
@@ -31,57 +100,7 @@
 </div>
 
 <div class="content">
-<small>
+<table class="avp"> 
-  <?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>
-<br>
-<br>
-
-<table class="avp newsection"> 
   <tbody>
     <tr title="<?= $this->translate('The name of the person who scheduled this downtime'); ?>">
       <th><?= $this->translate('Author') ?></th>