From badad1df44568a66599d5caede126de8f5402258 Mon Sep 17 00:00:00 2001
From: Alexander Klimov <alexander.klimov@netways.de>
Date: Wed, 26 Nov 2014 16:07:33 +0100
Subject: [PATCH 1/2] Event history: move sort control to the right

refs #6638
---
 .../application/views/scripts/list/eventhistory.phtml       | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/modules/monitoring/application/views/scripts/list/eventhistory.phtml b/modules/monitoring/application/views/scripts/list/eventhistory.phtml
index 32f61ca44..4830f2a29 100644
--- a/modules/monitoring/application/views/scripts/list/eventhistory.phtml
+++ b/modules/monitoring/application/views/scripts/list/eventhistory.phtml
@@ -1,8 +1,10 @@
 <?php if (false === $this->compact): ?>
 <div class="controls">
-  <?= $this->tabs->render($this); ?>
+  <?= $this->tabs ?>
   <div style="margin: 1em" class="dontprint">
-    <?= $this->translate('Sort by'); ?> <?= $this->sortControl->render($this); ?>
+    <div style="float: right">
+      <?= $this->translate('Sort by') ?> <?= $this->sortControl ?>
+    </div>
   </div>
 
   <?= $this->widget('limiter', array('url' => $this->url, 'max' => $this->history->count())); ?>

From 0b3e306b8abdda0939394cae48b02338f8560d25 Mon Sep 17 00:00:00 2001
From: Alexander Klimov <alexander.klimov@netways.de>
Date: Wed, 26 Nov 2014 16:07:33 +0100
Subject: [PATCH 2/2] Event history: display filter editor

refs #6638
---
 modules/monitoring/application/controllers/ListController.php    | 1 +
 .../monitoring/application/views/scripts/list/eventhistory.phtml | 1 +
 2 files changed, 2 insertions(+)

diff --git a/modules/monitoring/application/controllers/ListController.php b/modules/monitoring/application/controllers/ListController.php
index c5d7cc906..21c808e5e 100644
--- a/modules/monitoring/application/controllers/ListController.php
+++ b/modules/monitoring/application/controllers/ListController.php
@@ -604,6 +604,7 @@ class Monitoring_ListController extends Controller
 
         $this->applyFilter($query);
 
+        $this->filterQuery($query);
         $this->setupSortControl(array(
             'timestamp' => 'Occurence'
         ));
diff --git a/modules/monitoring/application/views/scripts/list/eventhistory.phtml b/modules/monitoring/application/views/scripts/list/eventhistory.phtml
index 4830f2a29..c765b41be 100644
--- a/modules/monitoring/application/views/scripts/list/eventhistory.phtml
+++ b/modules/monitoring/application/views/scripts/list/eventhistory.phtml
@@ -14,6 +14,7 @@
 <?php endif ?>
 
 <div class="content">
+<?= $this->filterEditor ?>
 <?php if (empty($history)): ?>
   <?= $this->translate('No history events matching the filter') ?>
 </div>