From b04b10320708c147dbaf7c43352e374a649f9231 Mon Sep 17 00:00:00 2001
From: Art Lowel <art.lowel@atmire.com>
Date: Tue, 20 Jun 2017 14:27:35 +0200
Subject: [PATCH] tweaks to the object lists

---
 .../top-level-community-list.component.html               | 3 ++-
 .../object-list-element.component.scss                    | 8 +++++++-
 src/app/object-list/object-list.component.html            | 4 ++--
 src/app/shared/pagination/pagination.component.html       | 4 ++--
 src/app/shared/pagination/pagination.component.ts         | 8 ++++++++
 5 files changed, 21 insertions(+), 6 deletions(-)

diff --git a/src/app/home/top-level-community-list/top-level-community-list.component.html b/src/app/home/top-level-community-list/top-level-community-list.component.html
index ed592365e2..043239e766 100644
--- a/src/app/home/top-level-community-list/top-level-community-list.component.html
+++ b/src/app/home/top-level-community-list/top-level-community-list.component.html
@@ -1,7 +1,8 @@
 <div *ngIf="topLevelCommunities.hasSucceeded | async">
   <h2>{{'home.top-level-communities.head' | translate}}</h2>
   <p class="lead">{{'home.top-level-communities.help' | translate}}</p>
-  <ds-object-list [config]="config" [sortConfig]="sortConfig" [objects]="topLevelCommunities"
+  <ds-object-list [config]="config" [sortConfig]="sortConfig"
+                  [objects]="topLevelCommunities" [hideGear]="false"
                   (pageChange)="onPageChange($event)"
                   (pageSizeChange)="onPageSizeChange($event)"
                   (sortDirectionChange)="onSortDirectionChange($event)"
diff --git a/src/app/object-list/object-list-element/object-list-element.component.scss b/src/app/object-list/object-list-element/object-list-element.component.scss
index ad84b72f8c..6bdc45f30f 100644
--- a/src/app/object-list/object-list-element/object-list-element.component.scss
+++ b/src/app/object-list/object-list-element/object-list-element.component.scss
@@ -1 +1,7 @@
-@import '../../../styles/variables.scss';
\ No newline at end of file
+@import '../../../styles/variables.scss';
+@import '../../../../node_modules/bootstrap/scss/variables';
+
+:host {
+  display: block;
+  margin-bottom: $spacer-y;
+}
diff --git a/src/app/object-list/object-list.component.html b/src/app/object-list/object-list.component.html
index 79ce61f5fe..ffc27c3ef4 100644
--- a/src/app/object-list/object-list.component.html
+++ b/src/app/object-list/object-list.component.html
@@ -7,10 +7,10 @@
                (pageSizeChange)="onPageSizeChange($event)"
                (sortDirectionChange)="onSortDirectionChange($event)"
                (sortFieldChange)="onSortDirectionChange($event)">
-    <ul *ngIf="objects.hasSucceeded | async">
+    <ul *ngIf="objects.hasSucceeded | async" class="list-unstyled">
         <li *ngFor="let object of (objects.payload | async) | paginate: { itemsPerPage: (pageInfo | async)?.elementsPerPage, currentPage: (pageInfo | async)?.currentPage, totalItems: (pageInfo | async)?.totalElements }">
             <ds-object-list-element [object]="object"></ds-object-list-element>
         </li>
     </ul>
 
-</ds-pagination>
\ No newline at end of file
+</ds-pagination>
diff --git a/src/app/shared/pagination/pagination.component.html b/src/app/shared/pagination/pagination.component.html
index 0e5347a699..33c3dba1f3 100644
--- a/src/app/shared/pagination/pagination.component.html
+++ b/src/app/shared/pagination/pagination.component.html
@@ -1,4 +1,4 @@
-<div class="pagination-masked clearfix top {{hideGear ? 'invisible' : ''}}">
+<div *ngIf="!hideGear" class="pagination-masked clearfix top">
   <div class="row">
     <div class="col pagination-info">
       <span class="align-middle hidden-xs-down">{{ 'pagination.showing.label' | translate }}</span>
@@ -20,7 +20,7 @@
 
 <ng-content></ng-content>
 
-<div class="pagination justify-content-center clearfix bottom {{(hidePagerWhenSinglePage && pageSize >= collectionSize) ? 'invisible' : ''}}">
+<div *ngIf="shouldShowBottomPager" class="pagination justify-content-center clearfix bottom">
   <ngb-pagination [boundaryLinks]="paginationOptions.boundaryLinks"
                   [collectionSize]="collectionSize"
                   [disabled]="paginationOptions.disabled"
diff --git a/src/app/shared/pagination/pagination.component.ts b/src/app/shared/pagination/pagination.component.ts
index 28ff84dceb..f669793b49 100644
--- a/src/app/shared/pagination/pagination.component.ts
+++ b/src/app/shared/pagination/pagination.component.ts
@@ -342,5 +342,13 @@ export class PaginationComponent implements OnDestroy, OnInit {
             throw new Error("Paginate: Argument is missing the following required properties: " + missing.join(', '));
         }
     }
+
+    get hasMultiplePages(): boolean {
+      return this.collectionSize > this.pageSize;
+    }
+
+    get shouldShowBottomPager(): boolean {
+      return this.hasMultiplePages || !this.hidePagerWhenSinglePage
+    }
 }