From 7be00791a79eabd76465f3ee4d09c68c3a6f44d5 Mon Sep 17 00:00:00 2001
From: Johannes Meyer <johannes.meyer@netways.de>
Date: Fri, 17 Apr 2015 16:15:58 +0200
Subject: [PATCH] list/eventhistory: Ensure dashboard compliance

refs #7876
---
 .../controllers/ListController.php            |  5 ++-
 .../views/scripts/list/eventhistory.phtml     | 33 +++++++------------
 2 files changed, 16 insertions(+), 22 deletions(-)

diff --git a/modules/monitoring/application/controllers/ListController.php b/modules/monitoring/application/controllers/ListController.php
index f655f7192..a6c38c2e1 100644
--- a/modules/monitoring/application/controllers/ListController.php
+++ b/modules/monitoring/application/controllers/ListController.php
@@ -624,6 +624,7 @@ class Monitoring_ListController extends Controller
         if ($url = $this->hasBetterUrl()) {
             return $this->redirectNow($url);
         }
+
         $this->addTitleTab(
             'eventhistory',
             $this->translate('Event Overview'),
@@ -645,11 +646,13 @@ class Monitoring_ListController extends Controller
         ));
 
         $this->filterQuery($query);
+        $this->view->history = $query->paginate();
 
+        $this->setupLimitControl();
+        $this->setupPaginationControl($this->view->history);
         $this->setupSortControl(array(
             'timestamp' => $this->translate('Occurence')
         ));
-        $this->view->history = $query->paginate();
     }
 
     public function servicegridAction()
diff --git a/modules/monitoring/application/views/scripts/list/eventhistory.phtml b/modules/monitoring/application/views/scripts/list/eventhistory.phtml
index b76b5a796..9ab581d59 100644
--- a/modules/monitoring/application/views/scripts/list/eventhistory.phtml
+++ b/modules/monitoring/application/views/scripts/list/eventhistory.phtml
@@ -1,32 +1,23 @@
 <?php
-
 use Icinga\Module\Monitoring\Object\Host;
 use Icinga\Module\Monitoring\Object\Service;
 
-?>
-
-<?php if (false === $this->compact): ?>
+if (! $this->compact): ?>
 <div class="controls">
-  <?= $this->tabs ?>
-  <div style="margin: 1em" class="dontprint">
-    <div style="float: right">
-      <?= $this->translate('Sort by') ?> <?= $this->sortControl ?>
-    </div>
-  </div>
-
-  <?= $this->widget('limiter', array('url' => $this->url, 'max' => $this->history->count())); ?>
-  <?= $this->paginationControl($history, null, null, array('preserve' => $this->preserve)); ?>
-
+  <?= $this->tabs; ?>
+  <?= $this->sortBox; ?>
+  <?= $this->limiter; ?>
+  <?= $this->paginator; ?>
+  <?= $this->filterEditor; ?>
 </div>
 <?php endif ?>
-
 <div class="content">
-<?= $this->filterEditor ?>
-<?php if (count($history) === 0): ?>
-  <?= $this->translate('No history events matching the filter') ?>
-</div>
-<?php return; endif ?>
-
+<?php
+if (count($history) === 0) {
+    echo $this->translate('No history events found matching the filter') . '</div>';
+    return;
+}
+?>
   <table data-base-target="_next" class="action">
     <tbody>
     <?php foreach ($history as $event): ?>