From 65db5c4accd0ea865e0df7a2a59589ffcb0e3615 Mon Sep 17 00:00:00 2001
From: Thomas Gelf <thomas@gelf.net>
Date: Fri, 20 Jun 2014 13:50:25 +0200
Subject: [PATCH] list/services: move filterEditor to content

As it may occupy quite some space it is better having it scrollable
---
 .../application/views/scripts/list/services.phtml        | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/modules/monitoring/application/views/scripts/list/services.phtml b/modules/monitoring/application/views/scripts/list/services.phtml
index a1e8c0749..a8a8429fb 100644
--- a/modules/monitoring/application/views/scripts/list/services.phtml
+++ b/modules/monitoring/application/views/scripts/list/services.phtml
@@ -6,19 +6,22 @@ if (!$this->compact): ?>
 <?= $this->tabs ?>
 <div style="margin: 1em;" class="dontprint">
 <?= $this->translate('Sort by') ?> <?= $this->sortControl ?>
-<?= $this->filterWidget ?><br />
+<?php if (! $this->filterEditor): ?>
+<?= $this->filterPreview ?>
+<?php endif ?>
 </div>
 
 <?= $this->widget('limiter')->setCurrentPageCount($this->services->count()) ?>
 <?= $this->paginationControl($services, null, null, array('preserve' => $this->preserve)) ?>
-<?= $this->selectionToolbar('multi', $this->href('monitoring/multi/service', $query)) ?>
+<?= $this->selectionToolbar('multi', $this->href('monitoring/multi/service?' . $this->filter->toQueryString())) ?>
 </div>
 
 <div class="content">
+<?= $this->filterEditor ?>
 <?php endif ?>
 <table data-base-target="_next"
     class="action multiselect <?php if ($this->compact): ?> compact<?php endif ?>" style="table-layout: auto;"
-    data-icinga-multiselect-url="<?= $this->href("/monitoring/multi/service") ?>"
+    data-icinga-multiselect-url="<?= $this->href("monitoring/multi/service") ?>"
     data-icinga-multiselect-data="service,host">
   <tbody>
 <?php