[icinga-checkins] icinga.org: icingaweb2/master: Fixes service and config icons

git at icinga.org git at icinga.org
Wed Nov 19 08:20:09 CET 2014


Module: icingaweb2
Branch: master
Commit: e44086cb9f16815a6e1c1482242dc8ec441c0fb5
URL:    https://git.icinga.org/?p=icingaweb2.git;a=commit;h=e44086cb9f16815a6e1c1482242dc8ec441c0fb5

Author: Bernd Erk <bernd.erk at icinga.org>
Date:   Mon Nov 17 16:27:12 2014 +0100

Fixes service and config icons

---

 modules/monitoring/application/controllers/ShowController.php      |    4 ++--
 .../monitoring/application/views/scripts/command/renderform.phtml  |    2 +-
 modules/monitoring/application/views/scripts/list/comments.phtml   |    2 +-
 modules/monitoring/application/views/scripts/multi/service.phtml   |    2 +-
 .../application/views/scripts/partials/command-form.phtml          |    2 +-
 .../application/views/scripts/show/components/servicegroups.phtml  |    2 +-
 modules/monitoring/configuration.php                               |    2 +-
 .../Monitoring/Web/Controller/MonitoredObjectController.php        |    4 ++--
 8 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/modules/monitoring/application/controllers/ShowController.php b/modules/monitoring/application/controllers/ShowController.php
index 6c295e6..03c1d62 100644
--- a/modules/monitoring/application/controllers/ShowController.php
+++ b/modules/monitoring/application/controllers/ShowController.php
@@ -212,7 +212,7 @@ class Monitoring_ShowController extends Controller
                 'service',
                 array(
                     'title'     => 'Service',
-                    'icon'      => 'service',
+                    'icon'      => 'conf',
                     'url'       => 'monitoring/show/service',
                     'urlParams' => $params,
                 )
@@ -222,7 +222,7 @@ class Monitoring_ShowController extends Controller
             'services',
             array(
                 'title'     => 'Services',
-                'icon'      => 'service',
+                'icon'      => 'conf-alt',
                 'url'       => 'monitoring/show/services',
                 'urlParams' => $params,
             )
diff --git a/modules/monitoring/application/views/scripts/command/renderform.phtml b/modules/monitoring/application/views/scripts/command/renderform.phtml
index 0573f34..9c8e794 100644
--- a/modules/monitoring/application/views/scripts/command/renderform.phtml
+++ b/modules/monitoring/application/views/scripts/command/renderform.phtml
@@ -7,7 +7,7 @@
   <thead>
     <tr>
       <th><?= $this->icon('host') ?> Host</th>
-      <th><?= $this->icon('service') ?> Service</th>
+      <th><?= $this->icon('conf') ?> Service</th>
     </tr>
   </thead>
     <tbody>
diff --git a/modules/monitoring/application/views/scripts/list/comments.phtml b/modules/monitoring/application/views/scripts/list/comments.phtml
index 8ab4994..feb5c93 100644
--- a/modules/monitoring/application/views/scripts/list/comments.phtml
+++ b/modules/monitoring/application/views/scripts/list/comments.phtml
@@ -50,7 +50,7 @@
         </td>
         <td>
         <?php if ($comment->objecttype === 'service'): ?>
-          <?= $this->icon('service'); ?> <a href="<?= $this->href('monitoring/service/show', array(
+          <?= $this->icon('conf'); ?> <a href="<?= $this->href('monitoring/service/show', array(
             'host'    => $comment->host,
             'service' => $comment->service,
           )); ?>">
diff --git a/modules/monitoring/application/views/scripts/multi/service.phtml b/modules/monitoring/application/views/scripts/multi/service.phtml
index aede268..dc2e9f1 100644
--- a/modules/monitoring/application/views/scripts/multi/service.phtml
+++ b/modules/monitoring/application/views/scripts/multi/service.phtml
@@ -45,7 +45,7 @@ $this->target = array(
     </tr>
   </table>
 
-  <h2><?=$this->icon('service')?> Service Actions</h2>
+  <h2><?=$this->icon('conf')?> Service Actions</h2>
 
   <table class="avp newsection">
     <tbody>
diff --git a/modules/monitoring/application/views/scripts/partials/command-form.phtml b/modules/monitoring/application/views/scripts/partials/command-form.phtml
index 4740f33..1624260 100644
--- a/modules/monitoring/application/views/scripts/partials/command-form.phtml
+++ b/modules/monitoring/application/views/scripts/partials/command-form.phtml
@@ -8,7 +8,7 @@
         <thead>
             <tr>
                 <th><?= $this->icon('host') ?> <?= $this->translate('Host') ?></th>
-                <th><?= $this->icon('service') ?> <?= $this->translate('Service') ?></th>
+                <th><?= $this->icon('conf') ?> <?= $this->translate('Service') ?></th>
             </tr>
         </thead>
         <tbody>
diff --git a/modules/monitoring/application/views/scripts/show/components/servicegroups.phtml b/modules/monitoring/application/views/scripts/show/components/servicegroups.phtml
index db6aece..181f194 100644
--- a/modules/monitoring/application/views/scripts/show/components/servicegroups.phtml
+++ b/modules/monitoring/application/views/scripts/show/components/servicegroups.phtml
@@ -12,7 +12,7 @@ foreach ($object->servicegroups as $name => $alias) {
 printf(
     "<tr><th>%s</th><td>%s %s</td></tr>\n",
     $this->translate('Servicegroups'),
-    $this->icon('service'),
+    $this->icon('conf-alt'),
     implode(', ', $list)
 );
 
diff --git a/modules/monitoring/configuration.php b/modules/monitoring/configuration.php
index 64d8cb2..bb5b646 100644
--- a/modules/monitoring/configuration.php
+++ b/modules/monitoring/configuration.php
@@ -124,7 +124,7 @@ $section->add($this->translate('Timeline'))->setUrl('monitoring/timeline');
  * Reporting Section
  */
 $section = $this->menuSection($this->translate('Reporting'), array(
-    'icon'      => 'chart-line',
+    'icon'      => 'service',
     'priority'  => 100
 ));
 
diff --git a/modules/monitoring/library/Monitoring/Web/Controller/MonitoredObjectController.php b/modules/monitoring/library/Monitoring/Web/Controller/MonitoredObjectController.php
index c6b252d..82c70fc 100644
--- a/modules/monitoring/library/Monitoring/Web/Controller/MonitoredObjectController.php
+++ b/modules/monitoring/library/Monitoring/Web/Controller/MonitoredObjectController.php
@@ -197,7 +197,7 @@ abstract class MonitoredObjectController extends Controller
                 'service',
                 array(
                     'title'     => 'Service',
-                    'icon'      => 'service',
+                    'icon'      => 'conf',
                     'url'       => 'monitoring/service/show',
                     'urlParams' => $params
                 )
@@ -207,7 +207,7 @@ abstract class MonitoredObjectController extends Controller
             'services',
             array(
                 'title'     => 'Services',
-                'icon'      => 'service',
+                'icon'      => 'conf-alt',
                 'url'       => 'monitoring/show/services',
                 'urlParams' => $params
             )



More information about the icinga-checkins mailing list