From 2f610b70ac2d7101911a061cd9601866d6e44460 Mon Sep 17 00:00:00 2001
From: Marius Hein <marius.hein@netways.de>
Date: Fri, 23 Aug 2013 10:58:58 +0200
Subject: [PATCH] Fix icon identifer and capitalization

refs #4550
refs #4584
---
 .../Config/Authentication/DbBackendForm.php   |  2 +-
 .../views/helpers/MonitoringCommands.php      |  2 +-
 .../views/scripts/list/downtimes.phtml        | 35 +++++++++----------
 .../views/scripts/list/notifications.phtml    | 18 +++++-----
 .../scripts/show/components/downtime.phtml    |  2 +-
 5 files changed, 29 insertions(+), 30 deletions(-)

diff --git a/application/forms/Config/Authentication/DbBackendForm.php b/application/forms/Config/Authentication/DbBackendForm.php
index dd41c193e..3c09bccf6 100644
--- a/application/forms/Config/Authentication/DbBackendForm.php
+++ b/application/forms/Config/Authentication/DbBackendForm.php
@@ -93,7 +93,7 @@ class DbBackendForm extends BaseBackendForm
             )
         );
 
-        $this->setSubmitLabel('{{SAVE_ICON}} Save backend');
+        $this->setSubmitLabel('{{SAVE_ICON}} Save Backend');
     }
 
     /**
diff --git a/modules/monitoring/application/views/helpers/MonitoringCommands.php b/modules/monitoring/application/views/helpers/MonitoringCommands.php
index 58bc3cb55..0c35460b9 100644
--- a/modules/monitoring/application/views/helpers/MonitoringCommands.php
+++ b/modules/monitoring/application/views/helpers/MonitoringCommands.php
@@ -65,7 +65,7 @@ class Zend_View_Helper_MonitoringCommands extends Zend_View_Helper_Abstract
                 $definition->shortDescription,
                 $definition->longDescription,
                 $definition->iconCls,
-                $definition->btnCls
+                ($definition->btnCls) ? $definition->btnCls : 'btn-default'
             );
 
             if ($type === Meta::TYPE_FULL) {
diff --git a/modules/monitoring/application/views/scripts/list/downtimes.phtml b/modules/monitoring/application/views/scripts/list/downtimes.phtml
index 88e27d565..2b2191846 100644
--- a/modules/monitoring/application/views/scripts/list/downtimes.phtml
+++ b/modules/monitoring/application/views/scripts/list/downtimes.phtml
@@ -30,24 +30,24 @@ $downtimes = $downtimes->fetchAll();
       $this->sort,
       array('class' => 'autosubmit'),
       array(
-          'downtime_is_in_effect' => 'Is In Effect',
-          'object_type' => 'Service/Host',
-          'host_name' => 'Host Name',
-          'service_description' => 'Service Name',
-          'downtime_entry_time' => 'Entry Time',
-          'downtime_author_name' => 'Author',
-          'downtime_comment_data' => 'Comment',
-          'downtime_scheduled_start_time' => 'Start',
-          'downtime_scheduled_end_time' => 'End',
-          'downtime_trigger_time' => 'Trigger Time',
-          'downtime_internal_downtime_id' => 'Downtime ID',
-          'downtime_duration' => 'Duration',
-      )
+        'downtime_is_in_effect'         => 'Is In Effect',
+        'object_type'                   => 'Service/Host',
+        'host_name'                     => 'Host Name',
+        'service_description'           => 'Service Name',
+        'downtime_entry_time'           => 'Entry Time',
+        'downtime_author_name'          => 'Author',
+        'downtime_comment_data'         => 'Comment',
+        'downtime_scheduled_start_time' => 'Start',
+        'downtime_scheduled_end_time'   => 'End',
+        'downtime_trigger_time'         => 'Trigger Time',
+        'downtime_internal_downtime_id' => 'Downtime ID',
+        'downtime_duration'             => 'Duration',
       )
+  );
   ?>
   <noscript>
     <button class="btn btn-small btn-default" >
-      <i>REFRESH ICON</i>
+      <i>{{REFRESH_ICON}}</i>
     </button>
   </noscript>
 </form>
@@ -90,14 +90,13 @@ $downtimes = $downtimes->fetchAll();
       <?= ($downtime->downtime_is_in_effect == 0 ? 'False' : '<b>True</b>'); ?>
     </td>
     <td>
-      <div >
-
+      <div>
         <?php if ($downtime->object_type == 'service'): ?>
-        <img title="Service" src="<?='../../img/classic/service.png'?>"/>
+          {{SERVICE_ICON}}
         <?php endif; ?>
 
         <?php if ($downtime->object_type == 'host'): ?>
-        <img title="Host" src="<?='../../img/classic/server.png'?>"/>
+          {{HOST_ICON}}
         <?php endif; ?>
       </div>
     </td>
diff --git a/modules/monitoring/application/views/scripts/list/notifications.phtml b/modules/monitoring/application/views/scripts/list/notifications.phtml
index b2db35046..9ee2feb5e 100644
--- a/modules/monitoring/application/views/scripts/list/notifications.phtml
+++ b/modules/monitoring/application/views/scripts/list/notifications.phtml
@@ -1,30 +1,30 @@
 <?= $this->tabs->render($this); ?>
 
 <?php
-$formatter = $this->getHelper('MonitoringProperties');
+  $formatter = $this->getHelper('MonitoringProperties');
 ?>
 
 <form method="get" action="<?=
-    $this->href(
-        'monitoring/list/notifications',
-        $this->notifications->getAppliedFilter()->toParams()
-    );
+  $this->href(
+    'monitoring/list/notifications',
+    $this->notifications->getAppliedFilter()->toParams()
+  );
 ?>">
   <label>Sort By</label> <?=
     $this->formSelect(
         'sort',
         $this->sort,
         array(
-            'class' => 'autosubmit'
+          'class' => 'autosubmit'
         ),
         array(
-            'notification_start_time' => 'Time'
+          'notification_start_time' => 'Time'
         )
     );
   ?>
   <noscript>
     <button class="btn btn-small btn-default">
-      <i>REFRESH ICON</i>
+      {{REFRESH_ICON}}
     </button>
   </noscript>
 </form>
@@ -42,7 +42,7 @@ echo $this->paginationControl($notifications, null, null, array('preserve' => $t
       <th>Type</th>
       <th>Time</th>
       <th>Contact</th>
-      <th>Notification command</th>
+      <th>Notification Command</th>
       <th>Information</th>
     </tr>
   </thead>
diff --git a/modules/monitoring/application/views/scripts/show/components/downtime.phtml b/modules/monitoring/application/views/scripts/show/components/downtime.phtml
index 15f362f34..7d9783e56 100644
--- a/modules/monitoring/application/views/scripts/show/components/downtime.phtml
+++ b/modules/monitoring/application/views/scripts/show/components/downtime.phtml
@@ -21,7 +21,7 @@
 
         $row[] = '<button type="button" data-target="command" class="btn btn-warning"'
             . ' data-command-id="29" data-command-info="'. $downtime->downtime_internal_downtime_id. '"'
-            . '><i class="icon-delete"></i> Delete'
+            . '>{{REMOVE_ICON}} Remove'
             . '</button>';
 
         $list[] = '<td>'. implode('</td><td>', $row). '</td>';