hazza/dspace-angular
1
0
Fork 1
mirror of https://github.com/DSpace/dspace-angular.git synced 2025-10-07 10:04:11 +00:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source 
# 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
This commit is contained in:
Alexandre Vryghem
2024-03-09 14:35:09 +01:00
parent bb490f827b 106182d5fd
commit c23500b7fa
5 changed files with 66 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/app/collection-page/collection-page.component.html
View File

@@ -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>
@@ -58,4 +58,4 @@
<ds-themed-loading *ngIf="collectionRD?.isLoading"
message="{{'loading.collection' | translate}}"></ds-themed-loading>
</div>
</div>
</div>

12
src/app/community-page/community-page.component.html
View File

@@ -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-comcol-page-content>
<ds-themed-comcol-page-content [content]="communityPayload.introductoryText" [hasInnerHtml]="true">
</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-comcol-page-content>
<ds-themed-comcol-page-content [content]="communityPayload.copyrightText" [hasInnerHtml]="true">
</ds-themed-comcol-page-content>
</footer>
</div>
</div>

12
src/app/shared/comcol/comcol-page-content/comcol-page-content.component.ts
View File

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

42
src/app/shared/comcol/comcol-page-content/themed-comcol-page-content.component.ts Normal file
View File

@@ -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');
}
}

2
src/app/shared/comcol/comcol.module.ts
View File

@@ -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,