Skip to content

Commit 106182d

Browse files
alexandrevryghemalexandrevryghem
committed
111321: Made ComColPageContentComponent themeable
1 parent ca86437 commit 106182d

6 files changed

Lines changed: 67 additions & 21 deletions

File tree

‎src/app/browse-by/browse-by-metadata-page/browse-by-metadata-page.component.html‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -11,11 +11,11 @@
1111
[title]="parentContext.type+'.page.handle'" >
1212
</ds-themed-comcol-page-handle>
1313
<!-- Introductory text -->
14-
<ds-comcol-page-content [content]="parentContext.introductoryText" [hasInnerHtml]="true">
15-
</ds-comcol-page-content>
14+
<ds-themed-comcol-page-content [content]="parentContext.introductoryText" [hasInnerHtml]="true">
15+
</ds-themed-comcol-page-content>
1616
<!-- News -->
17-
<ds-comcol-page-content [content]="parentContext.sidebarText" [hasInnerHtml]="true" [title]="'community.page.news'">
18-
</ds-comcol-page-content>
17+
<ds-themed-comcol-page-content [content]="parentContext.sidebarText" [hasInnerHtml]="true" [title]="'community.page.news'">
18+
</ds-themed-comcol-page-content>
1919
</header>
2020
<!-- Browse-By Links -->
2121
<ds-themed-comcol-page-browse-by [id]="parentContext.id" [contentType]="parentContext.type"></ds-themed-comcol-page-browse-by>
@@ -49,8 +49,8 @@
4949
<div >
5050

5151
<!-- Copyright -->
52-
<ds-comcol-page-content [content]="parentContext.copyrightText" [hasInnerHtml]="true">
53-
</ds-comcol-page-content>
52+
<ds-themed-comcol-page-content [content]="parentContext.copyrightText" [hasInnerHtml]="true">
53+
</ds-themed-comcol-page-content>
5454
</div>
5555
</footer>
5656
</ng-container>

‎src/app/collection-page/collection-page.component.html‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -22,16 +22,16 @@
2222
[title]="'collection.page.handle'" >
2323
</ds-themed-comcol-page-handle>
2424
<!-- Introductory text -->
25-
<ds-comcol-page-content
25+
<ds-themed-comcol-page-content
2626
[content]="collection.introductoryText"
2727
[hasInnerHtml]="true">
28-
</ds-comcol-page-content>
28+
</ds-themed-comcol-page-content>
2929
<!-- News -->
30-
<ds-comcol-page-content
30+
<ds-themed-comcol-page-content
3131
[content]="collection.sidebarText"
3232
[hasInnerHtml]="true"
3333
[title]="'collection.page.news'">
34-
</ds-comcol-page-content>
34+
</ds-themed-comcol-page-content>
3535
</header>
3636
<div class="pl-2 space-children-mr">
3737
<ds-dso-page-edit-button *ngIf="isCollectionAdmin$ | async" [pageRoute]="collectionPageRoute$ | async" [dso]="collection" [tooltipMsg]="'collection.page.edit'"></ds-dso-page-edit-button>
@@ -65,10 +65,10 @@ <h3 class="sr-only">{{'collection.page.browse.recent.head' | translate}}</h3>
6565
</section>
6666
<footer *ngIf="collection.copyrightText" class="border-top my-5 pt-4">
6767
<!-- Copyright -->
68-
<ds-comcol-page-content
68+
<ds-themed-comcol-page-content
6969
[content]="collection.copyrightText"
7070
[hasInnerHtml]="true">
71-
</ds-comcol-page-content>
71+
</ds-themed-comcol-page-content>
7272
</footer>
7373
</div>
7474
</div>

