diff --git a/src/app/collection-page/collection-page.component.html b/src/app/collection-page/collection-page.component.html
index d5da37c12f..56d2208f03 100644
--- a/src/app/collection-page/collection-page.component.html
+++ b/src/app/collection-page/collection-page.component.html
@@ -22,16 +22,16 @@
[title]="'collection.page.handle'">
-
-
+
-
-
+
@@ -46,10 +46,10 @@
@@ -58,4 +58,4 @@
-
\ No newline at end of file
+
diff --git a/src/app/community-page/community-page.component.html b/src/app/community-page/community-page.component.html
index b3e577af7d..3b49daf321 100644
--- a/src/app/community-page/community-page.component.html
+++ b/src/app/community-page/community-page.component.html
@@ -13,12 +13,12 @@
-
-
+
+
-
-
+
@@ -32,8 +32,8 @@
diff --git a/src/app/shared/comcol/comcol-page-content/comcol-page-content.component.ts b/src/app/shared/comcol/comcol-page-content/comcol-page-content.component.ts
index 015a82f285..e99f658a60 100644
--- a/src/app/shared/comcol/comcol-page-content/comcol-page-content.component.ts
+++ b/src/app/shared/comcol/comcol-page-content/comcol-page-content.component.ts
@@ -16,13 +16,19 @@ import {
})
export class ComcolPageContentComponent {
- // Optional title
+ /**
+ * Optional title
+ */
@Input() title: string;
- // The content to render. Might be html
+ /**
+ * The content to render. Might be html
+ */
@Input() content: string;
- // flag whether the content contains html syntax or not
+ /**
+ * flag whether the content contains html syntax or not
+ */
@Input() hasInnerHtml: boolean;
}
diff --git a/src/app/shared/comcol/comcol-page-content/themed-comcol-page-content.component.ts b/src/app/shared/comcol/comcol-page-content/themed-comcol-page-content.component.ts
new file mode 100644
index 0000000000..43c3f81e25
--- /dev/null
+++ b/src/app/shared/comcol/comcol-page-content/themed-comcol-page-content.component.ts
@@ -0,0 +1,42 @@
+import {
+ Component,
+ Input,
+} from '@angular/core';
+
+import { ThemedComponent } from '../../theme-support/themed.component';
+import { ComcolPageContentComponent } from './comcol-page-content.component';
+
+/**
+ * Themed wrapper for {@link ComcolPageContentComponent}
+ */
+@Component({
+ selector: 'ds-themed-comcol-page-content',
+ templateUrl: '../../theme-support/themed.component.html',
+})
+export class ThemedComcolPageContentComponent extends ThemedComponent {
+
+ @Input() title: string;
+
+ @Input() content: string;
+
+ @Input() hasInnerHtml: boolean;
+
+ protected inAndOutputNames: (keyof ComcolPageContentComponent & keyof this)[] = [
+ 'title',
+ 'content',
+ 'hasInnerHtml',
+ ];
+
+ protected getComponentName(): string {
+ return 'ComcolPageContentComponent';
+ }
+
+ protected importThemedComponent(themeName: string): Promise {
+ return import(`../../../../themes/${themeName}/app/admin/admin-sidebar/admin-sidebar.component`);
+ }
+
+ protected importUnthemedComponent(): Promise {
+ return import('./comcol-page-content.component');
+ }
+
+}
diff --git a/src/app/shared/comcol/comcol.module.ts b/src/app/shared/comcol/comcol.module.ts
index 36bfb5b43f..d72d390a50 100644
--- a/src/app/shared/comcol/comcol.module.ts
+++ b/src/app/shared/comcol/comcol.module.ts
@@ -14,6 +14,7 @@ import { EditComColPageComponent } from './comcol-forms/edit-comcol-page/edit-co
import { ComcolPageBrowseByComponent } from './comcol-page-browse-by/comcol-page-browse-by.component';
import { ThemedComcolPageBrowseByComponent } from './comcol-page-browse-by/themed-comcol-page-browse-by.component';
import { ComcolPageContentComponent } from './comcol-page-content/comcol-page-content.component';
+import { ThemedComcolPageContentComponent } from './comcol-page-content/themed-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';
@@ -23,6 +24,7 @@ import { ComcolSearchSectionComponent } from './sections/comcol-search-section/c
const COMPONENTS = [
ComcolPageContentComponent,
+ ThemedComcolPageContentComponent,
ComcolPageHandleComponent,
ComcolPageHeaderComponent,
ComcolPageLogoComponent,