From ba3172fb9cf0564a8c4dfe42e52ea6d0fc228ab0 Mon Sep 17 00:00:00 2001
From: Johannes Meyer <johannes.meyer@netways.de>
Date: Thu, 1 Oct 2015 16:10:09 +0200
Subject: [PATCH] Fix controls layout in some list views

refs #5543
---
 application/views/scripts/group/list.phtml     | 16 ++++++++++++----
 .../views/scripts/list/applicationlog.phtml    | 14 +++++++++++---
 .../views/scripts/navigation/index.phtml       | 14 +++++++++++---
 .../views/scripts/navigation/shared.phtml      | 14 +++++++++++---
 application/views/scripts/user/list.phtml      | 14 +++++++++++---
 .../views/scripts/list/eventhistory.phtml      | 18 +++++++++++++-----
 6 files changed, 69 insertions(+), 21 deletions(-)

diff --git a/application/views/scripts/group/list.phtml b/application/views/scripts/group/list.phtml
index 87bc0159e0..01bf3f7dd1 100644
--- a/application/views/scripts/group/list.phtml
+++ b/application/views/scripts/group/list.phtml
@@ -6,9 +6,17 @@ use Icinga\Data\Reducible;
 if (! $this->compact): ?>
 <div class="controls">
   <?= $this->tabs; ?>
-  <?= $this->sortBox; ?>
-  <?= $this->limiter; ?>
-  <?= $this->paginator; ?>
+  <div class="grid dont-print">
+    <div class="col-1-3 text-left">
+      <?= $this->limiter ?>
+    </div>
+    <div class="col-1-3">
+      <?= $this->paginator ?>
+    </div>
+    <div class="col-1-3 text-right">
+      <?= $this->sortBox ?>
+    </div>
+  </div>
   <div>
     <?= $this->backendSelection; ?>
     <?= $this->filterEditor; ?>
@@ -36,7 +44,7 @@ if (! isset($backend)) {
             'class'             => 'button-link',
             'data-base-target'  => '_next',
             'icon'              => 'plus',
-            'title'             => $this->translate('Create a new user')
+            'title'             => $this->translate('Create a new user group')
         )
     ) ?>
 <?php endif ?>
diff --git a/application/views/scripts/list/applicationlog.phtml b/application/views/scripts/list/applicationlog.phtml
index 00102e8558..15fe9cef15 100644
--- a/application/views/scripts/list/applicationlog.phtml
+++ b/application/views/scripts/list/applicationlog.phtml
@@ -1,9 +1,17 @@
 <?php if (! $this->compact): ?>
 <div class="controls">
   <?= $this->tabs; ?>
-  <?= $this->sortBox; ?>
-  <?= $this->limiter; ?>
-  <?= $this->paginator; ?>
+  <div class="grid dont-print">
+        <div class="col-1-3 text-left">
+            <?= $this->limiter ?>
+        </div>
+        <div class="col-1-3">
+            <?= $this->paginator ?>
+        </div>
+        <div class="col-1-3 text-right">
+            <?= $this->sortBox ?>
+        </div>
+    </div>
   <?= $this->filterEditor; ?>
 </div>
 <?php endif ?>
diff --git a/application/views/scripts/navigation/index.phtml b/application/views/scripts/navigation/index.phtml
index 49f89c4421..e24a3a59fb 100644
--- a/application/views/scripts/navigation/index.phtml
+++ b/application/views/scripts/navigation/index.phtml
@@ -1,9 +1,17 @@
 <?php if (! $this->compact): ?>
 <div class="controls">
     <?= $this->tabs ?>
-    <?= $this->sortBox ?>
-    <?= $this->limiter ?>
-    <?= $this->paginator ?>
+    <div class="grid dont-print">
+        <div class="col-1-3 text-left">
+            <?= $this->limiter ?>
+        </div>
+        <div class="col-1-3">
+            <?= $this->paginator ?>
+        </div>
+        <div class="col-1-3 text-right">
+            <?= $this->sortBox ?>
+        </div>
+    </div>
     <?= $this->filterEditor ?>
 </div>
 <?php endif ?>
diff --git a/application/views/scripts/navigation/shared.phtml b/application/views/scripts/navigation/shared.phtml
index 5d0a3107ff..aae7fa552a 100644
--- a/application/views/scripts/navigation/shared.phtml
+++ b/application/views/scripts/navigation/shared.phtml
@@ -5,9 +5,17 @@ use Icinga\Web\Url;
 if (! $this->compact): ?>
 <div class="controls">
     <?= $this->tabs; ?>
-    <?= $this->sortBox; ?>
-    <?= $this->limiter; ?>
-    <?= $this->paginator; ?>
+    <div class="grid dont-print">
+        <div class="col-1-3 text-left">
+            <?= $this->limiter ?>
+        </div>
+        <div class="col-1-3">
+            <?= $this->paginator ?>
+        </div>
+        <div class="col-1-3 text-right">
+            <?= $this->sortBox ?>
+        </div>
+    </div>
     <?= $this->filterEditor; ?>
 </div>
 <?php endif ?>
diff --git a/application/views/scripts/user/list.phtml b/application/views/scripts/user/list.phtml
index c6b2b4ae4d..c89ea82e8f 100644
--- a/application/views/scripts/user/list.phtml
+++ b/application/views/scripts/user/list.phtml
@@ -5,9 +5,17 @@ use Icinga\Data\Reducible;
 if (! $this->compact): ?>
 <div class="controls">
     <?= $this->tabs ?>
-    <?= $this->sortBox ?>
-    <?= $this->limiter ?>
-    <?= $this->paginator ?>
+    <div class="grid dont-print">
+        <div class="col-1-3 text-left">
+            <?= $this->limiter ?>
+        </div>
+        <div class="col-1-3">
+            <?= $this->paginator ?>
+        </div>
+        <div class="col-1-3 text-right">
+            <?= $this->sortBox ?>
+        </div>
+    </div>
     <div>
         <?= $this->backendSelection ?>
         <?= $this->filterEditor ?>
diff --git a/modules/monitoring/application/views/scripts/list/eventhistory.phtml b/modules/monitoring/application/views/scripts/list/eventhistory.phtml
index afe84b3478..31c43421ba 100644
--- a/modules/monitoring/application/views/scripts/list/eventhistory.phtml
+++ b/modules/monitoring/application/views/scripts/list/eventhistory.phtml
@@ -13,11 +13,19 @@ $history->limit($limit * $page);
 if (! $this->compact): ?>
 <div class="controls">
   <?= $this->tabs; ?>
-  <?= $this->sortBox; ?>
-  <?= $this->limiter; ?>
-  <a class="load-more-hint" href="#load-more">
-    <?= $this->translate('Scroll to the bottom of this page to load additional events'); ?>
-  </a>
+  <div class="grid dont-print">
+    <div class="col-1-3 text-left">
+      <?= $this->limiter ?>
+    </div>
+    <div class="col-1-3">
+      <a class="load-more-hint" href="#load-more">
+        <?= $this->translate('Scroll to the bottom of this page to load additional events'); ?>
+      </a>
+    </div>
+    <div class="col-1-3 text-right">
+      <?= $this->sortBox ?>
+    </div>
+  </div>
   <?= $this->filterEditor; ?>
 </div>
 <?php endif ?>