‎src/app/community-page/community-page.component.html‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -13,12 +13,12 @@
1313
<ds-themed-comcol-page-handle [content]="communityPayload.handle" [title]="'community.page.handle'">
1414
</ds-themed-comcol-page-handle>
1515
<!-- Introductory text -->
16-
<ds-comcol-page-content [content]="communityPayload.introductoryText" [hasInnerHtml]="true">
17-
</ds-comcol-page-content>
16+
<ds-themed-comcol-page-content [content]="communityPayload.introductoryText" [hasInnerHtml]="true">
17+
</ds-themed-comcol-page-content>
1818
<!-- News -->
19-
<ds-comcol-page-content [content]="communityPayload.sidebarText" [hasInnerHtml]="true"
19+
<ds-themed-comcol-page-content [content]="communityPayload.sidebarText" [hasInnerHtml]="true"
2020
[title]="'community.page.news'">
21-
</ds-comcol-page-content>
21+
</ds-themed-comcol-page-content>
2222
</header>
2323
<div class="pl-2 space-children-mr">
2424
<ds-dso-page-edit-button *ngIf="isCommunityAdmin$ | async" [pageRoute]="communityPageRoute$ | async" [dso]="communityPayload" [tooltipMsg]="'community.page.edit'"></ds-dso-page-edit-button>
@@ -35,8 +35,8 @@
3535
</section>
3636
<footer *ngIf="communityPayload.copyrightText" class="border-top my-5 pt-4">
3737
<!-- Copyright -->
38-
<ds-comcol-page-content [content]="communityPayload.copyrightText" [hasInnerHtml]="true">
39-
</ds-comcol-page-content>
38+
<ds-themed-comcol-page-content [content]="communityPayload.copyrightText" [hasInnerHtml]="true">
39+
</ds-themed-comcol-page-content>
4040
</footer>
4141
</div>
4242
</div>

‎src/app/shared/comcol/comcol-page-content/comcol-page-content.component.ts‎

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -13,13 +13,19 @@ import { Component, Input } from '@angular/core';
1313
})
1414
export class ComcolPageContentComponent {
1515

16-
// Optional title
16+
/**
17+
* Optional title
18+
*/
1719
@Input() title: string;
1820

19-
// The content to render. Might be html
21+
/**
22+
* The content to render. Might be html
23+
*/
2024
@Input() content: string;
2125

22-
// flag whether the content contains html syntax or not
26+
/**
27+
* flag whether the content contains html syntax or not
28+
*/
2329
@Input() hasInnerHtml: boolean;
2430

2531
}

‎src/app/shared/comcol/comcol-page-content/themed-comcol-page-content.component.ts‎

Lines changed: 38 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,38 @@
1+
import { Component, Input } from '@angular/core';
2+
import { ThemedComponent } from '../../theme-support/themed.component';
3+
import { ComcolPageContentComponent } from './comcol-page-content.component';
4+
5+
/**
6+
* Themed wrapper for {@link ComcolPageContentComponent}
7+
*/
8+
@Component({
9+
selector: 'ds-themed-comcol-page-content',
10+
templateUrl: '../../theme-support/themed.component.html',
11+
})
12+
export class ThemedComcolPageContentComponent extends ThemedComponent<ComcolPageContentComponent> {
13+
14+
@Input() title: string;
15+
16+
@Input() content: string;
17+
18+
@Input() hasInnerHtml: boolean;
19+
20+
protected inAndOutputNames: (keyof ComcolPageContentComponent & keyof this)[] = [
21+
'title',
22+
'content',
23+
'hasInnerHtml',
24+
];
25+
26+
protected getComponentName(): string {
27+
return 'ComcolPageContentComponent';
28+
}
29+
30+
protected importThemedComponent(themeName: string): Promise<any> {
31+
return import(`../../../themes/${themeName}/app/admin/admin-sidebar/admin-sidebar.component`);
32+
}
33+
34+
protected importUnthemedComponent(): Promise<any> {
35+
return import('./comcol-page-content.component');
36+
}
37+
38+
}

‎src/app/shared/comcol/comcol.module.ts‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,9 +15,11 @@ import { ThemedComcolPageBrowseByComponent } from './comcol-page-browse-by/theme
1515
import { ComcolRoleComponent } from './comcol-forms/edit-comcol-page/comcol-role/comcol-role.component';
1616
import { SharedModule } from '../shared.module';
1717
import { FormModule } from '../form/form.module';
18+
import { ThemedComcolPageContentComponent } from './comcol-page-content/themed-comcol-page-content.component';
1819

1920
const COMPONENTS = [
2021
ComcolPageContentComponent,
22+
ThemedComcolPageContentComponent,
2123
ComcolPageHandleComponent,
2224
ComcolPageHeaderComponent,
2325
ComcolPageLogoComponent,

0 commit comments

Comments
 (0)