diff --git a/modules/monitoring/application/views/scripts/list/comments.phtml b/modules/monitoring/application/views/scripts/list/comments.phtml index 0379c53ab..e496ced29 100644 --- a/modules/monitoring/application/views/scripts/list/comments.phtml +++ b/modules/monitoring/application/views/scripts/list/comments.phtml @@ -1,19 +1,11 @@ compact): ?> -
+
-
- render('list/components/selectioninfo.phtml'); ?> -
-
- limiter ?> -
-
- paginator ?> -
-
- sortBox ?> -
+ limiter ?> + paginator ?> + render('list/components/selectioninfo.phtml') ?> + sortBox ?>
filterEditor ?>
diff --git a/modules/monitoring/application/views/scripts/list/components/hostssummary.phtml b/modules/monitoring/application/views/scripts/list/components/hostssummary.phtml index da693ec31..eaa8fe363 100644 --- 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(); } ?> -
+
qlink( sprintf($this->translatePlural('%u Host', '%u Hosts', $stats->hosts_total), $stats->hosts_total), // @TODO(el): Fix that diff --git a/modules/monitoring/application/views/scripts/list/components/servicesummary.phtml b/modules/monitoring/application/views/scripts/list/components/servicesummary.phtml index ff5f78c2c..b8b61aebe 100644 --- 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(); } ?> -
+
qlink( sprintf($this->translatePlural( '%u Service', '%u Services', $stats->services_total), diff --git a/modules/monitoring/application/views/scripts/list/contactgroups.phtml b/modules/monitoring/application/views/scripts/list/contactgroups.phtml index fd1b677c2..b0a35dc4e 100644 --- a/modules/monitoring/application/views/scripts/list/contactgroups.phtml +++ b/modules/monitoring/application/views/scripts/list/contactgroups.phtml @@ -1,18 +1,12 @@ compact): ?> -
- tabs ?> +
+
-
- limiter ?> -
-
- paginator ?> -
-
- sortBox ?> -
+ limiter ?> + paginator ?> + sortBox ?>
filterEditor ?>
diff --git a/modules/monitoring/application/views/scripts/list/contacts.phtml b/modules/monitoring/application/views/scripts/list/contacts.phtml index a8709688e..6ece9e8df 100644 --- a/modules/monitoring/application/views/scripts/list/contacts.phtml +++ b/modules/monitoring/application/views/scripts/list/contacts.phtml @@ -1,16 +1,10 @@ compact): ?> -
+
-
- limiter ?> -
-
- paginator ?> -
-
- sortBox ?> -
+ limiter ?> + paginator ?> + sortBox ?>
filterEditor ?>
diff --git a/modules/monitoring/application/views/scripts/list/downtimes.phtml b/modules/monitoring/application/views/scripts/list/downtimes.phtml index 023c73ace..f6023f421 100644 --- 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): ?> -
+
-
- render('list/components/selectioninfo.phtml'); ?> -
-
- limiter ?> -
-
- paginator ?> -
-
- sortBox ?> -
+ limiter ?> + paginator ?> + render('list/components/selectioninfo.phtml') ?> + sortBox ?>
filterEditor ?>
diff --git a/modules/monitoring/application/views/scripts/list/eventhistory.phtml b/modules/monitoring/application/views/scripts/list/eventhistory.phtml index b3aebd043..cddad22fd 100644 --- 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): ?> -
+
tabs; ?> -
+
limiter ?>
diff --git a/modules/monitoring/application/views/scripts/list/hostgroups.phtml b/modules/monitoring/application/views/scripts/list/hostgroups.phtml index 3e4a8f216..4d6d235bc 100644 --- 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): ?> -
- tabs ?> +
+
-
- limiter ?> -
-
- paginator ?> -
-
- sortBox ?> -
+ limiter ?> + paginator ?> + sortBox ?>
filterEditor ?>
diff --git a/modules/monitoring/application/views/scripts/list/hosts.phtml b/modules/monitoring/application/views/scripts/list/hosts.phtml index f2ea185f2..9c955ef66 100644 --- 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): ?> -
+
tabs ?> -
-
- render('list/components/hostssummary.phtml') ?> -
-
- render('list/components/selectioninfo.phtml') ?> -
+
+ render('list/components/hostssummary.phtml') ?> + render('list/components/selectioninfo.phtml') ?>
-
-
- limiter ?> -
-
- paginator ?> -
-
- sortBox ?> -
+
+ limiter ?> + paginator ?> + sortBox ?>
filterEditor ?>
diff --git a/modules/monitoring/application/views/scripts/list/notifications.phtml b/modules/monitoring/application/views/scripts/list/notifications.phtml index 34faeb1f0..85255cded 100644 --- 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): ?> -
-
- -
-
- limiter ?> -
-
- paginator ?> -
-
- sortBox ?> -
-
- filterEditor ?> +
+ +
+ limiter ?> + paginator ?> + sortBox ?>
+ filterEditor ?>
diff --git a/modules/monitoring/application/views/scripts/list/servicegrid.phtml b/modules/monitoring/application/views/scripts/list/servicegrid.phtml index dff055419..b51bb3baf 100644 --- 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): ?> -
+
tabs; ?>
@@ -102,7 +102,7 @@ $hostFilter = '(host_name=' . implode('|host_name=', array_keys($pivotData)) . ' compact && $this->horizontalPaginator->getPages()->pageCount > 1): ?> 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)) . ' qlink( - $this->translate('more …'), + $this->translate('Load more'), Url::fromRequest(), array( 'limit' => $this->horizontalPaginator->getItemCountPerPage() . ',' . diff --git a/modules/monitoring/application/views/scripts/list/servicegroups.phtml b/modules/monitoring/application/views/scripts/list/servicegroups.phtml index 5363bac35..5e9500bea 100644 --- a/modules/monitoring/application/views/scripts/list/servicegroups.phtml +++ b/modules/monitoring/application/views/scripts/list/servicegroups.phtml @@ -1,18 +1,12 @@ compact): ?> -
- tabs ?> +
+
-
- limiter ?> -
-
- paginator ?> -
-
- sortBox ?> -
+ limiter ?> + paginator ?> + sortBox ?>
filterEditor ?>
diff --git a/modules/monitoring/application/views/scripts/list/services.phtml b/modules/monitoring/application/views/scripts/list/services.phtml index e5e1e01da..fc9421795 100644 --- 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): ?>
tabs ?>
-
- render('list/components/servicesummary.phtml') ?> -
-
- render('list/components/selectioninfo.phtml') ?> -
+ render('list/components/servicesummary.phtml') ?> + render('list/components/selectioninfo.phtml') ?>
-
- limiter ?> -
-
- paginator ?> -
-
- sortBox ?> -
+ limiter ?> + paginator ?> + sortBox ?>
filterEditor ?>