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

tidying - whitespace only

Browse Source
This commit is contained in:
lhenze
2019-09-04 17:12:52 -04:00
parent 2845578d07
commit 20bc4d1c2d
3 changed files with 82 additions and 43 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/app/+browse-by/+browse-by-metadata-page/browse-by-metadata-page.component.html
View File

@@ -21,9 +21,17 @@
</div> </div>
<div class="browse-by-metadata w-100"> <div class="browse-by-metadata w-100">
<ds-browse-by *ngIf="startsWithOptions" class="col-xs-12 w-100" <ds-browse-by *ngIf="startsWithOptions" class="col-xs-12 w-100"
title="{{'browse.title' | translate:{collection: (parent$ | async)?.payload?.name || '', field: 'browse.metadata.' + browseId | translate, value: (value)? '&quot;' + value + '&quot;': ''} }}" title="{{'browse.title' | translate:{collection: (parent$ | async)?.payload?.name || '', field: 'browse.metadata.' + browseId | translate, value: (value)? '&quot;' + value + '&quot;': ''} }}"
[objects$]="(items$ !== undefined)? items$ : browseEntries$" [paginationConfig]="paginationConfig" [sortConfig]="sortConfig" [type]="startsWithType" [startsWithOptions]="startsWithOptions" [enableArrows]="true" (prev)="goPrev()" [objects$]="(items$ !== undefined)? items$ : browseEntries$"
(next)="goNext()" (pageSizeChange)="pageSizeChange($event)" (sortDirectionChange)="sortDirectionChange($event)"> [paginationConfig]="paginationConfig"
[sortConfig]="sortConfig"
[type]="startsWithType"
[startsWithOptions]="startsWithOptions"
[enableArrows]="true"
(prev)="goPrev()"
(next)="goNext()"
(pageSizeChange)="pageSizeChange($event)"
(sortDirectionChange)="sortDirectionChange($event)">
</ds-browse-by> </ds-browse-by>
<ds-loading *ngIf="!startsWithOptions" message="{{'loading.browse-by-page' | translate}}"></ds-loading> <ds-loading *ngIf="!startsWithOptions" message="{{'loading.browse-by-page' | translate}}"></ds-loading>
</div> </div>

105
src/app/+collection-page/collection-page.component.html
View File

