From c7249eab0c494f9341c7a9b7b9fecb756c2f915b Mon Sep 17 00:00:00 2001
From: Eric Lippmann <eric.lippmann@netways.de>
Date: Thu, 31 Mar 2016 09:36:59 +0200
Subject: [PATCH] monitoring: Update controls markup in event views

refs #11145
---
 .../application/views/scripts/list/eventgrid.phtml        | 8 ++------
 .../application/views/scripts/list/eventhistory.phtml     | 6 +++---
 2 files changed, 5 insertions(+), 9 deletions(-)

diff --git a/modules/monitoring/application/views/scripts/list/eventgrid.phtml b/modules/monitoring/application/views/scripts/list/eventgrid.phtml
index 37024b841..aafa9b6b1 100644
--- a/modules/monitoring/application/views/scripts/list/eventgrid.phtml
+++ b/modules/monitoring/application/views/scripts/list/eventgrid.phtml
@@ -4,12 +4,8 @@ use Icinga\Web\Widget\Chart\HistoryColorGrid;
 
 if (! $this->compact): ?>
 <div class="controls">
-  <?= $this->tabs; ?>
-  <?= $this->sortBox; ?>
-  <?= $this->limiter; ?>
-  <?= $this->paginator; ?>
-  <?= $this->filterEditor; ?>
-  <?= $form; ?>
+    <?= $this->tabs ?>
+    <?= $this->form ?>
 </div>
 <?php endif ?>
 <div class="content" data-base-target="_next">
diff --git a/modules/monitoring/application/views/scripts/list/eventhistory.phtml b/modules/monitoring/application/views/scripts/list/eventhistory.phtml
index 32bb3d128..2ee788d60 100644
--- a/modules/monitoring/application/views/scripts/list/eventhistory.phtml
+++ b/modules/monitoring/application/views/scripts/list/eventhistory.phtml
@@ -3,11 +3,11 @@
 if (! $this->compact): ?>
 <div class="controls">
     <?= $this->tabs ?>
-    <div class="grid">
-        <?= $this->sortBox ?>
+    <div class="sort-controls-container">
         <?= $this->limiter ?>
-        <?= $this->filterEditor ?>
+        <?= $this->sortBox ?>
     </div>
+    <?= $this->filterEditor ?>
 </div>
 <?php endif ?>
 <?= $this->partial(