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 eb15ac9523..227fa8aa78 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 @@ -6,10 +6,10 @@ - - + diff --git a/src/app/collection-page/collection-page.component.html b/src/app/collection-page/collection-page.component.html index c1df38f793..eebfdbd829 100644 --- a/src/app/collection-page/collection-page.component.html +++ b/src/app/collection-page/collection-page.component.html @@ -17,10 +17,10 @@ - - + - - + + diff --git a/src/app/shared/comcol/comcol-page-handle/themed-comcol-page-handle.component.ts b/src/app/shared/comcol/comcol-page-handle/themed-comcol-page-handle.component.ts new file mode 100644 index 0000000000..e7a7caf7be --- /dev/null +++ b/src/app/shared/comcol/comcol-page-handle/themed-comcol-page-handle.component.ts @@ -0,0 +1,36 @@ +import {Component, Input} from '@angular/core'; +import { ThemedComponent } from '../../theme-support/themed.component'; +import { ComcolPageHandleComponent } from './comcol-page-handle.component'; + +/** + * Themed wrapper for BreadcrumbsComponent + */ +@Component({ + selector: 'ds-themed-comcol-page-handle', + styleUrls: [], + templateUrl: '../../theme-support/themed.component.html', +}) + + +export class ThemedComcolPageHandleComponent extends ThemedComponent { + +// Optional title + @Input() title: string; + +// The value of "handle" + @Input() content: string; + + inAndOutputNames: (keyof ComcolPageHandleComponent & keyof this)[] = ['title', 'content']; + + protected getComponentName(): string { + return 'ComcolPageHandleComponent'; + } + + protected importThemedComponent(themeName: string): Promise { + return import(`../../../../themes/${themeName}/app/shared/comcol/comcol-page-handle/comcol-page-handle.component`); + } + + protected importUnthemedComponent(): Promise { + return import(`./comcol-page-handle.component`); + } +} diff --git a/src/app/shared/comcol/comcol.module.ts b/src/app/shared/comcol/comcol.module.ts index 6e779a24db..094387929a 100644 --- a/src/app/shared/comcol/comcol.module.ts +++ b/src/app/shared/comcol/comcol.module.ts @@ -2,6 +2,8 @@ import { NgModule } from '@angular/core'; import { CommonModule } from '@angular/common'; import { ComcolPageContentComponent } from './comcol-page-content/comcol-page-content.component'; import { ComcolPageHandleComponent } from './comcol-page-handle/comcol-page-handle.component'; +import { ThemedComcolPageHandleComponent} from './comcol-page-handle/themed-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 { ComColFormComponent } from './comcol-forms/comcol-form/comcol-form.component'; @@ -26,6 +28,9 @@ const COMPONENTS = [ ComcolPageBrowseByComponent, ThemedComcolPageBrowseByComponent, ComcolRoleComponent, + + ThemedComcolPageHandleComponent + ]; @NgModule({ diff --git a/src/themes/custom/app/shared/comcol-page-handle/comcol-page-handle.component.html b/src/themes/custom/app/shared/comcol-page-handle/comcol-page-handle.component.html new file mode 100644 index 0000000000..e69de29bb2 diff --git a/src/themes/custom/app/shared/comcol-page-handle/comcol-page-handle.component.scss b/src/themes/custom/app/shared/comcol-page-handle/comcol-page-handle.component.scss new file mode 100644 index 0000000000..e69de29bb2 diff --git a/src/themes/custom/app/shared/comcol-page-handle/comcol-page-handle.component.ts b/src/themes/custom/app/shared/comcol-page-handle/comcol-page-handle.component.ts new file mode 100644 index 0000000000..ef68f1538f --- /dev/null +++ b/src/themes/custom/app/shared/comcol-page-handle/comcol-page-handle.component.ts @@ -0,0 +1,18 @@ +import { Component } from '@angular/core'; +import { ComcolPageHandleComponent as BaseComponent} from '../../../../../app/shared/comcol/comcol-page-handle/comcol-page-handle.component'; + + +/** + * This component builds a URL from the value of "handle" + */ + +@Component({ + selector: 'ds-comcol-page-handle', + // templateUrl: './comcol-page-handle.component.html', + templateUrl: '../../../../../app/shared/comcol/comcol-page-handle/comcol-page-handle.component.html', + // styleUrls: ['./comcol-page-handle.component.scss'], + styleUrls: ['../../../../../app/shared/comcol/comcol-page-handle/comcol-page-handle.component.scss'], +}) + + +export class ComcolPageHandleComponent extends BaseComponent {} diff --git a/src/themes/custom/lazy-theme.module.ts b/src/themes/custom/lazy-theme.module.ts index 5a923ebf8e..15637dd2db 100644 --- a/src/themes/custom/lazy-theme.module.ts +++ b/src/themes/custom/lazy-theme.module.ts @@ -88,6 +88,8 @@ import { import { BreadcrumbsComponent } from './app/breadcrumbs/breadcrumbs.component'; import { FeedbackComponent } from './app/info/feedback/feedback.component'; import { CommunityListComponent } from './app/community-list-page/community-list/community-list.component'; + +import { ComcolPageHandleComponent } from './app/shared/comcol-page-handle/comcol-page-handle.component'; import { AuthNavMenuComponent } from './app/shared/auth-nav-menu/auth-nav-menu.component'; import { ExpandableNavbarSectionComponent @@ -146,6 +148,7 @@ const DECLARATIONS = [ BreadcrumbsComponent, FeedbackComponent, CommunityListComponent, + ComcolPageHandleComponent, AuthNavMenuComponent, ExpandableNavbarSectionComponent, ItemMetadataComponent,