From af3005c863a65957d6695ccc8a8eb126adedc86d Mon Sep 17 00:00:00 2001
From: "L. Henze" <lh435@nyu.edu>
Date: Tue, 17 Sep 2019 17:19:34 -0400
Subject: [PATCH] wip

---
 resources/i18n/en.json5                       |  4 ++
 .../browse-by-metadata-page.component.html    | 22 +++++++
 .../collection-page.component.html            | 60 ++++++++++++-------
 .../community-page.component.html             |  8 +++
 .../comcol-page-browse-by.component.html      | 14 +++--
 5 files changed, 79 insertions(+), 29 deletions(-)

diff --git a/resources/i18n/en.json5 b/resources/i18n/en.json5
index 6570d5bf3a..72dee36c23 100644
--- a/resources/i18n/en.json5
+++ b/resources/i18n/en.json5
@@ -140,8 +140,10 @@
   "collection.form.title": "Name",
   "collection.page.browse.recent.head": "Recent Submissions",
   "collection.page.browse.recent.empty": "No items to show",
+  "collection.page.handle": "Collection Handle",
   "collection.page.license": "License",
   "collection.page.news": "News",
+  "collection.landing.head": "Submission date",
 
   "community.create.head": "Create a Community",
   "community.create.sub-head": "Create a Sub-Community for Community {{ parent }}",
@@ -159,8 +161,10 @@
   "community.form.rights": "Copyright text (HTML)",
   "community.form.tableofcontents": "News (HTML)",
   "community.form.title": "Name",
+  "community.page.handle": "Community Handle",
   "community.page.license": "License",
   "community.page.news": "News",
+  "community.landing.head": "Subcommunities and Collections",
   "community.sub-collection-list.head": "Collections of this Community",
   "community.sub-community-list.head": "Communities of this Community",
 
diff --git 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
index c589c543d4..60e8446200 100644
--- 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
@@ -1,4 +1,26 @@
 <div class="container">
+  <div *ngVar="(parent$ | async) as parent">
+    <div *ngIf="parent?.payload as parentContext">
+      <header>
+        <!-- Parent Name -->
+        <ds-comcol-page-header [name]="parentContext.name">
+        </ds-comcol-page-header>
+        <!-- Introductory text -->
+        <ds-comcol-page-content [content]="parentContext.introductoryText" [hasInnerHtml]="true">
+        </ds-comcol-page-content>
+        <!-- News -->
+        <ds-comcol-page-content [content]="parentContext.sidebarText" [hasInnerHtml]="true" [title]="'community.page.news'">
+        </ds-comcol-page-content>
+        <!-- Handle -->
+        <ds-comcol-page-handle
+            [content]="parentContext.handle"
+            [title]="parentContext.type+'.page.handle'" >
+        </ds-comcol-page-handle>
+        <!-- Browse-By Links -->
+        <ds-comcol-page-browse-by [id]="parentContext.id" [contentType]="parentContext.type"></ds-comcol-page-browse-by>
+      </header>
+    </div>
+  </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;': ''} }}"
diff --git a/src/app/+collection-page/collection-page.component.html b/src/app/+collection-page/collection-page.component.html
index 2b16bc1ca6..af3c5defc9 100644
--- a/src/app/+collection-page/collection-page.component.html
+++ b/src/app/+collection-page/collection-page.component.html
@@ -3,18 +3,19 @@
          *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>
                 <!-- Browse-By Links -->
                 <ds-comcol-page-browse-by [id]="collection.id"></ds-comcol-page-browse-by>
-                <!-- Collection logo -->
-                <ds-comcol-page-logo *ngIf="logoRD$"
-                                     [logo]="(logoRD$ | async)?.payload"
-                                     [alternateText]="'Collection Logo'">
-                </ds-comcol-page-logo>
-                <!-- Introductionary text -->
+                <!-- Introductory text -->
                 <ds-comcol-page-content
                         [content]="collection.introductoryText"
                         [hasInnerHtml]="true">
