From ff1ed128eff9801c245f850885a30970a0b4ca0c Mon Sep 17 00:00:00 2001
From: Eric Lippmann <eric.lippmann@netways.de>
Date: Tue, 20 Aug 2013 12:18:51 +0200
Subject: [PATCH] Remove filter boxes from monitoring' list views since they're
 not working

refs #4583
---
 .../views/scripts/list/downtimes.phtml        |  1 -
 .../views/scripts/list/hosts.phtml            | 13 ++++----
 .../views/scripts/list/notifications.phtml    |  5 ++-
 .../views/scripts/list/services-compact.phtml | 33 +++----------------
 .../views/scripts/list/services.phtml         | 11 +++----
 5 files changed, 18 insertions(+), 45 deletions(-)

diff --git a/modules/monitoring/application/views/scripts/list/downtimes.phtml b/modules/monitoring/application/views/scripts/list/downtimes.phtml
index ca28045bf..de4ef74b2 100644
--- a/modules/monitoring/application/views/scripts/list/downtimes.phtml
+++ b/modules/monitoring/application/views/scripts/list/downtimes.phtml
@@ -41,7 +41,6 @@ $downtimes = $downtimes->fetchAll();
             'downtime_duration' => 'Duration',
         )
     ) ?>
-    <input type="search" name="filter" placeholder="Type to filter" />
     <button class="btn btn-small"><i class="icon-refresh"></i></button>
 </form>
 <?=
diff --git a/modules/monitoring/application/views/scripts/list/hosts.phtml b/modules/monitoring/application/views/scripts/list/hosts.phtml
index adc6aa477..325c3800b 100644
--- a/modules/monitoring/application/views/scripts/list/hosts.phtml
+++ b/modules/monitoring/application/views/scripts/list/hosts.phtml
@@ -20,7 +20,6 @@ $trimArea = $this->getHelper('Trim');
             'host_name' => 'Host',
         )
     ) ?>
-    <input type="search" name="filter" placeholder="Type to filter" />
     <button class="btn btn-small"><i class="icon-refresh"></i></button>
 </form>
 <?=  $this->paginationControl($hosts, null, null, array('preserve' => $this->preserve)) ?>
@@ -45,14 +44,14 @@ $trimArea = $this->getHelper('Trim');
                 <?php endif; ?>
                 <?php $trimArea->end(); ?></div>
             </td>
-            <td class="icons indicator"> 
+            <td class="icons indicator">
                 <div class="icon-box"><?php $trimArea->start(); ?>
                 <?php if (!$host->host_handled && $host->host_state > 0): ?>
                     <a href="#" title="<?= 'Unhandled host' ?>">
                         <i class="icon-warning-sign"></i>
                     </a>
-                <?php endif; ?> 
-                <?php if ($host->host_acknowledged && !$host->host_in_downtime): ?> 
+                <?php endif; ?>
+                <?php if ($host->host_acknowledged && !$host->host_in_downtime): ?>
                     <a href="#" title="<?= 'Acknowledged' ?>">
                         <i class="icon-ok-sign"></i>
                     </a>
@@ -61,7 +60,7 @@ $trimArea = $this->getHelper('Trim');
                     <a href="#" title="<?= 'Flapping' ?>">
                         <i class="icon-random"></i>
                     </a>
-                <?php endif; ?> 
+                <?php endif; ?>
                 <?php if (!$host->host_notifications_enabled): ?>
                     <a href="#" title="<?= 'Notifications disabled' ?>">
                         <i class="icon-volume-off"></i>
@@ -72,7 +71,7 @@ $trimArea = $this->getHelper('Trim');
                         <i class="icon-wrench"></i>
                     </a>
                 <?php endif; ?>
-                <?php $trimArea->end(); ?></div> 
+                <?php $trimArea->end(); ?></div>
             </td>
             <td class="indicator state" title="<?= $viewHelper->getStateTitle($host, 'host'); ?>">
                 <div class="statetext">
@@ -92,7 +91,7 @@ $trimArea = $this->getHelper('Trim');
                     <?php endif; ?>
                 </div>
             </td>
-            
+
             <td class="hostname">
                 <?php if ($host->host_last_comment !== null): ?>
                     <a href="#" title="<?= 'Comments' ?>">
diff --git a/modules/monitoring/application/views/scripts/list/notifications.phtml b/modules/monitoring/application/views/scripts/list/notifications.phtml
index fd3aebf5f..41bf12f3b 100644
--- a/modules/monitoring/application/views/scripts/list/notifications.phtml
+++ b/modules/monitoring/application/views/scripts/list/notifications.phtml
@@ -22,8 +22,7 @@ $formatter = $this->getHelper('MonitoringProperties');
             'notification_start_time' => 'Time'
         )
     );
-?> 
-    <input type="search" name="filter" placeholder="Type to filter" />
+?>
     <button class="btn btn-small"><i class="icon-refresh"></i></button>
 </form>
 
