monitoring: Fix list headers, #2

refs #5543
2015-10-01 22:51:42 +02:00 · 2015-10-01 22:51:42 +02:00 · aadbbe08e1
parent 04dd81103c
commit aadbbe08e1
13 changed files with 57 additions and 125 deletions
--- a/modules/monitoring/application/views/scripts/list/comments.phtml
+++ b/modules/monitoring/application/views/scripts/list/comments.phtml
@ -1,19 +1,11 @@
 <?php if (! $this->compact): ?>
-<div class="controls dont-print">
+<div class="controls separated dont-print">
    <?= $tabs ?>
-    <div class="text-right">
-        <?= $this->render('list/components/selectioninfo.phtml'); ?>
-    </div>
    <div class="grid">
-        <div class="col-1-3">
-            <?= $this->limiter ?>
-        </div>
-        <div class="col-1-3">
-            <?= $this->paginator ?>
-        </div>
-        <div class="col-1-3 text-right">
-            <?= $this->sortBox ?>
-        </div>
+        <?= $this->limiter ?>
+        <?= $this->paginator ?>
+        <?= $this->render('list/components/selectioninfo.phtml') ?>
+        <?= $this->sortBox ?>
    </div>
    <?= $this->filterEditor ?>
 </div>
--- a/modules/monitoring/application/views/scripts/list/components/hostssummary.phtml
+++ b/modules/monitoring/application/views/scripts/list/components/hostssummary.phtml
@ -7,7 +7,7 @@ if (! $stats instanceof stdClass) {
    $stats = $stats->fetchRow();
 }
 ?>
