Merge remote-tracking branch 'alex/create-themable-comcolpage-content_contribute-7.4' into minor-themed-component-fixes_contribute-main

# Conflicts:
#	src/app/browse-by/browse-by-metadata-page/browse-by-metadata-page.component.html
#	src/app/collection-page/collection-page.component.html
#	src/app/community-page/community-page.component.html
#	src/app/shared/comcol/comcol.module.ts

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

@@ -22,16 +22,16 @@
                 [title]="'collection.page.handle'">
             </ds-themed-comcol-page-handle>
             <!-- Introductory text -->
-            <ds-comcol-page-content
+            <ds-themed-comcol-page-content
                 [content]="collection.introductoryText"
                 [hasInnerHtml]="true">
-            </ds-comcol-page-content>
+            </ds-themed-comcol-page-content>
             <!-- News -->
-            <ds-comcol-page-content
+            <ds-themed-comcol-page-content
                 [content]="collection.sidebarText"
                 [hasInnerHtml]="true"
                 [title]="'collection.page.news'">
-            </ds-comcol-page-content>
+            </ds-themed-comcol-page-content>
           </header>
           <ds-dso-edit-menu></ds-dso-edit-menu>
         </div>
@@ -46,10 +46,10 @@
         </section>
         <footer *ngIf="collection.copyrightText" class="border-top my-5 pt-4">
           <!-- Copyright -->
-          <ds-comcol-page-content
+          <ds-themed-comcol-page-content
               [content]="collection.copyrightText"
               [hasInnerHtml]="true">
-          </ds-comcol-page-content>
+          </ds-themed-comcol-page-content>
         </footer>
       </div>
     </div>

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

@@ -13,12 +13,12 @@
           <ds-themed-comcol-page-handle [content]="communityPayload.handle" [title]="'community.page.handle'">
           </ds-themed-comcol-page-handle>
           <!-- Introductory text -->
-          <ds-comcol-page-content [content]="communityPayload.introductoryText" [hasInnerHtml]="true">
+          <ds-themed-comcol-page-content [content]="communityPayload.introductoryText" [hasInnerHtml]="true">
-          </ds-comcol-page-content>
+          </ds-themed-comcol-page-content>
           <!-- News -->
-          <ds-comcol-page-content [content]="communityPayload.sidebarText" [hasInnerHtml]="true"
+          <ds-themed-comcol-page-content [content]="communityPayload.sidebarText" [hasInnerHtml]="true"
                                   [title]="'community.page.news'">
-          </ds-comcol-page-content>
+          </ds-themed-comcol-page-content>
         </header>
         <ds-dso-edit-menu></ds-dso-edit-menu>
       </div>
@@ -32,8 +32,8 @@
       </section>
       <footer *ngIf="communityPayload.copyrightText" class="border-top my-5 pt-4">
         <!-- Copyright -->
-        <ds-comcol-page-content [content]="communityPayload.copyrightText" [hasInnerHtml]="true">
+        <ds-themed-comcol-page-content [content]="communityPayload.copyrightText" [hasInnerHtml]="true">
-        </ds-comcol-page-content>
+        </ds-themed-comcol-page-content>
       </footer>
     </div>
   </div>

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;
 
 }

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<ComcolPageContentComponent> {
+
+  @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<any> {
+    return import(`../../../../themes/${themeName}/app/admin/admin-sidebar/admin-sidebar.component`);
+  }
+
+  protected importUnthemedComponent(): Promise<any> {
+    return import('./comcol-page-content.component');
+  }
+
+}

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,