Fix controls layout in some list views

refs #5543
Icinga · Oct 1, 2015 · ba3172f · ba3172f
1 parent c051dba
commit ba3172f
Show file tree

Hide file tree

Showing 6 changed files with 69 additions and 21 deletions.
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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 ?>