diff --git a/modules/monitoring/application/views/scripts/list/comments.phtml b/modules/monitoring/application/views/scripts/list/comments.phtml index ba05fb115..3287f08e9 100644 --- a/modules/monitoring/application/views/scripts/list/comments.phtml +++ b/modules/monitoring/application/views/scripts/list/comments.phtml @@ -17,7 +17,7 @@ data-icinga-multiselect-url="/icingaweb2/monitoring/comments/show" data-icinga-multiselect-data="comment_id"> - + peekAhead($this->compact) as $comment): ?> partial('partials/comment/comment-description.phtml', array('comment' => $comment)); ?> @@ -86,5 +86,15 @@ hasResult()): ?> translate('No comments found matching the filter'); ?> +hasMore()): ?> + qlink( + $this->translate('Show More'), + $this->url()->without(array('view', 'limit')), + null, + array( + 'data-base-target' => '_next', + 'class' => 'pull-right show-more' + ) + ); ?> diff --git a/modules/monitoring/application/views/scripts/list/contacts.phtml b/modules/monitoring/application/views/scripts/list/contacts.phtml index 6775fb480..3e10197fb 100644 --- a/modules/monitoring/application/views/scripts/list/contacts.phtml +++ b/modules/monitoring/application/views/scripts/list/contacts.phtml @@ -8,7 +8,7 @@
- + peekAhead($this->compact) as $contact): ?>
img('/static/gravatar', array('email' => $contact->contact_email)); ?> qlink( @@ -54,5 +54,15 @@ hasResult()): ?> translate('No contacts found matching the filter'); ?> + hasMore()): ?> + qlink( + $this->translate('Show More'), + $this->url()->without(array('view', 'limit')), + null, + array( + 'data-base-target' => '_next', + 'class' => 'pull-right show-more' + ) + ); ?>
diff --git a/modules/monitoring/application/views/scripts/list/downtimes.phtml b/modules/monitoring/application/views/scripts/list/downtimes.phtml index a2feafa52..7848efcd8 100644 --- a/modules/monitoring/application/views/scripts/list/downtimes.phtml +++ b/modules/monitoring/application/views/scripts/list/downtimes.phtml @@ -2,6 +2,8 @@ use Icinga\Module\Monitoring\Object\Host; use Icinga\Module\Monitoring\Object\Service; +$downtimes->peekAhead($this->compact); + if (! $this->compact): ?>
tabs; ?> @@ -137,5 +139,15 @@ if (! $this->compact): ?> hasResult()): ?> translate('No downtimes found matching the filter, maybe the downtime already expired.'); ?> +hasMore()): ?> + qlink( + $this->translate('Show More'), + $this->url()->without(array('view', 'limit')), + null, + array( + 'data-base-target' => '_next', + 'class' => 'pull-right show-more' + ) + ); ?>
diff --git a/modules/monitoring/application/views/scripts/list/eventhistory.phtml b/modules/monitoring/application/views/scripts/list/eventhistory.phtml index ca44df469..47375c054 100644 --- a/modules/monitoring/application/views/scripts/list/eventhistory.phtml +++ b/modules/monitoring/application/views/scripts/list/eventhistory.phtml @@ -2,6 +2,8 @@ use Icinga\Module\Monitoring\Object\Host; use Icinga\Module\Monitoring\Object\Service; +$history->peekAhead($this->compact); + if (! $this->compact): ?>
tabs; ?> @@ -92,5 +94,15 @@ if (! $this->compact): ?> hasResult()): ?> translate('No history events found matching the filter'); ?> +hasMore()): ?> + qlink( + $this->translate('Show More'), + $this->url()->without(array('view', 'limit')), + null, + array( + 'data-base-target' => '_next', + 'class' => 'pull-right show-more' + ) + ); ?>
diff --git a/modules/monitoring/application/views/scripts/list/hostgroups.phtml b/modules/monitoring/application/views/scripts/list/hostgroups.phtml index 27527591c..1e0b251ba 100644 --- a/modules/monitoring/application/views/scripts/list/hostgroups.phtml +++ b/modules/monitoring/application/views/scripts/list/hostgroups.phtml @@ -13,6 +13,7 @@ if (! $this->compact): ?>
peekAhead($this->compact); $firstRow = true; foreach ($hostgroups as $h): ?> @@ -467,6 +468,17 @@ if ($h->hosts_down_unhandled) { hasResult()): ?> +hasMore()): ?> + qlink( + $this->translate('Show More'), + $this->url()->without(array('view', 'limit')), + null, + array( + 'data-base-target' => '_next', + 'class' => 'pull-right show-more' + ) + ); ?> + translate('No hostgroups found matching the filter'); ?> diff --git a/modules/monitoring/application/views/scripts/list/hosts.phtml b/modules/monitoring/application/views/scripts/list/hosts.phtml index 4ff367fd8..8938d5703 100644 --- a/modules/monitoring/application/views/scripts/list/hosts.phtml +++ b/modules/monitoring/application/views/scripts/list/hosts.phtml @@ -1,6 +1,8 @@ peekAhead($this->compact); + if (! $this->compact): ?>
tabs; ?> @@ -93,5 +95,15 @@ if (! $this->compact): ?> hasResult()): ?> translate('No hosts found matching the filter'); ?> +hasMore()): ?> + qlink( + $this->translate('Show More'), + $this->url()->without(array('view', 'limit')), + null, + array( + 'data-base-target' => '_next', + 'class' => 'pull-right show-more' + ) + ); ?>
diff --git a/modules/monitoring/application/views/scripts/list/notifications.phtml b/modules/monitoring/application/views/scripts/list/notifications.phtml index 877a810c6..30b3c5875 100644 --- a/modules/monitoring/application/views/scripts/list/notifications.phtml +++ b/modules/monitoring/application/views/scripts/list/notifications.phtml @@ -2,6 +2,8 @@ use Icinga\Module\Monitoring\Object\Host; use Icinga\Module\Monitoring\Object\Service; +$notifications->peekAhead($this->compact); + if (! $this->compact): ?>
tabs; ?> @@ -66,5 +68,15 @@ if (! $this->compact): ?> hasResult()): ?> translate('No notifications found matching the filter'); ?> +hasMore()): ?> + qlink( + $this->translate('Show More'), + $this->url()->without(array('view', 'limit')), + null, + array( + 'data-base-target' => '_next', + 'class' => 'pull-right show-more' + ) + ); ?>
diff --git a/modules/monitoring/application/views/scripts/list/servicegroups.phtml b/modules/monitoring/application/views/scripts/list/servicegroups.phtml index 41e52b833..eab74364a 100644 --- a/modules/monitoring/application/views/scripts/list/servicegroups.phtml +++ b/modules/monitoring/application/views/scripts/list/servicegroups.phtml @@ -10,6 +10,7 @@
peekAhead($this->compact); $firstRow = true; foreach ($servicegroups as $s): ?> @@ -301,6 +302,17 @@ foreach ($servicegroups as $s): ?> hasResult()): ?> +hasMore()): ?> + qlink( + $this->translate('Show More'), + $this->url()->without(array('view', 'limit')), + null, + array( + 'data-base-target' => '_next', + 'class' => 'pull-right show-more' + ) + ); ?> + translate('No servicegroups found matching the filter'); ?> diff --git a/modules/monitoring/application/views/scripts/list/services.phtml b/modules/monitoring/application/views/scripts/list/services.phtml index d5f68bbe5..b12e3176c 100644 --- a/modules/monitoring/application/views/scripts/list/services.phtml +++ b/modules/monitoring/application/views/scripts/list/services.phtml @@ -3,6 +3,7 @@ use Icinga\Module\Monitoring\Object\Host; use Icinga\Module\Monitoring\Object\Service; $selfUrl = 'monitoring/list/services'; +$services->peekAhead($this->compact); if (! $this->compact): ?>
@@ -86,5 +87,15 @@ if (! $this->compact): ?> hasResult()): ?> translate('No services found matching the filter'); ?> +hasMore()): ?> + qlink( + $this->translate('Show More'), + $this->url()->without(array('view', 'limit')), + null, + array( + 'data-base-target' => '_next', + 'class' => 'pull-right show-more' + ) + ); ?>
diff --git a/public/css/icinga/pagination.less b/public/css/icinga/pagination.less index 97acd31bc..b7dc6c606 100644 --- a/public/css/icinga/pagination.less +++ b/public/css/icinga/pagination.less @@ -62,3 +62,7 @@ ul.pagination { cursor: default; } +a.show-more { + display: block; + margin: 0.5em; +} \ No newline at end of file