From 9ac77de47c1b909d285873861739e4b009bb98d2 Mon Sep 17 00:00:00 2001
From: Thomas Gelf <thomas@gelf.net>
Date: Tue, 18 Feb 2014 19:52:05 +0000
Subject: [PATCH] Some more HTML fixes

---
 .../monitoring/application/controllers/ListController.php   | 3 ++-
 .../views/scripts/multi/components/comments.phtml           | 6 +++---
 .../views/scripts/multi/components/downtimes.phtml          | 4 ++--
 3 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/modules/monitoring/application/controllers/ListController.php b/modules/monitoring/application/controllers/ListController.php
index 5de2bc95e..d3e5cb4ca 100644
--- a/modules/monitoring/application/controllers/ListController.php
+++ b/modules/monitoring/application/controllers/ListController.php
@@ -172,7 +172,8 @@ class Monitoring_ListController extends MonitoringController
         $this->applyRestrictions($query);
         $this->view->services = $query->paginate();
 
-        $this->setupFilterControl(ServiceStatus::fromRequest($this->getRequest()), 'service');
+        //$this->setupFilterControl(ServiceStatus::fromRequest($this->getRequest()), 'service');
+        $this->setupFilterControl($query, 'service');
         $this->setupSortControl(array(
             'service_last_check'    =>  'Last Service Check',
             'service_severity'      =>  'Severity',
diff --git a/modules/monitoring/application/views/scripts/multi/components/comments.phtml b/modules/monitoring/application/views/scripts/multi/components/comments.phtml
index b24b7352f..97e174076 100644
--- a/modules/monitoring/application/views/scripts/multi/components/comments.phtml
+++ b/modules/monitoring/application/views/scripts/multi/components/comments.phtml
@@ -8,7 +8,7 @@
                 $this->target
             );
         ?>" class="btn-common btn-small button">
-            <i class="icinga-icon-comment"></i>
+            <?= $this->img('img/icons/comment.png') ?>
         </a>
 
         <a rel="tooltip" title="Send custom notifications for all selected hosts or services" href="<?=
@@ -17,7 +17,7 @@
                 $this->target
             );
         ?>" class="btn-common btn-small button">
-            <i class="icinga-icon-notification"></i>
+            <?= $this->img('img/icons/notification.png') ?>"></i>
 		</a>
     </div>
 
@@ -43,7 +43,7 @@
 					$this->target
 				);
 				?>" class="button btn-common btn-small input-sm pull-right">
-				<i class="icinga-icon-remove"></i>
+				<?= $this->img('img/icons/remove.png') ?>"></i>
 			</a>
 		<?php } else { ?>
 			There are 0 comments assigned to the selected items.
diff --git a/modules/monitoring/application/views/scripts/multi/components/downtimes.phtml b/modules/monitoring/application/views/scripts/multi/components/downtimes.phtml
index 9dd4d3cb9..08e7abfa3 100644
--- a/modules/monitoring/application/views/scripts/multi/components/downtimes.phtml
+++ b/modules/monitoring/application/views/scripts/multi/components/downtimes.phtml
@@ -8,7 +8,7 @@
                 $this->target
             );
         ?>" class="button btn-common btn-small input-sm pull-right">
-            <i class="icinga-icon-in-downtime"></i>
+            <?= $this->img('img/icons/in_downtime.png') ?>
         </a>
 
     </div>
@@ -30,7 +30,7 @@
                         $this->target
                     );
                     ?>" class="button btn-common btn-small input-sm pull-right">
-                    <i class="icinga-icon-remove"></i>
+                    <?= $this->img('img/icons/remove.png') ?>
                 </a>
             <?php } else { ?>
                 0 Selected items are currently in downtime.