@@ -1,46 +1,77 @@
<div class="container"> <div class="container">
<div class="collection-page" *ngVar="(collectionRD$ | async) as collectionRD"> <div class="collection-page"
<div *ngIf="collectionRD?.hasSucceeded" @fadeInOut> *ngVar="(collectionRD$ | async) as collectionRD">
<div *ngIf="collectionRD?.payload as collection"> <div *ngIf="collectionRD?.hasSucceeded" @fadeInOut>
<header> <div *ngIf="collectionRD?.payload as collection">
<!-- Collection logo --> <header>
<ds-comcol-page-logo *ngIf="logoRD$" [logo]="(logoRD$ | async)?.payload" [alternateText]="'Collection Logo'"> <!-- Collection logo -->
</ds-comcol-page-logo> <ds-comcol-page-logo *ngIf="logoRD$"
<!-- Collection Name --> [logo]="(logoRD$ | async)?.payload" [alternateText]="'Collection Logo'">
<ds-comcol-page-header [name]="collection.name"> </ds-comcol-page-logo>
</ds-comcol-page-header> <!-- Collection Name -->
<!-- Introductory text --> <ds-comcol-page-header
<ds-comcol-page-content [content]="collection.introductoryText" [hasInnerHtml]="true"> [name]="collection.name">
</ds-comcol-page-content> </ds-comcol-page-header>
<!-- News --> <!-- Introductory text -->
<ds-comcol-page-content [content]="collection.sidebarText" [hasInnerHtml]="true" [title]="'collection.page.news'"> <ds-comcol-page-content
</ds-comcol-page-content> [content]="collection.introductoryText"
<!-- Handle --> [hasInnerHtml]="true">
<ds-comcol-page-content [content]="collection.handle" [hasInnerHtml]="true" [title]="'collection.page.handle'" > </ds-comcol-page-content>
</ds-comcol-page-content> <!-- News -->
<!-- Browse-By Links --> <ds-comcol-page-content
<ds-comcol-page-browse-by [id]="collection.id" [contentType]="collection.type"></ds-comcol-page-browse-by> [content]="collection.sidebarText"
</header> [hasInnerHtml]="true"
<ng-container *ngVar="(itemRD$ | async) as itemRD"> [title]="'collection.page.news'">
<div *ngIf="itemRD?.hasSucceeded" @fadeIn> </ds-comcol-page-content>
<h2>{{'collection.page.browse.recent.head' | translate}}</h2> <!-- Handle -->
<ds-viewable-collection [config]="paginationConfig" [sortConfig]="sortConfig" [objects]="itemRD" [hideGear]="true" (paginationChange)="onPaginationChange($event)"> <ds-comcol-page-content
</ds-viewable-collection> [content]="collection.handle"
</div> [hasInnerHtml]="true"
<ds-error *ngIf="itemRD?.hasFailed" message="{{'error.recent-submissions' | translate}}"></ds-error> [title]="'collection.page.handle'" >
<ds-loading *ngIf="!itemRD || itemRD.isLoading" message="{{'loading.recent-submissions' | translate}}"></ds-loading> </ds-comcol-page-content>
<div *ngIf="!itemRD?.isLoading && itemRD?.payload?.page.length === 0" class="alert alert-info w-100" role="alert"> <!-- Browse-By Links -->
{{'collection.page.browse.recent.empty' | translate}} <ds-comcol-page-browse-by
</div> [id]="collection.id"
</ng-container> [contentType]="collection.type">
</ds-comcol-page-browse-by>
</header>
<ng-container *ngVar="(itemRD$ | async) as itemRD">
<div *ngIf="itemRD?.hasSucceeded" @fadeIn>
<h2>{{'collection.page.browse.recent.head' | translate}}</h2>
<ds-viewable-collection
[config]="paginationConfig"
[sortConfig]="sortConfig"
[objects]="itemRD"
[hideGear]="true"
(paginationChange)="onPaginationChange($event)">
</ds-viewable-collection>
</div>
<ds-error *ngIf="itemRD?.hasFailed"
message="{{'error.recent-submissions' | translate}}"></ds-error>
<ds-loading *ngIf="!itemRD || itemRD.isLoading"
message="{{'loading.recent-submissions' | translate}}"></ds-loading>
<div *ngIf="!itemRD?.isLoading && itemRD?.payload?.page.length === 0" class="alert alert-info w-100" role="alert">
{{'collection.page.browse.recent.empty' | translate}}
</div>
</ng-container>
<footer> <footer>
<!-- Licence -->
<ds-comcol-page-content
[content]="collection.dcLicense"
[title]="'collection.page.license'">
</ds-comcol-page-content>
<!-- Copyright --> <!-- Copyright -->
<ds-comcol-page-content [content]="collection.copyrightText" [hasInnerHtml]="true"> <ds-comcol-page-content
[content]="collection.copyrightText"
[hasInnerHtml]="true">
</ds-comcol-page-content> </ds-comcol-page-content>
</footer> </footer>
</div> </div>
</div> </div>
<ds-error *ngIf="collectionRD?.hasFailed" message="{{'error.collection' | translate}}"></ds-error> <ds-error *ngIf="collectionRD?.hasFailed"
<ds-loading *ngIf="collectionRD?.isLoading" message="{{'loading.collection' | translate}}"></ds-loading> message="{{'error.collection' | translate}}"></ds-error>
<ds-loading *ngIf="collectionRD?.isLoading"
message="{{'loading.collection' | translate}}"></ds-loading>
</div> </div>
</div> </div>

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

@@ -2,8 +2,8 @@
<div class="pagination-masked clearfix top"> <div class="pagination-masked clearfix top">
<div class="row"> <div class="row">
<div *ngIf="!hidePaginationDetail && collectionSize > 0" class="col-auto pagination-info"> <div *ngIf="!hidePaginationDetail && collectionSize > 0" class="col-auto pagination-info">
<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">{{ 'pagination.showing.detail' | translate:getShowingDetails(collectionSize)}}</span> <span class="align-middle">{{ 'pagination.showing.detail' | translate:getShowingDetails(collectionSize)}}</span>
</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">
@@ -16,7 +16,7 @@
</div> </div>
</div> </div>
</div> </div>
</div> </div>
</div> </div>
<ng-content></ng-content> <ng-content></ng-content>