diff --git a/modules/monitoring/application/views/scripts/list/comments.phtml b/modules/monitoring/application/views/scripts/list/comments.phtml index e5c483b72..52184209f 100644 --- a/modules/monitoring/application/views/scripts/list/comments.phtml +++ b/modules/monitoring/application/views/scripts/list/comments.phtml @@ -1,14 +1,21 @@ compact): ?> -
- tabs; ?> -
- render('list/components/selectioninfo.phtml'); ?> -
-

translate('Comments') ?>

- sortBox; ?> - limiter; ?> - paginator; ?> - filterEditor; ?> +
+ +
+ render('list/components/selectioninfo.phtml'); ?> +
+
+
+ limiter ?> +
+
+ paginator ?> +
+
+ sortBox ?> +
+
+ filterEditor ?>
diff --git a/modules/monitoring/application/views/scripts/list/contactgroups.phtml b/modules/monitoring/application/views/scripts/list/contactgroups.phtml index 3a1a5bae1..fd1b677c2 100644 --- a/modules/monitoring/application/views/scripts/list/contactgroups.phtml +++ b/modules/monitoring/application/views/scripts/list/contactgroups.phtml @@ -2,11 +2,19 @@ if (! $this->compact): ?>
- tabs; ?> - sortBox; ?> - limiter; ?> - paginator; ?> - filterEditor; ?> + tabs ?> +
+
+ 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 5a365ffa7..110b1fbbf 100644 --- a/modules/monitoring/application/views/scripts/list/contacts.phtml +++ b/modules/monitoring/application/views/scripts/list/contacts.phtml @@ -1,13 +1,20 @@ compact): ?> -
- tabs; ?> - sortBox; ?> - limiter; ?> - paginator; ?> - filterEditor; ?> +
+ +
+
+ limiter ?> +
+
+ paginator ?> +
+
+ sortBox ?> +
+
+ filterEditor ?>
-
hasResult()): ?> @@ -75,4 +82,4 @@ translate('No contacts found matching the filter'); ?> - \ No newline at end of file + diff --git a/modules/monitoring/application/views/scripts/list/downtimes.phtml b/modules/monitoring/application/views/scripts/list/downtimes.phtml index 047f1c45e..106a61eb6 100644 --- a/modules/monitoring/application/views/scripts/list/downtimes.phtml +++ b/modules/monitoring/application/views/scripts/list/downtimes.phtml @@ -2,19 +2,24 @@ use Icinga\Module\Monitoring\Object\Host; use Icinga\Module\Monitoring\Object\Service; -$downtimes->peekAhead($this->compact); - if (! $this->compact): ?> -
- tabs; ?> -
+
+ +
render('list/components/selectioninfo.phtml'); ?>
-

translate('Downtimes') ?>

- sortBox ?> - limiter ?> - paginator ?> - filterEditor ?> +
+
+ limiter ?> +
+
+ paginator ?> +
+
+ sortBox ?> +
+
+ filterEditor ?>
@@ -24,7 +29,7 @@ if (! $this->compact): ?> data-icinga-multiselect-controllers="href("monitoring/downtimes") ?>" data-icinga-multiselect-data="downtime_id">
- peekAhead($this->compact) as $downtime): if (isset($downtime->service_description)) { $this->isService = true; $this->stateName = Service::getStateText($downtime->service_state); diff --git a/modules/monitoring/application/views/scripts/list/hostgroups.phtml b/modules/monitoring/application/views/scripts/list/hostgroups.phtml index 878a93bde..7f3928e67 100644 --- a/modules/monitoring/application/views/scripts/list/hostgroups.phtml +++ b/modules/monitoring/application/views/scripts/list/hostgroups.phtml @@ -4,9 +4,17 @@ use Icinga\Module\Monitoring\Web\Widget\StateBadges; if (! $this->compact): ?>
tabs ?> - sortBox ?> - limiter ?> - paginator ?> +
+
+ 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 ac23e2252..e31571863 100644 --- a/modules/monitoring/application/views/scripts/list/notifications.phtml +++ b/modules/monitoring/application/views/scripts/list/notifications.phtml @@ -6,11 +6,21 @@ $notifications->peekAhead($this->compact); if (! $this->compact): ?>
- tabs; ?> - sortBox; ?> - limiter; ?> - paginator; ?> - filterEditor; ?> +
+ +
+
+ limiter ?> +
+
+ paginator ?> +
+
+ sortBox ?> +
+
+ filterEditor ?> +
diff --git a/modules/monitoring/application/views/scripts/list/servicegroups.phtml b/modules/monitoring/application/views/scripts/list/servicegroups.phtml index a8082cf50..267b5fa76 100644 --- a/modules/monitoring/application/views/scripts/list/servicegroups.phtml +++ b/modules/monitoring/application/views/scripts/list/servicegroups.phtml @@ -3,9 +3,17 @@ if (! $this->compact): ?>
tabs ?> - sortBox ?> - limiter ?> - paginator ?> +
+
+ 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 c61663ee6..20a9f73a9 100644 --- a/modules/monitoring/application/views/scripts/list/services.phtml +++ b/modules/monitoring/application/views/scripts/list/services.phtml @@ -3,18 +3,18 @@ use Icinga\Module\Monitoring\Object\Host; use Icinga\Module\Monitoring\Object\Service; if (! $this->compact): ?> -
+
tabs ?> -
-
+
+
render('list/components/servicesummary.phtml') ?>
render('list/components/selectioninfo.phtml') ?>
-
-
+
+
limiter ?>
diff --git a/modules/monitoring/application/views/scripts/partials/show-more.phtml b/modules/monitoring/application/views/scripts/partials/show-more.phtml new file mode 100644 index 000000000..4265ba8dd --- /dev/null +++ b/modules/monitoring/application/views/scripts/partials/show-more.phtml @@ -0,0 +1,15 @@ +hasMore()): ?> +
+ qlink( + $this->translate('Show More'), + $this->url()->without(array('view', 'limit')), + null, + array( + 'data-base-target' => '_next', + 'class' => 'action-link' + ) + ) ?> +
+