From 897e303035a864c4895e76929a66d5266d2b727b Mon Sep 17 00:00:00 2001 From: lhenze Date: Wed, 21 Aug 2019 11:00:56 -0400 Subject: [PATCH 01/57] Moving Logo --- .../+collection-page/collection-page.component.html | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/src/app/+collection-page/collection-page.component.html b/src/app/+collection-page/collection-page.component.html index 91239de17c..75e507508a 100644 --- a/src/app/+collection-page/collection-page.component.html +++ b/src/app/+collection-page/collection-page.component.html @@ -3,17 +3,19 @@ *ngVar="(collectionRD$ | async) as collectionRD">
+ + + + - - - + Date: Wed, 21 Aug 2019 12:51:27 -0400 Subject: [PATCH 02/57] Label need not be an H3 --- .../comcol-page-browse-by/comcol-page-browse-by.component.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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..dd9e219afe 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,4 +1,4 @@ -

{{'browse.comcol.head' | translate}}

+
{{'browse.comcol.head' | translate}}
  • {{'browse.comcol.by.' + config.id | translate}} From b9baecd57378cc5286069bfb3130c180c6df60e8 Mon Sep 17 00:00:00 2001 From: lhenze Date: Wed, 21 Aug 2019 13:27:52 -0400 Subject: [PATCH 03/57] Bootstrap -- list group for links https://getbootstrap.com/docs/4.3/components/list-group/ --- .../comcol-page-browse-by.component.html | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) 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 dd9e219afe..6a39e24e5f 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,4 @@
    {{'browse.comcol.head' | translate}}
    - + \ No newline at end of file From 16b3e8af35e3bc173d98a797698df98b1c6d8a4d Mon Sep 17 00:00:00 2001 From: lhenze Date: Wed, 21 Aug 2019 13:59:54 -0400 Subject: [PATCH 04/57] Comcol component - adding styles --- .../comcol-page-browse-by.component.html | 8 +++++--- .../comcol-page-browse-by.component.scss | 3 +++ .../comcol-page-browse-by.component.ts | 1 + 3 files changed, 9 insertions(+), 3 deletions(-) create mode 100644 src/app/shared/comcol-page-browse-by/comcol-page-browse-by.component.scss 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 6a39e24e5f..e510d4df72 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,4 +1,6 @@ -
    {{'browse.comcol.head' | translate}}
    -
    - {{'browse.comcol.by.' + config.id | translate}} + \ No newline at end of file diff --git a/src/app/shared/comcol-page-browse-by/comcol-page-browse-by.component.scss b/src/app/shared/comcol-page-browse-by/comcol-page-browse-by.component.scss new file mode 100644 index 0000000000..7d3994681e --- /dev/null +++ b/src/app/shared/comcol-page-browse-by/comcol-page-browse-by.component.scss @@ -0,0 +1,3 @@ +.comcol-browse { + margin: 2rem 0 ; +} \ No newline at end of file diff --git a/src/app/shared/comcol-page-browse-by/comcol-page-browse-by.component.ts b/src/app/shared/comcol-page-browse-by/comcol-page-browse-by.component.ts index dcc7840bb4..8031d6373b 100644 --- a/src/app/shared/comcol-page-browse-by/comcol-page-browse-by.component.ts +++ b/src/app/shared/comcol-page-browse-by/comcol-page-browse-by.component.ts @@ -8,6 +8,7 @@ import { BrowseByTypeConfig } from '../../../config/browse-by-type-config.interf */ @Component({ selector: 'ds-comcol-page-browse-by', + styleUrls: ['./comcol-page-browse-by.component.scss'], templateUrl: './comcol-page-browse-by.component.html', }) export class ComcolPageBrowseByComponent implements OnInit { From 2a6e3c08cc3eb97a16505a943528ac906162cae0 Mon Sep 17 00:00:00 2001 From: lhenze Date: Wed, 21 Aug 2019 14:00:45 -0400 Subject: [PATCH 05/57] HTML Structure: Header and Footer tags --- .../collection-page.component.html | 49 +++++++++++-------- 1 file changed, 28 insertions(+), 21 deletions(-) diff --git a/src/app/+collection-page/collection-page.component.html b/src/app/+collection-page/collection-page.component.html index 75e507508a..7654f93697 100644 --- a/src/app/+collection-page/collection-page.component.html +++ b/src/app/+collection-page/collection-page.component.html @@ -3,42 +3,49 @@ *ngVar="(collectionRD$ | async) as collectionRD">
    +
    - - - - - - - - - - - - - + + + + + + + + + + + + + + +
    + +
    + - + +
    -
    +

    {{'collection.page.browse.recent.head' | translate}}

    From 165dc2ccda3eb14d518eef15c3ee2901a6df9dde Mon Sep 17 00:00:00 2001 From: lhenze Date: Wed, 21 Aug 2019 14:03:34 -0400 Subject: [PATCH 06/57] Browse by pages: Adding Parent's Title and Description --- .../browse-by-metadata-page.component.html | 21 +++++++++++++++++++ .../browse-by-metadata-page.component.scss | 3 +++ 2 files changed, 24 insertions(+) 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..27bf8502c1 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,25 @@
    + +
    +
    +
    + + + + + + + + + + +
    +
    +
    + +
    From 8f93d723a54e2568cebbac172cbc939cdaa0cf9f Mon Sep 17 00:00:00 2001 From: lhenze Date: Wed, 21 Aug 2019 16:07:34 -0400 Subject: [PATCH 09/57] Problem: Attempt to extend comcol-page-browse-by Cannot pass a URL. it is getting sanitized --- src/app/+collection-page/collection-page.component.html | 3 ++- .../comcol-page-browse-by/comcol-page-browse-by.component.html | 1 + .../comcol-page-browse-by/comcol-page-browse-by.component.ts | 1 + 3 files changed, 4 insertions(+), 1 deletion(-) diff --git a/src/app/+collection-page/collection-page.component.html b/src/app/+collection-page/collection-page.component.html index 7ac0bb4959..c9bdbf21c8 100644 --- a/src/app/+collection-page/collection-page.component.html +++ b/src/app/+collection-page/collection-page.component.html @@ -16,7 +16,8 @@ - + +
    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 e510d4df72..07629ef791 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,7 @@ \ No newline at end of file diff --git a/src/app/shared/comcol-page-browse-by/comcol-page-browse-by.component.ts b/src/app/shared/comcol-page-browse-by/comcol-page-browse-by.component.ts index 8031d6373b..165f1aea97 100644 --- a/src/app/shared/comcol-page-browse-by/comcol-page-browse-by.component.ts +++ b/src/app/shared/comcol-page-browse-by/comcol-page-browse-by.component.ts @@ -16,6 +16,7 @@ export class ComcolPageBrowseByComponent implements OnInit { * The ID of the Community or Collection */ @Input() id: string; + @Input() url: string; /** * List of currently active browse configurations From b73ad7a8f09f9c5a08a91f4314722a490dcd0e73 Mon Sep 17 00:00:00 2001 From: lhenze Date: Thu, 22 Aug 2019 12:47:33 -0400 Subject: [PATCH 10/57] Managed to pass URL value and not have it be sanitized --- src/app/+collection-page/collection-page.component.html | 6 ++---- src/app/+collection-page/collection-page.component.ts | 2 ++ .../comcol-page-browse-by.component.html | 2 +- .../comcol-page-browse-by.component.ts | 4 ++-- 4 files changed, 7 insertions(+), 7 deletions(-) diff --git a/src/app/+collection-page/collection-page.component.html b/src/app/+collection-page/collection-page.component.html index c9bdbf21c8..895c030b48 100644 --- a/src/app/+collection-page/collection-page.component.html +++ b/src/app/+collection-page/collection-page.component.html @@ -17,7 +17,7 @@ - +
    @@ -35,9 +35,7 @@ - - - +
    diff --git a/src/app/+collection-page/collection-page.component.ts b/src/app/+collection-page/collection-page.component.ts index 41afbf2115..32908dd566 100644 --- a/src/app/+collection-page/collection-page.component.ts +++ b/src/app/+collection-page/collection-page.component.ts @@ -41,6 +41,8 @@ export class CollectionPageComponent implements OnInit { logoRD$: Observable>; paginationConfig: PaginationComponentOptions; sortConfig: SortOptions; + thisurl = "http://localhost:3000/collections/07a39181-b4bf-43cf-9975-5a1a01de7ac8"; + private paginationChanges$: Subject<{ paginationConfig: PaginationComponentOptions, sortConfig: SortOptions 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 07629ef791..38bbb2e2c1 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,7 +1,7 @@ \ No newline at end of file diff --git a/src/app/shared/comcol-page-browse-by/comcol-page-browse-by.component.ts b/src/app/shared/comcol-page-browse-by/comcol-page-browse-by.component.ts index 165f1aea97..950d122425 100644 --- a/src/app/shared/comcol-page-browse-by/comcol-page-browse-by.component.ts +++ b/src/app/shared/comcol-page-browse-by/comcol-page-browse-by.component.ts @@ -16,8 +16,8 @@ export class ComcolPageBrowseByComponent implements OnInit { * The ID of the Community or Collection */ @Input() id: string; - @Input() url: string; - + @Input() thisurl: string; + /** * List of currently active browse configurations */ From 86d33894382029b8cab73c894491329063fdaecd Mon Sep 17 00:00:00 2001 From: lhenze Date: Fri, 23 Aug 2019 17:52:29 -0400 Subject: [PATCH 11/57] One approach --- .../comcol-page-browse-by.component.ts | 17 ++++++++++++++++- 1 file changed, 16 insertions(+), 1 deletion(-) diff --git a/src/app/shared/comcol-page-browse-by/comcol-page-browse-by.component.ts b/src/app/shared/comcol-page-browse-by/comcol-page-browse-by.component.ts index 950d122425..7f49b767db 100644 --- a/src/app/shared/comcol-page-browse-by/comcol-page-browse-by.component.ts +++ b/src/app/shared/comcol-page-browse-by/comcol-page-browse-by.component.ts @@ -16,7 +16,21 @@ export class ComcolPageBrowseByComponent implements OnInit { * The ID of the Community or Collection */ @Input() id: string; - @Input() thisurl: string; + @Input() contentType: string; + + /** + * getPathfromType + */ + getPathfromType(t) { + if (t === "collection") { + t = "/collections/"; + } else if (t === "community") { + t = "/communities/"; + } else { + t = "/"; + } + return t; + } /** * List of currently active browse configurations @@ -28,6 +42,7 @@ export class ComcolPageBrowseByComponent implements OnInit { ngOnInit(): void { this.types = this.config.browseBy.types; + this.contentTypePath = this.getPathfromType(this.contentType) ; } } From 72c382d5c3ac29a70770c83dd2033522e56980d3 Mon Sep 17 00:00:00 2001 From: lhenze Date: Fri, 23 Aug 2019 17:59:08 -0400 Subject: [PATCH 12/57] Using "type" value to determine path & innerHTML of first button --- .../browse-by-metadata-page.component.html | 8 ++++++-- .../collection-page.component.html | 4 ++-- .../+community-page/community-page.component.html | 2 +- .../comcol-page-browse-by.component.html | 5 ++++- .../comcol-page-browse-by.component.ts | 14 -------------- 5 files changed, 13 insertions(+), 20 deletions(-) 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 27bf8502c1..3251550d84 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 @@ -13,9 +13,13 @@ [content]="parentContext.introductoryText" [hasInnerHtml]="true"> - + + + + + - +
    diff --git a/src/app/+collection-page/collection-page.component.html b/src/app/+collection-page/collection-page.component.html index 895c030b48..c8bb75ceed 100644 --- a/src/app/+collection-page/collection-page.component.html +++ b/src/app/+collection-page/collection-page.component.html @@ -16,8 +16,8 @@ - - + +
    diff --git a/src/app/+community-page/community-page.component.html b/src/app/+community-page/community-page.component.html index e429d224f2..05912f676d 100644 --- a/src/app/+community-page/community-page.component.html +++ b/src/app/+community-page/community-page.component.html @@ -4,7 +4,7 @@ - +
    {{'browse.comcol.head' | translate}}
    \ No newline at end of file diff --git a/src/app/shared/comcol-page-browse-by/comcol-page-browse-by.component.ts b/src/app/shared/comcol-page-browse-by/comcol-page-browse-by.component.ts index 7f49b767db..9190bbc687 100644 --- a/src/app/shared/comcol-page-browse-by/comcol-page-browse-by.component.ts +++ b/src/app/shared/comcol-page-browse-by/comcol-page-browse-by.component.ts @@ -18,19 +18,6 @@ export class ComcolPageBrowseByComponent implements OnInit { @Input() id: string; @Input() contentType: string; - /** - * getPathfromType - */ - getPathfromType(t) { - if (t === "collection") { - t = "/collections/"; - } else if (t === "community") { - t = "/communities/"; - } else { - t = "/"; - } - return t; - } /** * List of currently active browse configurations @@ -42,7 +29,6 @@ export class ComcolPageBrowseByComponent implements OnInit { ngOnInit(): void { this.types = this.config.browseBy.types; - this.contentTypePath = this.getPathfromType(this.contentType) ; } } From 6f3a5448c525a1e6f08a53bd046defdda50a92c7 Mon Sep 17 00:00:00 2001 From: lhenze Date: Sat, 24 Aug 2019 11:08:22 -0400 Subject: [PATCH 13/57] Formatting only --- .../browse-by-metadata-page.component.html | 44 ++++++------------- 1 file changed, 14 insertions(+), 30 deletions(-) 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 3251550d84..a58e6d6eee 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,42 +1,26 @@
    -
    - - - - - - - - - - - - - - + + + + + + + + + + +
    - From 5963c6cd959990b0df29f06ef7b9915be8ab0604 Mon Sep 17 00:00:00 2001 From: lhenze Date: Sat, 24 Aug 2019 13:35:59 -0400 Subject: [PATCH 14/57] Handle added to header and copyright added to footer --- .../browse-by-metadata-page.component.html | 15 +++++++++++++-- .../collection-page.component.html | 7 ++++--- 2 files changed, 17 insertions(+), 5 deletions(-) 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 a58e6d6eee..a7b78cd428 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 @@ -2,15 +2,18 @@
    - + - + + + +
    @@ -24,4 +27,12 @@
    +
    +
    + + + + +
    +
    diff --git a/src/app/+collection-page/collection-page.component.html b/src/app/+collection-page/collection-page.component.html index c8bb75ceed..681b46839c 100644 --- a/src/app/+collection-page/collection-page.component.html +++ b/src/app/+collection-page/collection-page.component.html @@ -15,8 +15,10 @@ + + + - @@ -35,11 +37,10 @@ -
- \ No newline at end of file + From a35523f78d8981025813e07b6dfd895afb0a6c5b Mon Sep 17 00:00:00 2001 From: lhenze Date: Sat, 24 Aug 2019 13:36:29 -0400 Subject: [PATCH 15/57] Pagination -- Hide "Now Showing" when there are no results --- src/app/shared/pagination/pagination.component.html | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/src/app/shared/pagination/pagination.component.html b/src/app/shared/pagination/pagination.component.html index 22a58dd7fc..2d01d651ff 100644 --- a/src/app/shared/pagination/pagination.component.html +++ b/src/app/shared/pagination/pagination.component.html @@ -2,8 +2,10 @@
- {{ 'pagination.showing.label' | translate }} - {{ 'pagination.showing.detail' | translate:getShowingDetails(collectionSize)}} + + {{ 'pagination.showing.label' | translate }} + {{ 'pagination.showing.detail' | translate:getShowingDetails(collectionSize)}} +
From 5d7a36e1e34f692e7ebde66bddc660a92d25ffbf Mon Sep 17 00:00:00 2001 From: lhenze Date: Mon, 26 Aug 2019 08:08:40 -0400 Subject: [PATCH 16/57] formatting only --- src/app/shared/pagination/pagination.component.html | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/app/shared/pagination/pagination.component.html b/src/app/shared/pagination/pagination.component.html index c16a153026..d9c3033230 100644 --- a/src/app/shared/pagination/pagination.component.html +++ b/src/app/shared/pagination/pagination.component.html @@ -2,8 +2,8 @@
- {{ 'pagination.showing.label' | translate }} - {{ 'pagination.showing.detail' | translate:getShowingDetails(collectionSize)}} + {{ 'pagination.showing.label' | translate }} + {{ 'pagination.showing.detail' | translate:getShowingDetails(collectionSize)}}
@@ -16,7 +16,7 @@
-
+
From ba97ca9f3a9b794ef50105cdb58a96eb75bb4392 Mon Sep 17 00:00:00 2001 From: lhenze Date: Mon, 26 Aug 2019 08:46:32 -0400 Subject: [PATCH 17/57] Exploring using same approach on Community pages --- src/app/+community-page/community-page.component.html | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/src/app/+community-page/community-page.component.html b/src/app/+community-page/community-page.component.html index 05912f676d..452995d44b 100644 --- a/src/app/+community-page/community-page.component.html +++ b/src/app/+community-page/community-page.component.html @@ -3,8 +3,6 @@
- - + + + + + +
From 94050b655b1b14b6051accf9307dbd9fcacd0e11 Mon Sep 17 00:00:00 2001 From: lhenze Date: Mon, 26 Aug 2019 09:40:17 -0400 Subject: [PATCH 18/57] Fixing typo --- .../comcol-page-browse-by.component.html | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) 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 f6734a1ee3..54ec0faadf 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 @@ -4,7 +4,7 @@ Submission date -Subcommunties and collections +Subcommunities and collections {{'browse.comcol.by.' + config.id | translate}}
-
\ No newline at end of file + From ba3778acaeae2490d01c3300377a8548dcc506e0 Mon Sep 17 00:00:00 2001 From: lhenze Date: Mon, 26 Aug 2019 10:36:08 -0400 Subject: [PATCH 19/57] Ally improvements --- .../comcol-page-browse-by.component.html | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) 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 54ec0faadf..1607910c68 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,4 +1,4 @@ - + From f6094762708b84967f03af405add2df206273693 Mon Sep 17 00:00:00 2001 From: lhenze Date: Tue, 3 Sep 2019 17:19:13 -0400 Subject: [PATCH 20/57] New key --- resources/i18n/en.json | 1 + src/app/+collection-page/collection-page.component.html | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/resources/i18n/en.json b/resources/i18n/en.json index f3236251cf..9262e9bbc4 100644 --- a/resources/i18n/en.json +++ b/resources/i18n/en.json @@ -132,6 +132,7 @@ "collection.form.tableofcontents": "News (HTML)", "collection.form.title": "Name", "collection.page.browse.recent.head": "Recent Submissions", + "collection.page.browse.recent.empty": "No recent items to show", "collection.page.license": "License", "collection.page.news": "News", "community.create.head": "Create a Community", diff --git a/src/app/+collection-page/collection-page.component.html b/src/app/+collection-page/collection-page.component.html index 681b46839c..9b98fe81b5 100644 --- a/src/app/+collection-page/collection-page.component.html +++ b/src/app/+collection-page/collection-page.component.html @@ -30,7 +30,7 @@