From 16124989dd41bd1324f6273685bc0427fa25b1ab Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jannis=20Mo=C3=9Fhammer?= <jannis.mosshammer@netways.de>
Date: Tue, 22 Oct 2013 15:57:30 +0200
Subject: [PATCH] Various style fixes, changed icon size, fixed show/service

---
 .../views/scripts/mixedPagination.phtml       |   2 +-
 library/Icinga/Web/Widget/FilterBox.php       |   4 +-
 .../Widget/Tabextension/DashboardAction.php   |   3 +-
 library/Icinga/Web/Widget/Tabs.php            |   4 +-
 .../controllers/ListController.php            |  39 +---
 .../views/scripts/list/comments.phtml         |  17 +-
 .../views/scripts/list/contactgroups.phtml    |  11 +-
 .../views/scripts/list/contacts.phtml         |  11 +-
 .../views/scripts/list/downtimes.phtml        |   9 +-
 .../views/scripts/list/eventhistory.phtml     |   9 +-
 .../views/scripts/list/hostgroups.phtml       |   8 +
 .../views/scripts/list/hosts.phtml            |  10 +-
 .../views/scripts/list/notifications.phtml    |   9 +-
 .../views/scripts/list/servicegroups.phtml    |   9 +
 .../views/scripts/list/services-compact.phtml | 196 +++++++++---------
 .../views/scripts/list/services.phtml         |  11 +-
 .../scripts/show/components/status.phtml      |   5 +-
 .../library/Monitoring/Controller.php         |   7 +-
 public/img/icons/expand.png                   | Bin 823 -> 2993 bytes
 public/img/icons/expand_petrol.png            | Bin 779 -> 2992 bytes
 20 files changed, 204 insertions(+), 160 deletions(-)

diff --git a/application/views/scripts/mixedPagination.phtml b/application/views/scripts/mixedPagination.phtml
index 10fabacfc..2542ec367 100755
--- a/application/views/scripts/mixedPagination.phtml
+++ b/application/views/scripts/mixedPagination.phtml
@@ -21,7 +21,7 @@ $title_next = sprintf(
 );
 
 ?>
-<ul class="pagination pagination-sm">
+<ul class="pagination">
   <!-- Previous page link -->
 
 <?php if (isset($this->previous)): ?>
diff --git a/library/Icinga/Web/Widget/FilterBox.php b/library/Icinga/Web/Widget/FilterBox.php
index 77c8c18e3..6cb0e0be9 100644
--- a/library/Icinga/Web/Widget/FilterBox.php
+++ b/library/Icinga/Web/Widget/FilterBox.php
@@ -64,8 +64,8 @@ class FilterBox implements Widget
      */
     private static $TPL = <<<'EOT'
 <div class="row">
-    <div class="col-md-12">{{FORM}}</div>
-    <div class="col-md-12">{{BADGES}}</div>
+    {{FORM}}
+    {{BADGES}}
 </div>
 EOT;
 
