From 01212750bf15c59cb7a6a6979efe67039fb66b50 Mon Sep 17 00:00:00 2001 From: "L. Henze" Date: Tue, 17 Sep 2019 17:08:09 -0400 Subject: [PATCH 1/4] handle component --- .../comcol-page-handle.component.html | 4 ++++ .../comcol-page-handle.component.scss | 0 .../comcol-page-handle.component.ts | 20 +++++++++++++++++++ src/app/shared/shared.module.ts | 2 ++ 4 files changed, 26 insertions(+) create mode 100644 src/app/shared/comcol-page-handle/comcol-page-handle.component.html create mode 100644 src/app/shared/comcol-page-handle/comcol-page-handle.component.scss create mode 100644 src/app/shared/comcol-page-handle/comcol-page-handle.component.ts diff --git a/src/app/shared/comcol-page-handle/comcol-page-handle.component.html b/src/app/shared/comcol-page-handle/comcol-page-handle.component.html new file mode 100644 index 0000000000..52d6b4dd16 --- /dev/null +++ b/src/app/shared/comcol-page-handle/comcol-page-handle.component.html @@ -0,0 +1,4 @@ +
+

{{ title | translate }}

+
{{content}}
+
diff --git a/src/app/shared/comcol-page-handle/comcol-page-handle.component.scss b/src/app/shared/comcol-page-handle/comcol-page-handle.component.scss new file mode 100644 index 0000000000..e69de29bb2 diff --git a/src/app/shared/comcol-page-handle/comcol-page-handle.component.ts b/src/app/shared/comcol-page-handle/comcol-page-handle.component.ts new file mode 100644 index 0000000000..61ab083246 --- /dev/null +++ b/src/app/shared/comcol-page-handle/comcol-page-handle.component.ts @@ -0,0 +1,20 @@ +import { Component, Input } from '@angular/core'; + +/** + * This component renders the value of "handle" + */ + +@Component({ + selector: 'ds-comcol-page-handle', + styleUrls: ['./comcol-page-handle.component.scss'], + templateUrl: './comcol-page-handle.component.html' +}) +export class ComcolPageHandleComponent { + + // Optional title + @Input() title: string; + + // The content to render. Might be html + @Input() content: string; + +} diff --git a/src/app/shared/shared.module.ts b/src/app/shared/shared.module.ts index 2367652dd3..d18fbd2708 100644 --- a/src/app/shared/shared.module.ts +++ b/src/app/shared/shared.module.ts @@ -36,6 +36,7 @@ import { WrapperGridElementComponent } from './object-grid/wrapper-grid-element/ import { ObjectGridComponent } from './object-grid/object-grid.component'; import { ObjectCollectionComponent } from './object-collection/object-collection.component'; import { ComcolPageContentComponent } from './comcol-page-content/comcol-page-content.component'; +import { ComcolPageHandleComponent } from './comcol-page-handle/comcol-page-handle.component'; import { ComcolPageHeaderComponent } from './comcol-page-header/comcol-page-header.component'; import { ComcolPageLogoComponent } from './comcol-page-logo/comcol-page-logo.component'; import { ErrorComponent } from './error/error.component'; @@ -192,6 +193,7 @@ const COMPONENTS = [ UserMenuComponent, ChipsComponent, ComcolPageContentComponent, + ComcolPageHandleComponent, ComcolPageHeaderComponent, ComcolPageLogoComponent, ComColFormComponent, From af3005c863a65957d6695ccc8a8eb126adedc86d Mon Sep 17 00:00:00 2001 From: "L. Henze" Date: Tue, 17 Sep 2019 17:19:34 -0400 Subject: [PATCH 2/4] 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 @@
+
+
+
+ + + + + + + + + + + + + + +
+
+
+
+ + + - - - - + @@ -25,18 +26,17 @@ [hasInnerHtml]="true" [title]="'community.page.news'"> - - - - - - -
-
+ + + + + + +

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

@@ -56,10 +56,24 @@ {{'collection.page.browse.recent.empty' | translate}}
-
- - +
+ + + + + + + +
+
+ + + 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"> + + + + + + 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 @@ -

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

- +

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

+ From 6b55f944058ba56e48a17720c0bb2288145a5f7f Mon Sep 17 00:00:00 2001 From: "L. Henze" Date: Tue, 17 Sep 2019 17:29:37 -0400 Subject: [PATCH 3/4] Update comcol-page-browse-by.component.ts --- .../comcol-page-browse-by/comcol-page-browse-by.component.ts | 2 +- 1 file changed, 1 insertion(+), 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 dcc7840bb4..ef9b97e4d2 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 @@ -15,7 +15,7 @@ export class ComcolPageBrowseByComponent implements OnInit { * The ID of the Community or Collection */ @Input() id: string; - + @Input() contentType: string; /** * List of currently active browse configurations */ From 4a77dec8709e66c918cb38cec6cbbfcf84320070 Mon Sep 17 00:00:00 2001 From: "L. Henze" Date: Tue, 17 Sep 2019 17:38:46 -0400 Subject: [PATCH 4/4] Fixing some work that was rolled back --- .../+collection-page/collection-page.component.html | 4 +--- .../+community-page/community-page.component.html | 12 ++++++------ 2 files changed, 7 insertions(+), 9 deletions(-) diff --git a/src/app/+collection-page/collection-page.component.html b/src/app/+collection-page/collection-page.component.html index af3c5defc9..de1b1d4795 100644 --- a/src/app/+collection-page/collection-page.component.html +++ b/src/app/+collection-page/collection-page.component.html @@ -13,8 +13,6 @@ - -