@@ -89,4 +88,4 @@ echo $this->paginationControl($notifications, null, null, array('preserve' => $t
         </tr>
 <?php endforeach; ?>
     </tbody>
-</table>
\ No newline at end of file
+</table>
diff --git a/modules/monitoring/application/views/scripts/list/services-compact.phtml b/modules/monitoring/application/views/scripts/list/services-compact.phtml
index 93486257a..1ce5a87a5 100644
--- a/modules/monitoring/application/views/scripts/list/services-compact.phtml
+++ b/modules/monitoring/application/views/scripts/list/services-compact.phtml
@@ -11,29 +11,6 @@ $trimArea = $this->getHelper('Trim');
     </div>
 <?php return; endif ?>
 
-
-<form method="get" action="<?= $this->qUrl(
-    'monitoring/list/services?' . http_build_query($this->services->getAppliedFilter()->toParams()),
-    array()
-);
-?>">
-    Sort by <?= $this->formSelect(
-        'sort',
-        $this->sort,
-        array('class' => 'autosubmit'),
-        array(
-            'service_severity' => 'Severity',
-            'service_last_state_change' => 'Last state change',
-            'service_last_time_unknown' => 'Last UNKNOWN',
-            'service_last_time_critical' => 'Last CRITICAL',
-            'service_last_time_warning' => 'Last WARNING',
-            'service_last_time_ok' => 'Last OK',
-            'service_description' => 'Service',
-        )
-    ) ?>
-    <input type="search" name="filter" placeholder="Type to filter" />
-    <button class="btn btn-small"><i class="icon-refresh"></i></button>
-</form>
 <?=  $this->paginationControl($paginator, null, null, array('preserve' => $this->preserve)) ?>
 
 <table class="statustable action services">
@@ -56,14 +33,14 @@ $trimArea = $this->getHelper('Trim');
                 <?php endif; ?>
                 <?php $trimArea->end(); ?></div>
             </td>
-            <td class="icons indicator"> 
+            <td class="icons indicator">
                 <div class="icon-box"><?php $trimArea->start(); ?>
                 <?php if (!$service->service_handled && $service->service_state > 0): ?>
                     <a href="#" title="<?= 'Unhandled service' ?>">
                         <i class="icon-warning-sign"></i>
                     </a>
-                <?php endif; ?> 
-                <?php if ($service->service_acknowledged && !$service->service_in_downtime): ?> 
+                <?php endif; ?>
+                <?php if ($service->service_acknowledged && !$service->service_in_downtime): ?>
                     <a href="#" title="<?= 'Acknowledged' ?>">
                         <i class="icon-ok-sign"></i>
                     </a>
@@ -72,7 +49,7 @@ $trimArea = $this->getHelper('Trim');
                     <a href="#" title="<?= 'Flapping' ?>">
                         <i class="icon-random"></i>
                     </a>
-                <?php endif; ?> 
+                <?php endif; ?>
                 <?php if (!$service->service_notifications_enabled): ?>
                     <a href="#" title="<?= 'Notifications disabled' ?>">
                         <i class="icon-volume-off"></i>
@@ -83,7 +60,7 @@ $trimArea = $this->getHelper('Trim');
                         <i class="icon-wrench"></i>
                     </a>
                 <?php endif; ?>
-                <?php $trimArea->end(); ?></div> 
+                <?php $trimArea->end(); ?></div>
             </td>
 
 
diff --git a/modules/monitoring/application/views/scripts/list/services.phtml b/modules/monitoring/application/views/scripts/list/services.phtml
index 2fb224e75..2b2ff07e7 100644
--- a/modules/monitoring/application/views/scripts/list/services.phtml
+++ b/modules/monitoring/application/views/scripts/list/services.phtml
@@ -33,7 +33,6 @@ $trimArea = $this->getHelper('Trim');
             'service_description' => 'Service',
         )
     ) ?>
-    <input type="search" name="filter" placeholder="Type to filter" />
     <button class="btn btn-small"><i class="icon-refresh"></i></button>
 </form>
 <?=  $this->paginationControl($paginator, null, null, array('preserve' => $this->preserve)) ?>
@@ -59,14 +58,14 @@ $trimArea = $this->getHelper('Trim');
                 <?php endif; ?>
                 <?php $trimArea->end(); ?></div>
             </td>
-            <td class="icons indicator"> 
+            <td class="icons indicator">
                 <div class="icon-box"><?php $trimArea->start(); ?>
                 <?php if (!$service->service_handled && $service->service_state > 0): ?>
                     <a href="#" title="<?= 'Unhandled service' ?>">
                         <i class="icon-warning-sign"></i>
                     </a>
-                <?php endif; ?> 
-                <?php if ($service->service_acknowledged && !$service->service_in_downtime): ?> 
+                <?php endif; ?>
+                <?php if ($service->service_acknowledged && !$service->service_in_downtime): ?>
                     <a href="#" title="<?= 'Acknowledged' ?>">
                         <i class="icon-ok-sign"></i>
                     </a>
@@ -75,7 +74,7 @@ $trimArea = $this->getHelper('Trim');
                     <a href="#" title="<?= 'Flapping' ?>">
                         <i class="icon-random"></i>
                     </a>
-                <?php endif; ?> 
+                <?php endif; ?>
                 <?php if (!$service->service_notifications_enabled): ?>
                     <a href="#" title="<?= 'Notifications disabled' ?>">
                         <i class="icon-volume-off"></i>
@@ -86,7 +85,7 @@ $trimArea = $this->getHelper('Trim');
                         <i class="icon-wrench"></i>
                     </a>
                 <?php endif; ?>
-                <?php $trimArea->end(); ?></div> 
+                <?php $trimArea->end(); ?></div>
             </td>