@@ -25,18 +26,17 @@
                         [hasInnerHtml]="true"
                         [title]="'community.page.news'">
                 </ds-comcol-page-content>
-                <!-- Copyright -->
-                <ds-comcol-page-content
-                        [content]="collection.copyrightText"
-                        [hasInnerHtml]="true">
-                </ds-comcol-page-content>
-                <!-- Licence -->
-                <ds-comcol-page-content
-                        [content]="collection.dcLicense"
-                        [title]="'collection.page.license'">
-                </ds-comcol-page-content>
-            </div>
-            <br>
+               <!-- Handle -->
+               <ds-comcol-page-handle
+                        [content]="collection.handle"
+                        [title]="'collection.page.handle'" >
+                </ds-comcol-page-handle>
+                <!-- 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>
@@ -56,10 +56,24 @@
                         {{'collection.page.browse.recent.empty' | translate}}
                 </div>
             </ng-container>
-        </div>
-        <ds-error *ngIf="collectionRD?.hasFailed"
-                  message="{{'error.collection' | translate}}"></ds-error>
-        <ds-loading *ngIf="collectionRD?.isLoading"
-                    message="{{'loading.collection' | translate}}"></ds-loading>
+        <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>
+        </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>
+  </div>
 </div>
diff --git a/src/app/+community-page/community-page.component.html b/src/app/+community-page/community-page.component.html
index e429d224f2..3518c06017 100644
--- a/src/app/+community-page/community-page.component.html
+++ b/src/app/+community-page/community-page.component.html
@@ -26,6 +26,14 @@
         [content]="communityPayload.copyrightText"
         [hasInnerHtml]="true">
       </ds-comcol-page-content>
+      <!-- Handle -->
+      <ds-comcol-page-handle
+        [content]="communityPayload.handle"
+        [title]="'community.page.handle'" >
+      </ds-comcol-page-handle>
+      <!-- Browse-By Links -->
+      <ds-comcol-page-browse-by [id]="communityPayload.id" [contentType]="communityPayload.type"></ds-comcol-page-browse-by>
+
       <ds-community-page-sub-community-list [community]="communityPayload"></ds-community-page-sub-community-list>
       <ds-community-page-sub-collection-list [community]="communityPayload"></ds-community-page-sub-collection-list>
     </div>
diff --git a/src/app/shared/comcol-page-browse-by/comcol-page-browse-by.component.html b/src/app/shared/comcol-page-browse-by/comcol-page-browse-by.component.html
index 1c73fbb3df..7f29ab58c7 100644
--- a/src/app/shared/comcol-page-browse-by/comcol-page-browse-by.component.html
+++ b/src/app/shared/comcol-page-browse-by/comcol-page-browse-by.component.html
@@ -1,6 +1,8 @@
-<h3>{{'browse.comcol.head' | translate}}</h3>
-<ul>
-  <li *ngFor="let config of types">
-    <a [routerLink]="['/browse/' + config.id]" [queryParams]="{scope: id}">{{'browse.comcol.by.' + config.id | translate}}</a>
-  </li>
-</ul>
+<h2 class="comcol-browse-label">{{'browse.comcol.head' | translate}}</h2>
+<nav class="comcol-browse" aria-label="Browse Community or Collection" >
+  <div class="list-group list-group-horizontal">
+    <a *ngIf="contentType=='collection'" [routerLink]="['/collections/' + id ]" class="list-group-item" routerLinkActive="active">{{'collection.landing.head' | translate}}</a>
+    <a *ngIf="contentType=='community'" [routerLink]="['/communities/' + id ]" class="list-group-item" routerLinkActive="active" >{{'community.landing.head' | translate}}</a>
+    <a *ngFor="let config of types" class="list-group-item" [routerLink]="['/browse/' + config.id]" [queryParams]="{scope: id}" routerLinkActive="active">{{'browse.comcol.by.' + config.id | translate}}</a>
+  </div>
+</nav>