-<div class="v-center">
+<div class="hosts-summary">
 <?= $this->qlink(
    sprintf($this->translatePlural('%u Host', '%u Hosts', $stats->hosts_total), $stats->hosts_total),
    // @TODO(el): Fix that
--- a/modules/monitoring/application/views/scripts/list/components/servicesummary.phtml
+++ b/modules/monitoring/application/views/scripts/list/components/servicesummary.phtml
@ -7,7 +7,7 @@ if (! $stats instanceof stdClass) {
    $stats = $stats->fetchRow();
 }
 ?>
-<div class="v-center">
+<div class="services-summary">
 <?= $this->qlink(
    sprintf($this->translatePlural(
        '%u Service', '%u Services', $stats->services_total),
--- a/modules/monitoring/application/views/scripts/list/contactgroups.phtml
+++ b/modules/monitoring/application/views/scripts/list/contactgroups.phtml
@ -1,18 +1,12 @@
 <?php

 if (! $this->compact): ?>
-<div class="controls">
-    <?= $this->tabs ?>
+<div class="controls separated dont-print">
+    <?= $tabs ?>
    <div class="grid">
-        <div class="col-1-3">
-            <?= $this->limiter ?>
-        </div>
-        <div class="col-1-3">
-            <?= $this->paginator ?>
-        </div>
-        <div class="col-1-3 text-right">
-            <?= $this->sortBox ?>
-        </div>
+        <?= $this->limiter ?>
+        <?= $this->paginator ?>
+        <?= $this->sortBox ?>
    </div>
    <?= $this->filterEditor ?>
 </div>
--- a/modules/monitoring/application/views/scripts/list/contacts.phtml
+++ b/modules/monitoring/application/views/scripts/list/contacts.phtml
@ -1,16 +1,10 @@
 <?php if (! $this->compact): ?>
-<div class="controls dont-print">
+<div class="controls separated dont-print">
    <?= $tabs ?>
    <div class="grid">
-        <div class="col-1-3">
-            <?= $this->limiter ?>
-        </div>
-        <div class="col-1-3">
-            <?= $this->paginator ?>
-        </div>
-        <div class="col-1-3 text-right">
-            <?= $this->sortBox ?>
-        </div>
+        <?= $this->limiter ?>
+        <?= $this->paginator ?>
+        <?= $this->sortBox ?>
    </div>
    <?= $this->filterEditor ?>
 </div>
--- a/modules/monitoring/application/views/scripts/list/downtimes.phtml
+++ b/modules/monitoring/application/views/scripts/list/downtimes.phtml
@ -3,21 +3,13 @@ use Icinga\Module\Monitoring\Object\Host;
 use Icinga\Module\Monitoring\Object\Service;

 if (! $this->compact): ?>
-<div class="controls dont-print">
+<div class="controls separated dont-print">
    <?= $tabs ?>
-    <div class="text-right">
-        <?= $this->render('list/components/selectioninfo.phtml'); ?>
-    </div>
    <div class="grid">
-        <div class="col-1-3">
-            <?= $this->limiter ?>
-        </div>
-        <div class="col-1-3">
-            <?= $this->paginator ?>
-        </div>
-        <div class="col-1-3 text-right">
-            <?= $this->sortBox ?>
-        </div>
+        <?= $this->limiter ?>
+        <?= $this->paginator ?>
+        <?= $this->render('list/components/selectioninfo.phtml') ?>
+        <?= $this->sortBox ?>
    </div>
    <?= $this->filterEditor ?>
 </div>
--- a/modules/monitoring/application/views/scripts/list/eventhistory.phtml
+++ b/modules/monitoring/application/views/scripts/list/eventhistory.phtml
@ -11,14 +11,14 @@ if (! $url->hasParam('page') || ($page = (int) $url->getParam('page')) < 1) {
 $history->limit($limit * $page);

 if (! $this->compact): ?>
-<div class="controls">
+<div class="controls dont-print separated">
  <?= $this->tabs; ?>
-  <div class="grid dont-print">
+  <div class="grid">
    <div class="col-1-3 text-left">
      <?= $this->limiter ?>
    </div>
    <div class="col-1-3">
-      <a href="#load-more">
+      <a class="action-link" href="#load-more">
        <?= $this->translate('Scroll to the bottom of this page to load additional events'); ?>
      </a>
    </div>
--- a/modules/monitoring/application/views/scripts/list/hostgroups.phtml
+++ b/modules/monitoring/application/views/scripts/list/hostgroups.phtml
@ -2,18 +2,12 @@
 use Icinga\Module\Monitoring\Web\Widget\StateBadges;
 /** @var \Icinga\Module\Monitoring\DataView\Hostgroup $hostgroups */
 if (! $this->compact): ?>
-<div class="controls">
-    <?= $this->tabs ?>
+<div class="controls separated dont-print">
+    <?= $tabs ?>
    <div class="grid">
-        <div class="col-1-3">
-            <?= $this->limiter ?>
-        </div>
-        <div class="col-1-3">
-            <?= $this->paginator ?>
-        </div>
-        <div class="col-1-3 text-right">
-            <?= $this->sortBox ?>
-        </div>
+        <?= $this->limiter ?>
+        <?= $this->paginator ?>
+        <?= $this->sortBox ?>
    </div>
    <?= $this->filterEditor ?>
 </div>
--- a/modules/monitoring/application/views/scripts/list/hosts.phtml
+++ b/modules/monitoring/application/views/scripts/list/hosts.phtml
@ -2,26 +2,16 @@
 use Icinga\Module\Monitoring\Object\Host;

 if (! $this->compact): ?>
-<div class="controls separated">
+<div class="controls separated dont-print">
    <?= $this->tabs ?>
-    <div class="grid dont-print">
-        <div class="col-1-2 text-left">
-            <?= $this->render('list/components/hostssummary.phtml') ?>
-        </div>
-        <div class="col-1-2 text-right">
-            <?= $this->render('list/components/selectioninfo.phtml') ?>
-        </div>
+    <div class="grid">
+        <?= $this->render('list/components/hostssummary.phtml') ?>
+        <?= $this->render('list/components/selectioninfo.phtml') ?>
    </div>
-    <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 class="grid">
+        <?= $this->limiter ?>
+        <?= $this->paginator ?>
+        <?= $this->sortBox ?>
    </div>
    <?= $this->filterEditor ?>
 </div>
--- a/modules/monitoring/application/views/scripts/list/notifications.phtml
+++ b/modules/monitoring/application/views/scripts/list/notifications.phtml
@ -5,22 +5,14 @@ use Icinga\Module\Monitoring\Object\Service;
 $notifications->peekAhead($this->compact);

 if (! $this->compact): ?>
-<div class="controls">
-    <div class="controls dont-print">
-        <?= $tabs ?>
-        <div class="grid">
-            <div class="col-1-3">
-                <?= $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 class="controls separated dont-print">
+    <?= $tabs ?>
+    <div class="grid">
+        <?= $this->limiter ?>
+        <?= $this->paginator ?>
+        <?= $this->sortBox ?>
    </div>
+    <?= $this->filterEditor ?>
 </div>
 <?php endif ?>
 <div class="content">
--- a/modules/monitoring/application/views/scripts/list/servicegrid.phtml
+++ b/modules/monitoring/application/views/scripts/list/servicegrid.phtml
@ -3,7 +3,7 @@ use Icinga\Module\Monitoring\Object\Service;
 use Icinga\Web\Url;

 if (! $this->compact): ?>
-<div class="controls">
+<div class="controls separated">
  <?= $this->tabs; ?>
  <div class="grid dont-print">
    <div class="col-1-3 text-left">
@ -102,7 +102,7 @@ $hostFilter = '(host_name=' . implode('|host_name=', array_keys($pivotData)) . '
        <?php if (! $this->compact && $this->horizontalPaginator->getPages()->pageCount > 1): ?>
            <td>
                <?php $expandLink = $this->qlink(
-                    $this->translate('more …'),
+                    $this->translate('Load more'),
                    Url::fromRequest(),
                    array(
                        'limit' => (
@ -123,7 +123,7 @@ $hostFilter = '(host_name=' . implode('|host_name=', array_keys($pivotData)) . '
        <tr>
            <td colspan="<?= count($pivotHeader['cols']) + 1?>" class="service-grid-table-more">
                <?php echo $this->qlink(
-                    $this->translate('more …'),
+                    $this->translate('Load more'),
                    Url::fromRequest(),
                    array(
                        'limit' => $this->horizontalPaginator->getItemCountPerPage() . ',' .
--- a/modules/monitoring/application/views/scripts/list/servicegroups.phtml
+++ b/modules/monitoring/application/views/scripts/list/servicegroups.phtml
@ -1,18 +1,12 @@
 <?php use Icinga\Module\Monitoring\Web\Widget\StateBadges;

 if (! $this->compact): ?>
-<div class="controls">
-    <?= $this->tabs ?>
+<div class="controls separated dont-print">
+    <?= $tabs ?>
    <div class="grid">
-        <div class="col-1-3">
-            <?= $this->limiter ?>
-        </div>
-        <div class="col-1-3">
-            <?= $this->paginator ?>
-        </div>
-        <div class="col-1-3 text-right">
-            <?= $this->sortBox ?>
-        </div>
+        <?= $this->limiter ?>
+        <?= $this->paginator ?>
+        <?= $this->sortBox ?>
    </div>
    <?= $this->filterEditor ?>
 </div>
--- a/modules/monitoring/application/views/scripts/list/services.phtml
+++ b/modules/monitoring/application/views/scripts/list/services.phtml
@ -6,23 +6,13 @@ if (! $this->compact): ?>
 <div class="controls separated dont-print">
    <?= $this->tabs ?>
    <div class="grid">
-        <div class="col-1-2">
-            <?= $this->render('list/components/servicesummary.phtml') ?>
-        </div>
-        <div class="col-1-2 text-right">
-            <?= $this->render('list/components/selectioninfo.phtml') ?>
-        </div>
+        <?= $this->render('list/components/servicesummary.phtml') ?>
+        <?= $this->render('list/components/selectioninfo.phtml') ?>
    </div>
    <div class="grid">
-        <div class="col-1-3">
-            <?= $this->limiter ?>
-        </div>
-        <div class="col-1-3">
-            <?= $this->paginator ?>
-        </div>
-        <div class="col-1-3 text-right">
-            <?= $this->sortBox ?>
-        </div>
+        <?= $this->limiter ?>
+        <?= $this->paginator ?>
+        <?= $this->sortBox ?>
    </div>
    <?= $this->filterEditor ?>
 </div>