From 400f351ea580800d22f56c23c0512839686f1b25 Mon Sep 17 00:00:00 2001
From: Matthias Jentsch <matthias.jentsch@netways.de>
Date: Thu, 23 Apr 2015 16:55:59 +0200
Subject: [PATCH] Improve detail view layout

refs #8902
---
 .../views/scripts/downtime/show.phtml         | 57 +++++++++----------
 .../views/scripts/downtimes/show.phtml        | 12 +---
 2 files changed, 30 insertions(+), 39 deletions(-)

diff --git a/modules/monitoring/application/views/scripts/downtime/show.phtml b/modules/monitoring/application/views/scripts/downtime/show.phtml
index ddc91eeeb..ade9495b0 100644
--- a/modules/monitoring/application/views/scripts/downtime/show.phtml
+++ b/modules/monitoring/application/views/scripts/downtime/show.phtml
@@ -76,45 +76,44 @@
         </td>
       </tr>
     </table>
-    
-  <h1 data-base-target="_next">
-    <?php if ($this->isService): ?>
-       <?php 
-          $link = $this->link()->service(
-                $downtime->service_description, 
-                $downtime->service_display_name,
-                $downtime->host_name,
-                $downtime->host_display_name
-          );
-          $icon = $this->icon('service', $this->translate('Service')); 
-        ?>
-    <?php else: ?>
-      <?php 
-        $icon = $this->icon('host', $this->translate('Host'));
-        $link = $this->link()->host($downtime->host_name, $downtime->host_display_name)
-      ?>
-    <?php endif ?>
-    <?= sprintf(
-            $this->translate(
-                'Downtime on %s',
-                'Downtime for host or service.'
-            ),
-            $link
-        ); ?>
-    <?= $icon ?>
-  </h1>
 </div>
 
 <div class="content">
+    <h3><?= $this->translate('Downtime detail information') ?></h3>
 <table class="avp"> 
   <tbody>
+      <tr>
+          <th>
+              <?= $this->isService ? $this->translate('Service') : $this->translate('Host') ?>
+          </th>
+          <td data-base-target="_next">
+              <?php if ($this->isService): ?>
+              <?php 
+                  $link = $this->link()->service(
+                       $downtime->service_description, 
+                       $downtime->service_display_name,
+                       $downtime->host_name,
+                       $downtime->host_display_name
+                  );
+                  $icon = $this->icon('service', $this->translate('Service')); 
+               ?>
+              <?php else: ?>
+              <?php 
+                  $icon = $this->icon('host', $this->translate('Host'));
+                  $link = $this->link()->host($downtime->host_name, $downtime->host_display_name)
+              ?>
+              <?php endif ?>
+              <?= $icon ?>
+              <?= $link ?>
+          </td>
+      </tr>    
     <tr title="<?= $this->translate('The name of the person who scheduled this downtime'); ?>">
       <th><?= $this->translate('Author') ?></th>
-      <td><?= $this->icon('user') ?> <?= $this->escape($this->downtime->author_name) ?></td>
+      <td><?= $this->icon('user', $this->translate('User')) ?> <?= $this->escape($this->downtime->author_name) ?></td>
     </tr>
     <tr title="<?= $this->translate('A comment, as entered by the author, associated with the scheduled downtime'); ?>">
       <th><?= $this->translate('Comment') ?></th>
-      <td><?= $this->icon('comment') ?> <?= $this->escape($this->downtime->comment) ?></td>
+      <td><?= $this->icon('comment', $this->translate('Comment')) ?> <?= $this->escape($this->downtime->comment) ?></td>
     </tr>
      <tr title="<?= $this->translate('Date and time this downtime was entered'); ?>">
       <th><?= $this->translate('Entry Time') ?></th>
diff --git a/modules/monitoring/application/views/scripts/downtimes/show.phtml b/modules/monitoring/application/views/scripts/downtimes/show.phtml
index a683722ac..c7ddb0ae6 100644
--- a/modules/monitoring/application/views/scripts/downtimes/show.phtml
+++ b/modules/monitoring/application/views/scripts/downtimes/show.phtml
@@ -8,14 +8,6 @@
   <?php if (! $this->compact): ?>
     <?= $this->tabs; ?>
   <?php endif ?>
-
-  <h1>
-    <?= sprintf($this->translate('%d Downtimes'), count($downtimes)) ?>
-    <?= count($downtimes) > 5 ? 
-            sprintf($this->translate('(%d not shown)'), count ($downtimes) - 5) 
-            : ''; 
-    ?>
-  </h1>
 <p>
   <table class="action">
     <tbody>
@@ -40,10 +32,10 @@
           </td>
           <td class="name oneline">
             <?php if ($downtime->isService): ?>
-                <?= $this->icon('service') ?>
+                <?= $this->icon('service', $this->translate('Service')) ?>
                 <b><?= $downtime->service ?> on <?= $downtime->host_name ?>.</b>
             <?php else: ?>
-                 <?= $this->icon('host') ?>
+                 <?= $this->icon('host', $this->translate('Host')) ?>
                 <b><?= $downtime->host_name ?>.</b>
             <?php endif; ?>