Merge branch 'bugfix/make-all-views-dashboard-compliant-7876'

fixes #7876

application/controllers/ConfigController.php

@@ -11,14 +11,14 @@
 use Icinga\Forms\Config\ResourceConfigForm;
 use Icinga\Forms\ConfirmRemovalForm;
 use Icinga\Security\SecurityException;
-use Icinga\Web\Controller\ActionController;
+use Icinga\Web\Controller;
 use Icinga\Web\Notification;
 use Icinga\Web\Widget;
 
 /**
  * Application and module configuration
  */
-class ConfigController extends ActionController
+class ConfigController extends Controller
 {
     /**
      * The first allowed config action according to the user's permissions
@@ -130,6 +130,14 @@ public function modulesAction()
             ->order('enabled', 'desc')
             ->order('name')
             ->paginate();
+        $this->setupLimitControl();
+        $this->setupPaginationControl($this->view->modules);
+        // TODO: Not working
+        /*$this->setupSortControl(array(
+            'name'      => $this->translate('Modulename'),
+            'path'      => $this->translate('Installation Path'),
+            'enabled'   => $this->translate('State')
+        ));*/
     }
 
     public function moduleAction()

application/controllers/ListController.php

@@ -3,6 +3,8 @@
 
 use Icinga\Module\Monitoring\Controller;
 use Icinga\Web\Url;
+use Icinga\Web\Widget\Tabextension\DashboardAction;
+use Icinga\Web\Widget\Tabextension\OutputFormat;
 use Icinga\Application\Config;
 use Icinga\Application\Logger;
 use Icinga\Data\ConfigObject;
@@ -29,7 +31,7 @@ protected function addTitleTab($action)
                     'list/'
                     . str_replace(' ', '', $action)
                 )
-        ))->activate($action);
+        ))->extend(new OutputFormat())->extend(new DashboardAction())->activate($action);
     }
 
     /**
@@ -52,5 +54,8 @@ public function applicationlogAction()
             'fields'    => $pattern
         )));
         $this->view->logData = $resource->select()->order('DESC')->paginate();
+
+        $this->setupLimitControl();
+        $this->setupPaginationControl($this->view->logData);
     }
 }

application/views/scripts/config/modules.phtml

@@ -1,8 +1,12 @@
+<?php if (! $this->compact): ?>
 <div class="controls">
-<?= $this->tabs ?>
-<?= $this->paginationControl($modules) ?>
+  <?= $this->tabs; ?>
+  <?= $this->sortBox; ?>
+  <?= $this->limiter; ?>
+  <?= $this->paginator; ?>
+  <?= $this->filterEditor; ?>
 </div>
-
+<?php endif ?>
 <div class="content">
   <table class="action" data-base-target="_next">
     <tbody>

application/views/scripts/list/applicationlog.phtml

@@ -1,9 +1,12 @@
+<?php if (! $this->compact): ?>
 <div class="controls">
-    <?= $this->tabs->render($this) ?>
-    <div style="margin-top: 1em"></div>
-    <?=  $this->logData ?>
+  <?= $this->tabs; ?>
+  <?= $this->sortBox; ?>
+  <?= $this->limiter; ?>
+  <?= $this->paginator; ?>
+  <?= $this->filterEditor; ?>
 </div>
-
+<?php endif ?>
 <div class="content">
     <?php if ($this->logData !== null): ?>
     <table class="action">

library/Icinga/Web/Controller.php

@@ -3,8 +3,10 @@
 
 namespace Icinga\Web;
 
+use Zend_Paginator;
 use Icinga\Web\Controller\ModuleActionController;
 use Icinga\Web\Widget\SortBox;
+use Icinga\Web\Widget\Limiter;
 
 /**
  * This is the controller all modules should inherit from
@@ -14,17 +16,77 @@
 class Controller extends ModuleActionController
 {
     /**
-     * Create a sort control box at the 'sortControl' view parameter
+     * Create a SortBox widget at the `sortBox' view property
      *
-     * @param array $columns    An array containing the sort columns, with the
-     *                          submit value as the key and the label as the value
+     * In case the current view has been requested as compact this method does nothing.
+     *
+     * @param   array   $columns    An array containing the sort columns, with the
+     *                               submit value as the key and the label as the value
+     *
+     * @return  $this
      */
     protected function setupSortControl(array $columns)
     {
-        $req = $this->getRequest();
-        $this->view->sortControl = SortBox::create(
-            'sortbox-' . $req->getActionName(),
-            $columns
-        )->applyRequest($req);
+        if (! $this->view->compact) {
+            $req = $this->getRequest();
+            $this->view->sortBox = SortBox::create(
+                'sortbox-' . $req->getActionName(),
+                $columns
+            )->applyRequest($req);
+        }
+
+        return $this;
+    }
+
+    /**
+     * Create a Limiter widget at the `limiter' view property
+     *
+     * In case the current view has been requested as compact this method does nothing.
+     *
+     * @return  $this
+     */
+    protected function setupLimitControl()
+    {
+        if (! $this->view->compact) {
+            $this->view->limiter = new Limiter();
+        }
+
+        return $this;
+    }
+
+    /**
+     * Set the view property `paginator' to the given Zend_Paginator
+     *
+     * In case the current view has been requested as compact this method does nothing.
+     *
+     * @param   Zend_Paginator  $paginator  The Zend_Paginator for which to show a pagination control
+     *
+     * @return  $this
+     */
+    protected function setupPaginationControl(Zend_Paginator $paginator)
+    {
+        if (! $this->view->compact) {
+            $this->view->paginator = $paginator;
+        }
+
+        return $this;
+    }
+
+    /**
+     * Set the view property `filterEditor' to the given FilterEditor
+     *
+     * In case the current view has been requested as compact this method does nothing.
+     *
+     * @param   Form    $editor    The FilterEditor
+     *
+     * @return  $this
+     */
+    protected function setupFilterControl($editor)
+    {
+        if (! $this->view->compact) {
+            $this->view->filterEditor = $editor;
+        }
+
+        return $this;
     }
 }

