hazza/dspace-angular
1
0
Fork 1
mirror of https://github.com/DSpace/dspace-angular.git synced 2025-10-07 10:04:11 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch '440-pagination-messaging' into 460-coll-pages

Browse Source 
* 440-pagination-messaging:
  More compact approach h/t @artlowel
  Moving the ngIf directive to wrap both parts of the statement
This commit is contained in:
lhenze
2019-08-26 07:52:49 -04:00
parent a35523f78d 316ced7fef
commit 047f9e75c3
1 changed files with 2 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/app/shared/pagination/pagination.component.html
View File

@@ -1,11 +1,9 @@
<div *ngIf="currentPageState == undefined || currentPageState == currentPage"> <div *ngIf="currentPageState == undefined || currentPageState == currentPage">
<div class="pagination-masked clearfix top"> <div class="pagination-masked clearfix top">
<div class="row"> <div class="row">
<div *ngIf="!hidePaginationDetail" class="col-auto pagination-info"> <div *ngIf="!hidePaginationDetail && collectionSize > 0" class="col-auto pagination-info">
<ng-container *ngIf="collectionSize">
<span class="align-middle hidden-xs-down">{{ 'pagination.showing.label' | translate }}</span> <span class="align-middle hidden-xs-down">{{ 'pagination.showing.label' | translate }}</span>
<span class="align-middle" *ngIf="collectionSize">{{ 'pagination.showing.detail' | translate:getShowingDetails(collectionSize)}}</span> <span class="align-middle">{{ 'pagination.showing.detail' | translate:getShowingDetails(collectionSize)}}</span>
</ng-container>
</div> </div>
<div class="col"> <div class="col">
<div *ngIf="!hideGear" ngbDropdown #paginationControls="ngbDropdown" placement="bottom-right" class="d-inline-block float-right"> <div *ngIf="!hideGear" ngbDropdown #paginationControls="ngbDropdown" placement="bottom-right" class="d-inline-block float-right">