tidying - whitespace only

2025-10-07 01:54:15 +00:00 · 2019-09-04 17:12:52 -04:00
parent 2845578d07
commit 20bc4d1c2d
3 changed files with 82 additions and 43 deletions
--- a/src/app/+browse-by/+browse-by-metadata-page/browse-by-metadata-page.component.html
+++ b/src/app/+browse-by/+browse-by-metadata-page/browse-by-metadata-page.component.html
@@ -21,9 +21,17 @@
  </div>
  <div class="browse-by-metadata 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;': ''} }}"
-        [objects$]="(items$ !== undefined)? items$ : browseEntries$" [paginationConfig]="paginationConfig" [sortConfig]="sortConfig" [type]="startsWithType" [startsWithOptions]="startsWithOptions" [enableArrows]="true" (prev)="goPrev()"
-        (next)="goNext()" (pageSizeChange)="pageSizeChange($event)" (sortDirectionChange)="sortDirectionChange($event)">
+      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()"
+      (next)="goNext()"
+      (pageSizeChange)="pageSizeChange($event)"
+      (sortDirectionChange)="sortDirectionChange($event)">
    </ds-browse-by>
    <ds-loading *ngIf="!startsWithOptions" message="{{'loading.browse-by-page' | translate}}"></ds-loading>
  </div>
--- a/src/app/+collection-page/collection-page.component.html
+++ b/src/app/+collection-page/collection-page.component.html
@@ -1,46 +1,77 @@
 <div class="container">
-  <div class="collection-page" *ngVar="(collectionRD$ | async) as collectionRD">
-    <div *ngIf="collectionRD?.hasSucceeded" @fadeInOut>
-      <div *ngIf="collectionRD?.payload as collection">
-        <header>
-          <!-- Collection logo -->
-          <ds-comcol-page-logo *ngIf="logoRD$" [logo]="(logoRD$ | async)?.payload" [alternateText]="'Collection Logo'">
-          </ds-comcol-page-logo>
-          <!-- Collection Name -->
-          <ds-comcol-page-header [name]="collection.name">
-          </ds-comcol-page-header>
-          <!-- Introductory text -->
-          <ds-comcol-page-content [content]="collection.introductoryText" [hasInnerHtml]="true">
-          </ds-comcol-page-content>
-          <!-- News -->
-          <ds-comcol-page-content [content]="collection.sidebarText" [hasInnerHtml]="true" [title]="'collection.page.news'">
-          </ds-comcol-page-content>
-          <!-- Handle -->
-          <ds-comcol-page-content [content]="collection.handle" [hasInnerHtml]="true" [title]="'collection.page.handle'" >
-          </ds-comcol-page-content>
-          <!-- Browse-By Links -->
-          <ds-comcol-page-browse-by [id]="collection.id" [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>
+    <div class="collection-page"
+         *ngVar="(collectionRD$ | async) as collectionRD">
+        <div *ngIf="collectionRD?.hasSucceeded" @fadeInOut>
+            <div *ngIf="collectionRD?.payload as collection">
+                <header>
+                    <!-- Collection logo -->
+                    <ds-comcol-page-logo *ngIf="logoRD$" 
+                        [logo]="(logoRD$ | async)?.payload" [alternateText]="'Collection Logo'">
+                    </ds-comcol-page-logo>
+                <!-- Collection Name -->
+                <ds-comcol-page-header
+                        [name]="collection.name">
+                </ds-comcol-page-header>
+                    <!-- Introductory text -->
+                <ds-comcol-page-content
+                        [content]="collection.introductoryText"
+                        [hasInnerHtml]="true">
+                </ds-comcol-page-content>
+                <!-- News -->
+                <ds-comcol-page-content
+                        [content]="collection.sidebarText"
+                        [hasInnerHtml]="true"
+                        [title]="'collection.page.news'">
+                </ds-comcol-page-content>
+                <!-- Handle -->
+                <ds-comcol-page-content
+                        [content]="collection.handle"
+                        [hasInnerHtml]="true"
+                        [title]="'collection.page.handle'" >
+                </ds-comcol-page-content>
+                    <!-- Browse-By Links -->
+                <ds-comcol-page-browse-by
+                        [id]="collection.id"
+                        [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>
+          <!-- Licence -->
+              <ds-comcol-page-content
+                      [content]="collection.dcLicense"
+                      [title]="'collection.page.license'">
+              </ds-comcol-page-content>
+
          <!-- Copyright -->
-          <ds-comcol-page-content [content]="collection.copyrightText" [hasInnerHtml]="true">
+          <ds-comcol-page-content 
+                      [content]="collection.copyrightText" 
+                      [hasInnerHtml]="true">
          </ds-comcol-page-content>
        </footer>
      </div>
    </div>
-    <ds-error *ngIf="collectionRD?.hasFailed" message="{{'error.collection' | translate}}"></ds-error>
-    <ds-loading *ngIf="collectionRD?.isLoading" message="{{'loading.collection' | translate}}"></ds-loading>
+        <ds-error *ngIf="collectionRD?.hasFailed" 
+            message="{{'error.collection' | translate}}"></ds-error>
+        <ds-loading *ngIf="collectionRD?.isLoading" 
+            message="{{'loading.collection' | translate}}"></ds-loading>
  </div>
 </div>
--- a/src/app/shared/pagination/pagination.component.html
+++ b/src/app/shared/pagination/pagination.component.html
@@ -2,8 +2,8 @@
  <div  class="pagination-masked clearfix top">
    <div class="row">
      <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">{{ 'pagination.showing.detail' | translate:getShowingDetails(collectionSize)}}</span>
+          <span class="align-middle hidden-xs-down">{{ 'pagination.showing.label' | translate }}</span>
+          <span class="align-middle">{{ 'pagination.showing.detail' | translate:getShowingDetails(collectionSize)}}</span>
      </div>
      <div class="col">
        <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>
  <ng-content></ng-content>