diff --git a/library/Icinga/Web/Widget/Tabextension/DashboardAction.php b/library/Icinga/Web/Widget/Tabextension/DashboardAction.php
index cb4e26180..ab1c2521f 100644
--- a/library/Icinga/Web/Widget/Tabextension/DashboardAction.php
+++ b/library/Icinga/Web/Widget/Tabextension/DashboardAction.php
@@ -52,7 +52,8 @@ class DashboardAction implements Tabextension
         $tabs->addAsDropdown(
             'dashboard',
             array(
-                'title'     => '{{DASHBOARD_ICON}} Add To Dashboard',
+                'iconCls'   => 'icinga-icon-dashboard',
+                'title'     => 'Add To Dashboard',
                 'url'       => Url::fromPath('dashboard/addurl'),
                 'urlParams' => array(
                     'url' => Url::fromRequest()->getRelativeUrl()
diff --git a/library/Icinga/Web/Widget/Tabs.php b/library/Icinga/Web/Widget/Tabs.php
index f6dea149d..5fa220901 100644
--- a/library/Icinga/Web/Widget/Tabs.php
+++ b/library/Icinga/Web/Widget/Tabs.php
@@ -57,8 +57,8 @@ EOT;
      */
     private $dropdownTpl = <<< 'EOT'
 <li class="dropdown pull-right ">
-    <a href="#" class="dropdown-toggle" data-toggle="dropdown">
-        <b class="caret"></b>
+    <a href="#" class="dropdown-toggle" data-toggle="dropdown" style="margin-top:3px">
+        <i style="" class="caret"></i> Actions
     </a>
     <ul class="dropdown-menu">
         {TABS}
diff --git a/modules/monitoring/application/controllers/ListController.php b/modules/monitoring/application/controllers/ListController.php
index bf299e28a..aecaad6a0 100644
--- a/modules/monitoring/application/controllers/ListController.php
+++ b/modules/monitoring/application/controllers/ListController.php
@@ -63,7 +63,6 @@ class Monitoring_ListController extends MonitoringController
      * @var Backend
      */
     protected $backend;
-
     /**
      * Compact layout name
      *
@@ -72,7 +71,7 @@ class Monitoring_ListController extends MonitoringController
      *
      * @var string
      */
-    private $compactView;
+    protected $compactView;
 
     /**
      * Retrieve backend and hooks for this controller
@@ -168,6 +167,7 @@ class Monitoring_ListController extends MonitoringController
             'host_address'          =>  'Host Address',
             'host_last_check'       =>  'Last Host Check'
         ));
+
     }
 
     /**
@@ -379,39 +379,6 @@ class Monitoring_ListController extends MonitoringController
         );
     }
 
-    /**
-     * Handle the 'format' and 'view' parameter
-     *
-     * @param Query $query The current query
-     */
-    private function handleFormatRequest($query)
-    {
-        if ($this->compactView !== null && ($this->_getParam('view', false) === 'compact')) {
-            $this->_helper->viewRenderer($this->compactView);
-        }
-
-
-        if ($this->getParam('format') === 'sql'
-            && IcingaConfig::app()->global->get('environment', 'production') === 'development') {
-            echo '<pre>'
-                . htmlspecialchars(wordwrap($query->dump()))
-                . '</pre>';
-            exit;
-        }
-        if ($this->_getParam('format') === 'json'
-            || $this->_request->getHeader('Accept') === 'application/json')
-        {
-            header('Content-type: application/json');
-            echo json_encode($query->fetchAll());
-            exit;
-        }
-        if ($this->_getParam('format') === 'csv'
-            || $this->_request->getHeader('Accept') === 'text/csv') {
-            Csv::fromQuery($query)->dump();
-            exit;
-        }
-    }
-
     /**
      * Create a sort control box at the 'sortControl' view parameter
      *
@@ -446,7 +413,7 @@ class Monitoring_ListController extends MonitoringController
     private function createTabs()
     {
         $tabs = $this->getTabs();
-        $tabs->extend(new OutputFormat())
+        $tabs//->extend(new OutputFormat())
             ->extend(new DashboardAction());
     }
 }
diff --git a/modules/monitoring/application/views/scripts/list/comments.phtml b/modules/monitoring/application/views/scripts/list/comments.phtml
index 964c4b1a6..764f28863 100644
--- a/modules/monitoring/application/views/scripts/list/comments.phtml
+++ b/modules/monitoring/application/views/scripts/list/comments.phtml
@@ -3,14 +3,19 @@
 
     /** @var Zend_View_Helper_CommandForm $commandHelper */
     $commandHelper = $this->getHelper('CommandForm');
-?>
-<?= $this->tabs->render($this); ?>
-
-<?php
-$viewHelper = $this->getHelper('MonitoringState');
+    $viewHelper = $this->getHelper('MonitoringState');
 ?>
 
-<h1>Comments</h1>
+<div class="row">
+  <div class="pull-left">
+    <h1>Comments</h1>
+  </div>
+  <div class="pull-right">
+    <?= $this->tabs->render($this); ?>
+  </div>
+</div>
+
+
 
 <div data-icinga-component="app/mainDetailGrid" data-icinga-grid-selection-type="single">
 
diff --git a/modules/monitoring/application/views/scripts/list/contactgroups.phtml b/modules/monitoring/application/views/scripts/list/contactgroups.phtml
index a085a61f9..b5e5bc64f 100644
--- a/modules/monitoring/application/views/scripts/list/contactgroups.phtml
+++ b/modules/monitoring/application/views/scripts/list/contactgroups.phtml
@@ -1,10 +1,17 @@
-<?= $this->tabs->render($this); ?>
-
 <?php
 $viewHelper = $this->getHelper('MonitoringState');
 $knownGroups = array()
 ?>
 
+<div class="row">
+  <div class="pull-left">
+    <h1>Contact Groups</h1>
+  </div>
+  <div class="pull-right">
+    <?= $this->tabs->render($this); ?>
+  </div>
+</div>
+
 <div data-icinga-component="app/mainDetailGrid" data-icinga-grid-selection-type="none">
     <?= $this->sortControl->render($this); ?>
     <?= $this->paginationControl($contactgroups, null, null, array('preserve' => $this->preserve)); ?>
diff --git a/modules/monitoring/application/views/scripts/list/contacts.phtml b/modules/monitoring/application/views/scripts/list/contacts.phtml
index b6cbd4dab..319c33937 100644
--- a/modules/monitoring/application/views/scripts/list/contacts.phtml
+++ b/modules/monitoring/application/views/scripts/list/contacts.phtml
@@ -1,10 +1,15 @@
-<?= $this->tabs->render($this); ?>
-
 <?php
 $viewHelper = $this->getHelper('MonitoringState');
 $contactHelper = $this->getHelper('ContactFlags');
 ?>
-
+<div class="row">
+  <div class="pull-left">
+    <h1>Contacts</h1>
+  </div>
+  <div class="pull-right">
+    <?= $this->tabs->render($this); ?>
+  </div>
+</div>
 <div data-icinga-component="app/mainDetailGrid" data-icinga-grid-selection-type="none">
     <?=  $this->sortControl->render($this); ?>
     <?=  $this->paginationControl($contacts, null, null, array('preserve' => $this->preserve)); ?>
diff --git a/modules/monitoring/application/views/scripts/list/downtimes.phtml b/modules/monitoring/application/views/scripts/list/downtimes.phtml
index 33b04d4d2..0f14f1d27 100644
--- a/modules/monitoring/application/views/scripts/list/downtimes.phtml
+++ b/modules/monitoring/application/views/scripts/list/downtimes.phtml
@@ -1,7 +1,14 @@
 <?php
 $commandHelper = $this->getHelper('CommandForm');
 ?>
-
+<div class="row">
+  <div class="pull-left">
+    <h1>Downtimes</h1>
+  </div>
+  <div class="pull-right">
+    <?= $this->tabs->render($this); ?>
+  </div>
+</div>
 <div data-icinga-component="app/mainDetailGrid" data-icinga-grid-selection-type="single">
   <div>
     <?=  $this->sortControl->render($this); ?>
diff --git a/modules/monitoring/application/views/scripts/list/eventhistory.phtml b/modules/monitoring/application/views/scripts/list/eventhistory.phtml
index 086cb1b90..f93dd79cb 100644
--- a/modules/monitoring/application/views/scripts/list/eventhistory.phtml
+++ b/modules/monitoring/application/views/scripts/list/eventhistory.phtml
@@ -1,4 +1,11 @@
-<h1>History</h1>
+<div class="row">
+  <div class="pull-left">
+    <h1>History</h1>
+  </div>
+  <div class="pull-right">
+    <?= $this->tabs->render($this); ?>
+  </div>
+</div>
 <?php if (!empty($history)): ?>
     <div data-icinga-component="app/mainDetailGrid">
         <?=  $this->paginationControl($history, null, null, array('preserve' => $this->preserve)); ?>
diff --git a/modules/monitoring/application/views/scripts/list/hostgroups.phtml b/modules/monitoring/application/views/scripts/list/hostgroups.phtml
index cfa22e781..0f7bc6c1a 100644
--- a/modules/monitoring/application/views/scripts/list/hostgroups.phtml
+++ b/modules/monitoring/application/views/scripts/list/hostgroups.phtml
@@ -1,3 +1,11 @@
+<div class="row">
+  <div class="pull-left">
+    <h1>Hostgroups</h1>
+  </div>
+  <div class="pull-right">
+    <?= $this->tabs->render($this); ?>
+  </div>
+</div>
 <div data-icinga-component="app/mainDetailGrid" data-icinga-grid-selection-type="single">
     <?= $this->sortControl->render($this); ?>
     <?= $this->paginationControl($hostgroups, null, null, array('preserve' => $this->preserve)); ?>
diff --git a/modules/monitoring/application/views/scripts/list/hosts.phtml b/modules/monitoring/application/views/scripts/list/hosts.phtml
index b38d51bb8..312187393 100644
--- a/modules/monitoring/application/views/scripts/list/hosts.phtml
+++ b/modules/monitoring/application/views/scripts/list/hosts.phtml
@@ -1,9 +1,15 @@
 <?php
 $viewHelper = $this->getHelper('MonitoringState');
 ?>
+<div class="row">
+  <div class="pull-left">
+    <h1>Hosts Status</h1>
+  </div>
+  <div class="pull-right">
+    <?= $this->tabs->render($this); ?>
+  </div>
+</div>
 
-<?= $this->tabs->render($this); ?>
-<h1>Hosts Status</h1>
 <div data-icinga-component="app/mainDetailGrid" data-icinga-grid-selection-type="multi">
 
   <div class="container pull-left">
diff --git a/modules/monitoring/application/views/scripts/list/notifications.phtml b/modules/monitoring/application/views/scripts/list/notifications.phtml
index 077ba44aa..b3f5651e1 100644
--- a/modules/monitoring/application/views/scripts/list/notifications.phtml
+++ b/modules/monitoring/application/views/scripts/list/notifications.phtml
@@ -1,4 +1,11 @@
-<h1>Notifications</h1>
+<div class="row">
+  <div class="pull-left">
+    <h1>Notifications</h1>
+  </div>
+  <div class="pull-right">
+    <?= $this->tabs->render($this); ?>
+  </div>
+</div>
 
 <?php if (!empty($notifications)): ?>
 <div data-icinga-component="app/mainDetailGrid" data-icinga-grid-selection-type="single">
diff --git a/modules/monitoring/application/views/scripts/list/servicegroups.phtml b/modules/monitoring/application/views/scripts/list/servicegroups.phtml
index e19a66e96..7d2bf7385 100644
--- a/modules/monitoring/application/views/scripts/list/servicegroups.phtml
+++ b/modules/monitoring/application/views/scripts/list/servicegroups.phtml
@@ -1,3 +1,12 @@
+<div class="row">
+  <div class="pull-left">
+    <h1>Servicegroups</h1>
+  </div>
+  <div class="pull-right">
+    <?= $this->tabs->render($this); ?>
+  </div>
+</div>
+
 <div data-icinga-component="app/mainDetailGrid" data-icinga-grid-selection-type="single">
     <?= $this->sortControl->render($this); ?>
     <?= $this->paginationControl($servicegroups, null, null, array('preserve' => $this->preserve)); ?>
diff --git a/modules/monitoring/application/views/scripts/list/services-compact.phtml b/modules/monitoring/application/views/scripts/list/services-compact.phtml
index 0fb86ac30..66682b1a0 100644
--- a/modules/monitoring/application/views/scripts/list/services-compact.phtml
+++ b/modules/monitoring/application/views/scripts/list/services-compact.phtml
@@ -2,102 +2,106 @@
 $viewHelper = $this->getHelper('MonitoringState');
 ?>
 
-<?php if (empty($services)): ?>
-<div>
-  Sorry, no services found for this search
+<div data-icinga-component="app/mainDetailGrid" data-icinga-grid-selection-type="multi">
+
+  <table class="table table-condensed pull-left">
+    <tbody>
+    <?php foreach ($services as $service): ?>
+    <?php
+        $serviceLink = $this->href(
+    'monitoring/show/service',
+    array(
+    'host' => $service->host_name,
+    'service' => $service->service_description
+    )
+    );
+    $hostLink = $this->href(
+    'monitoring/show/host',
+    array(
+    'host' => $service->host_name,
+    )
+    );
+    $serviceStateName = strtolower($this->util()->getServiceStateName($service->service_state));
+    ?>
+    <tr <?= ($this->activeRowHref === $serviceLink) ? 'class="active"' : ''; ?>>
+    <!-- Color column -->
+    <td class="tacheader-status-<?= $serviceStateName; ?>">
+      <a style="visibility:hidden" href="<?= $serviceLink; ?>"></a>
+    </td>
+    <td>
+      <a style="visibility:hidden" href="<?= $serviceLink; ?>"></a>
+      <?php if (!$service->service_handled && $service->service_state > 0): ?>
+      <a href="#" title="Unhandled">
+        <i class="icon-table icinga-icon-unhandled"></i>
+      </a>
+      <?php endif; ?>
+
+      <?php if ($service->service_acknowledged && !$service->service_in_downtime): ?>
+      <a href="#" title="Acknowledged">
+        <i class="icon-table icinga-icon-acknowledgement"></i>
+      </a>
+      <?php endif; ?>
+
+      <?php if ($service->service_is_flapping): ?>
+      <a href="#" title="Flapping">
+        <i class="icon-table icinga-icon-flapping"></i>
+      </a>
+      <?php endif; ?>
+
+      <?php if (!$service->service_notifications_enabled): ?>
+      <a href="#" title="Notifications Disabled">
+        <i class="icon-table icinga-icon-notification-disabled"></i>
+      </a>
+      <?php endif; ?>
+
+      <?php if ($service->service_in_downtime): ?>
+      <a href="#" title="In Downtime">
+        <i class="icon-table icinga-icon-in-downtime"></i>
+      </a>
+      <?php endif; ?>
+
+      <?php if (!$service->service_active_checks_enabled): ?>
+      <?php if (!$service->service_passive_checks_enabled): ?>
+      <a href="#" title="Active And Passive Checks Disabled">
+        <i class="icon-table icinga-icon-active-passive-checks-disabled"></i>
+      </a>
+      <?php else: ?>
+      <a href="#" title="Active Checks Disabled">
+        <i class="icon-table icinga-icon-active-checks-disabled"></i>
+      </a>
+      <?php endif; ?>
+      <?php endif; ?>
+
+      <?php if ($service->service_last_comment !== null): ?>
+      <a href="#" title="Comments">
+        <i class="icon-table icinga-icon-comment"></i>
+      </a>
+      <?php endif; ?>
+    </td>
+
+    <td title="<?= $viewHelper->getStateTitle($service, 'service'); ?>">
+      <strong><?= ucfirst($viewHelper->monitoringState($service, 'service')); ?></strong><br />
+
+      <div class="small-row">
+        Since <?= $this->timeSince($service->service_last_state_change); ?>
+        <?php if ($service->service_state): ?>
+        <br />
+        <strong>Attempt:</strong>
+        <?= $service->service_attempt; ?>
+        (<?= ($service->service_state_type === '1') ? 'Hard' : 'Soft'; ?>)
+        <?php endif; ?>
+      </div>
 </div>
-<?php return; endif ?>
+</td>
 
-<?=  $this->paginationControl($services, null, null, array('preserve' => $this->preserve)) ?>
-
-<table class="table table-condensed">
-  <thead>
-    <tr>
-      <th colspan="2">Status</th>
-      <th>Service</th>
-      <th>Output</th>
-      <th></th>
-    </tr>
-  </thead>
-  <tbody>
-  <?php foreach ($services as $service): ?>
-    <tr>
-      <td>
-        <div>
-          <?php if ($service->service_icon_image) : ?>
-          <img src="<?= $service->service_icon_image; ?>"/>
-          <?php endif; ?>
-        </div>
-      </td>
-      <td>
-        <div>
-          <?php if (!$service->service_handled && $service->service_state > 0): ?>
-          <a href="#" title="<?= 'Unhandled service' ?>">
-            <i>{{UNHANDLED_ICON}}</i>
-          </a>
-          <?php endif; ?>
-
-          <?php if ($service->service_acknowledged && !$service->service_in_downtime): ?>
-          <a href="#" title="<?= 'Acknowledged' ?>">
-            <i>{{ACKNOWLEDGED_ICON}}</i>
-          </a>
-          <?php endif; ?>
-
-          <?php if ($service->service_is_flapping): ?>
-          <a href="#" title="<?= 'Flapping' ?>">
-            <i>{{FLAPPING_ICON}}</i>
-          </a>
-          <?php endif; ?>
-
-          <?php if (!$service->service_notifications_enabled): ?>
-          <a href="#" title="<?= 'Notifications disabled' ?>">
-            <i>{{NOTIFICATIONS_DISABLED_ICON}}</i>
-          </a>
-          <?php endif; ?>
-
-          <?php if ($service->service_in_downtime): ?>
-          <a href="#" title="<?= 'In downtime' ?>">
-            <i>{{IN_DOWNTIME_ICON}}</i>
-          </a>
-          <?php endif; ?>
-
-        </div>
-      </td>
-      <td title="<?= $viewHelper->getStateTitle($service, 'service'); ?>">
-        <div>
-            <?= ucfirst($viewHelper->monitoringState($service, 'service')); ?></b>
-            <div> Since&nbsp;'
-              <?= $this->timeSince($service->service_last_state_change); ?>
-            <?php if ($service->service_state_type == 0): ?>
-              <a href="#" title="<?= 'Soft state' ?>">
-                <i>{{SOFTSTATE_ICON}}</i>
-              </a>
-            <?php endif; ?>
-            </div>
-        </div>
-      </td>
-      <td class="servicename">
-        <?php if ($service->service_last_comment !== null): ?>
-        <a href="#" title="<?= 'Comments' ?>">
-          <i>{{COMMENT_ICON}}</i>
-        </a>
-        <?php endif; ?>
-        <b> <?= $service->service_display_name; ?></b>
-        <br/>
-        <?= $service->host_name; ?>
-
-        <?php if ($service->service_action_url != ""): ?>
-        <a href="<?= $service->service_action_url; ?>">Action</a>
-        <?php endif; ?>
-
-        <?php if ($service->service_notes_url != ""): ?>
-        <a href="<?= $service->service_notes_url; ?>">Notes</a>
-        <?php endif; ?>
-      </td>
-      <td>
-        <?= $this->escape(substr(strip_tags($service->service_output), 0, 10000)); ?>
-      </td>
-    </tr>
-  <?php endforeach; ?>
-  </tbody>
+<td title="<?= $viewHelper->getStateTitle($service, 'host'); ?>">
+  <div class="output-text">
+    <?= $this->escape(substr(strip_tags($service->service_output), 0, 10000)); ?>
+  </div>
+</td>
+</tr>
+<?php endforeach; ?>
+</tbody>
 </table>
+
+</div>
diff --git a/modules/monitoring/application/views/scripts/list/services.phtml b/modules/monitoring/application/views/scripts/list/services.phtml
index 44f9c6d33..980b57462 100644
--- a/modules/monitoring/application/views/scripts/list/services.phtml
+++ b/modules/monitoring/application/views/scripts/list/services.phtml
@@ -1,9 +1,14 @@
 <?php
 $viewHelper = $this->getHelper('MonitoringState');
 ?>
-
-<?= $this->tabs->render($this); ?>
-<h1>Services Status</h1>
+<div class="row">
+  <div class="pull-left">
+    <h1>Services Status</h1>
+  </div>
+  <div class="pull-right">
+    <?= $this->tabs->render($this); ?>
+  </div>
+</div>
 <div data-icinga-component="app/mainDetailGrid" data-icinga-grid-selection-type="multi">
 
   <div class="container pull-left">
diff --git a/modules/monitoring/application/views/scripts/show/components/status.phtml b/modules/monitoring/application/views/scripts/show/components/status.phtml
index bbad328d0..0fd9ca99c 100644
--- a/modules/monitoring/application/views/scripts/show/components/status.phtml
+++ b/modules/monitoring/application/views/scripts/show/components/status.phtml
@@ -1,6 +1,6 @@
 <?php
-    $object = $this->object;
-    $type = (isset($object->service_description) === true) ? 'service' : 'host';
+
+    $type = $object->type === 2 ? 'service' : 'host';
 
     /** @var Zend_View_Helper_CommandForm $cf */
     $cf = $this->getHelper('CommandForm');
@@ -16,6 +16,7 @@
 <div>
     <div class="panel-heading border-status-<?= $objectStateName ?>">
         <div class="panel-hostname">
+          <?= $type ; ?>
             <?php if ($type === 'host'): ?>
                 <a title="View all services for this host"
                    href="<?= $this->href('monitoring/list/services', array('host' => $object->host_name)); ?>">
diff --git a/modules/monitoring/library/Monitoring/Controller.php b/modules/monitoring/library/Monitoring/Controller.php
index 255913562..bf561d244 100644
--- a/modules/monitoring/library/Monitoring/Controller.php
+++ b/modules/monitoring/library/Monitoring/Controller.php
@@ -71,8 +71,13 @@ class Controller extends ActionController
         return $query->paginate();
     }
 
-    private function handleFormatRequest($query)
+    protected function handleFormatRequest($query)
     {
+        if ($this->compactView !== null && ($this->_getParam('view', false) === 'compact')) {
+            $this->_helper->viewRenderer($this->compactView);
+        }
+
+
         if ($this->_getParam('format') === 'sql'
             && IcingaConfig::app()->global->get('environment', 'production') === 'development') {
             echo '<pre>'
diff --git a/public/img/icons/expand.png b/public/img/icons/expand.png
index 48e3d9346108d1b5726314b02306866ec3cb5d32..8ee172581e9c8fe566a3868d5d884fe04db7612c 100644
GIT binary patch
literal 2993
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

delta 814
zcmV+}1JV4k7q<p6iBL{Q4GJ0x0000DNk~Le0000W0000W2nGNE0CReJ^Z)<=1am@3
zR0s$N2z&@+h>;-|e*hSCMObu0a%Ew3X>V>IRB3Hx05LEwF)%JNFflW6vG>&g0010x
zMObuGZ)S9NVRB^vL1b@YWgtdra%FdKa%*!SLsK^Byt0e{00NCkL_t(oh3(fph#gfJ
z#_`|WD_OtDO3u210WEZnNklBP5)pzZB1Zfo0gYBh1W6H#e+Uxr0|W)DKzePgY)r&T
zP!Po;(S$9ObCNdTu4fQ2AFFJx#oTMI*PHBa%r%93s$u4t_xbZa=RM3+y<X3iT%9ZG
zz6P)cfNF3NV?B$_|B>&pl=3fs0mN8u#%H(%=P;?+th8PK3J<50f4?fm`aXPu^_a&3
z{+JNJI^2x=e{lf2su=5&n86Qt0dpzkbCYn7v7W*Xyo(#Lw}Y$u&*yP+Qs$6SUc|>Z
zh$Xz)!5(ck_hMg+^$n8(h_UWq7NPHXx?4(fEQGLtCvXS4A%wY7nlqOhAcSx$-omy%
zz>8fdr8(S(cnWvp`Vhi*r8K86hjEN`H-xYW@8Pljf9<DJ%7?lGQ6FL+PhtzELkQoN
z(k%W<^A7I8``C(8cr>N_C3J_yL!B5vO!Yf)_7csf@BsE}_t?*PD5d=UK+_$4X$0af
z+!R9iX0;G8*4N+>?Z|DxacoT~pBUEt17HYZ5J%MRiKC@7r&efwEuO(UxD7|NC*Mz_
z+OYs*e<1F}YzX0SDa~)on6Jl9yp4_c9NSXLzmC&i5MT^M?R*?#M>NKI1}|f;cHTe2
z&Xn>6<GU!p2*lu=*bqWEG8#vW^#;6(-P(g@f3MejCFkQy7puQ4z!1a&9>*qa9AB5x
zoUQBItC^Xw5wBqvrtx}8`HiM&maV-afFXzzbl9%##B>PZXjN6y*oWtF9bQT)A6RMK
zYI(`uSB&+u_yA|{1s1jAwhlW|$_H0dZ`A-p5Fa}K;j)D7Ddj_}t+nC^hF2-gTnOPu
sJgDu&b1CIdFQrzs_Gh#P@V^K66T1WR`<%gfIRF3v07*qoM6N<$g8YSc!vFvP

diff --git a/public/img/icons/expand_petrol.png b/public/img/icons/expand_petrol.png
index 12615103f351900e1936ef963a41479f488406f5..a794ef5fe5cece8d2b348086a56ef2ac8c92ac92 100644
GIT binary patch
literal 2992
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

delta 770
zcmV+d1O5E47mEfliBL{Q4GJ0x0000DNk~Le0000W0000W2nGNE0CReJ^Z)<=1am@3
zR0s$N2z&@+h>;-|e*hSCMObu0a%Ew3X>V>IRB3Hx05LEwF)%JNFflW6vG>&g0010x
zMObuGZ)S9NVRB^vL1b@YWgtdra%FdKa%*!SLsK^Byt0e{00Lo2L_t(oh3(fph!s~D
z#_``=2aO^k(N(ap42q>zn}D6M3kO_{5(I^#TWFzzB+)`4e+1Fa7?eyA6$GP_L4zWs
zNMU1>A_!X8iijWh5wk%(dM(afb6M}|y_?)vxKj-?@4V0dykF-`(QG!o%d7ED)h7Wa
z0Z@$IlvO<si~lFxKT-@2UICO<y%-m;5HHZL-Yn#(U&4wM!_%^?>Oq{vEZoK&JnIv{
zR4l+J_#Uw+f2;Z?=HeRG<4TI*ML*Qbs-A{5*oOh^Y~X{|``ftLFL6jQJi!^9!*lFu
zV4IwqW!PO-_3VBDlvUlpJj`injx<sX$FLPM@ddV(RXwLq3=6RrE9GL}(%y!{IE07z
z5&KdMcmE63vZ|-xBYcAut;a(thKt1*!(n`fM>vi>e<_BC|5ChxrT7+uc#O|d43}ve
zL>(X=<1h}S817F{d>TH+0W6UVePxQ_>Zr|Y0BsP5<Vc*vu3jO^s-BKd<(x0V^_KXJ
zcDs&yL5krBw#dV2Eq1j=b+_U(uu5L}BK(f!W5pRK0&R{)Bk?DGl567DTfUivb=WPp
z+^=%Me~omqe<MH#h|~Bg#c*#N+qsBxTMys_Hl-Mzj_3ca+i_buX3Ar9Z&}szJBWWM
z549cg$`3Z1%?)o7r;7-*2@K;P{=zAInPRv<<%ge(q9_(%J2uF5^L2`0e>Z-+253R7
z!%>WA4J(v#zCXtdY)&y8?bc^c0AnEj#&38cNRQU3Sd(Hn*NeZN0oovr`RCyB9II0d
zzx3*BLI5p@A^A|z#KsiE`HA=`CjX2k0p5Fnm&wD(l<b0bN&o-=07*qoM6N<$g4tA9
Avj6}9