library/Icinga/Web/Controller/ActionController.php

@@ -87,6 +87,7 @@ public function __construct(
         $this->_helper->layout()->isIframe = $request->getUrl()->shift('isIframe');
         $this->_helper->layout()->moduleName = false;
 
+        $this->view->compact = $request->getParam('view') === 'compact';
         if ($this->rerenderLayout = $request->getUrl()->shift('renderLayout')) {
             $this->xhrLayout = 'body';
         }

library/Icinga/Web/StyleSheet.php

@@ -26,7 +26,8 @@ class StyleSheet
         'css/icinga/pagination.less',
         'css/icinga/monitoring-colors.less',
         'css/icinga/selection-toolbar.less',
-        'css/icinga/login.less'
+        'css/icinga/login.less',
+        'css/icinga/controls.less'
     );
 
     public static function compileForPdf()

library/Icinga/Web/Widget/FilterEditor.php

@@ -649,7 +649,7 @@ protected function applyChanges($changes)
 
     public function renderSearch()
     {
-        $html = ' <form method="post" class="inline dontprint" action="'
+        $html = ' <form method="post" class="search inline dontprint" action="'
               . $this->preservedUrl()
               . '"><input type="text" name="q" style="width: 8em" class="search" value="" placeholder="'
               . t('Search...')
@@ -678,20 +678,22 @@ public function renderSearch()
     public function render()
     {
         if (! $this->preservedUrl()->getParam('modifyFilter')) {
-            return $this->renderSearch() . $this->shorten($this->filter, 50);
-        }
-        return  $this->renderSearch()
-              . '<form action="'
-              . Url::fromRequest()
-              . '" class="filterEditor" method="POST">'
-              . '<ul class="tree widgetFilter"><li>'
-              . $this->renderFilter($this->filter)
-              . '</li></ul>'
-              . '<div style="float: right">'
-              . '<input type="submit" name="submit" value="Apply" />'
-              . '<input type="submit" name="cancel" value="Cancel" />'
-              . '</div>'
-              . '</form>';
+            return '<div class="filter">' . $this->renderSearch() . $this->shorten($this->filter, 50) . '</div>';
+        }
+        return  '<div class="filter">'
+            . $this->renderSearch()
+            . '<form action="'
+            . Url::fromRequest()
+            . '" class="editor" method="POST">'
+            . '<ul class="tree"><li>'
+            . $this->renderFilter($this->filter)
+            . '</li></ul>'
+            . '<div class="buttons">'
+            . '<input type="submit" name="submit" value="Apply" />'
+            . '<input type="submit" name="cancel" value="Cancel" />'
+            . '</div>'
+            . '</form>'
+            . '</div>';
     }
 
     protected function shorten($string, $length)