From 93889442834a464085fe3e7a36a7978ed9cf57c7 Mon Sep 17 00:00:00 2001
From: Johannes Meyer <johannes.meyer@netways.de>
Date: Fri, 17 Apr 2015 16:10:21 +0200
Subject: [PATCH] show/history: Ensure dashboard compliance

refs #7876
---
 .../controllers/ShowController.php            |  3 ++
 .../views/scripts/show/history.phtml          | 30 +++++++++++--------
 2 files changed, 20 insertions(+), 13 deletions(-)

diff --git a/modules/monitoring/application/controllers/ShowController.php b/modules/monitoring/application/controllers/ShowController.php
index fe5633ab29..bf8c5298d8 100644
--- a/modules/monitoring/application/controllers/ShowController.php
+++ b/modules/monitoring/application/controllers/ShowController.php
@@ -73,6 +73,9 @@ public function historyAction()
         $this->view->history = $this->view->object->eventhistory->getQuery()->paginate($this->params->get('limit', 50));
         $this->handleFormatRequest($this->view->object->eventhistory);
         $this->fetchHostStats();
+
+        $this->setupLimitControl();
+        $this->setupPaginationControl($this->view->history);
     }
 
     public function servicesAction()
diff --git a/modules/monitoring/application/views/scripts/show/history.phtml b/modules/monitoring/application/views/scripts/show/history.phtml
index d82f454f65..d2fd1a383e 100644
--- a/modules/monitoring/application/views/scripts/show/history.phtml
+++ b/modules/monitoring/application/views/scripts/show/history.phtml
@@ -1,29 +1,33 @@
 <?php
-
 use Icinga\Module\Monitoring\Object\Host;
 use Icinga\Module\Monitoring\Object\Service;
 
 $self = $this;
 $hostContext = $object->getType() === 'host';
 
-?>
-
+if (! $this->compact): ?>
 <div class="controls">
-<?php if ($hostContext): ?>
+  <?= $this->tabs; ?>
+ <?php if ($hostContext): ?>
   <?= $this->render('partials/host/object-header.phtml'); ?>
-<?php else: ?>
+ <?php else: ?>
   <?= $this->render('partials/service/object-header.phtml'); ?>
-<?php endif ?>
+ <?php endif ?>
   <h1><?= $this->translate('This Object\'s Event History'); ?></h1>
-  <?= $this->widget('limiter', array('url' => $url, 'max' => $history->count())); ?>
-  <?= $this->paginationControl($history, null, null, array('preserve' => $this->preserve)); ?>
+  <?= $this->sortBox; ?>
+  <?= $this->limiter; ?>
+  <?= $this->paginator; ?>
+  <?= $this->filterEditor; ?>
 </div>
-
+<?php endif ?>
 <div class="content">
-<?php if (count($history) === 0): ?>
-  <?= $this->translate('No history available for this object'); ?>
-</div>
-<?php return; endif ?>
+<?php
+
+if (count($history) === 0) {
+    echo $this->translate('No history available for this object') . '</div>';
+    return;
+}
+?>
 
 <?php
 function contactsLink($match, $view) {