Skip to content

Commit c2c9d28

Browse files
Merge branch 'minor-themed-component-fixes_contribute-7.6' into minor-themed-component-fixes_contribute-main
# Conflicts: # src/themes/custom/app/shared/comcol-page-browse-by/comcol-page-browse-by.component.ts # src/themes/custom/app/shared/comcol-page-handle/comcol-page-handle.component.ts # src/themes/custom/lazy-theme.module.ts
2 parents a8f3194 + 8bf7e4f commit c2c9d28

17 files changed

Lines changed: 68 additions & 38 deletions

src/app/my-dspace-page/my-dspace-search.module.ts

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -61,6 +61,9 @@ const DECLARATIONS = [
6161
ResearchEntitiesModule.withEntryComponents(),
6262
JournalEntitiesModule.withEntryComponents(),
6363
],
64+
exports: [
65+
...DECLARATIONS,
66+
],
6467
declarations: [
6568
...DECLARATIONS,
6669
],

src/app/shared/comcol/comcol-page-browse-by/themed-comcol-page-browse-by.component.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ export class ThemedComcolPageBrowseByComponent extends ThemedComponent<ComcolPag
2828
}
2929

3030
protected importThemedComponent(themeName: string): Promise<any> {
31-
return import(`../../../../themes/${themeName}/app/shared/comcol-page-browse-by/comcol-page-browse-by.component`);
31+
return import(`../../../../themes/${themeName}/app/shared/comcol/comcol-page-browse-by/comcol-page-browse-by.component`);
3232
}
3333

3434
protected importUnthemedComponent(): Promise<any> {

src/themes/custom/app/shared/comcol-page-browse-by/comcol-page-browse-by.component.ts

Lines changed: 0 additions & 16 deletions
This file was deleted.

src/themes/custom/app/shared/comcol-page-handle/comcol-page-handle.component.ts

Lines changed: 0 additions & 19 deletions
This file was deleted.

src/themes/custom/app/shared/comcol-page-browse-by/comcol-page-browse-by.component.html renamed to src/themes/custom/app/shared/comcol/comcol-page-browse-by/comcol-page-browse-by.component.html

File renamed without changes.

src/themes/custom/app/shared/comcol-page-browse-by/comcol-page-browse-by.component.scss renamed to src/themes/custom/app/shared/comcol/comcol-page-browse-by/comcol-page-browse-by.component.scss

File renamed without changes.
Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
import { Component } from '@angular/core';
2+
3+
import { ComcolPageBrowseByComponent as BaseComponent } from '../../../../../../app/shared/comcol/comcol-page-browse-by/comcol-page-browse-by.component';
4+
5+
@Component({
6+
selector: 'ds-comcol-page-browse-by',
7+
// styleUrls: ['./comcol-page-browse-by.component.scss'],
8+
styleUrls: ['../../../../../../app/shared/comcol/comcol-page-browse-by/comcol-page-browse-by.component.scss'],
9+
// templateUrl: './comcol-page-browse-by.component.html'
10+
templateUrl: '../../../../../../app/shared/comcol/comcol-page-browse-by/comcol-page-browse-by.component.html',
11+
})
12+
export class ComcolPageBrowseByComponent extends BaseComponent {
13+
}

src/themes/custom/app/shared/comcol-page-handle/comcol-page-handle.component.html renamed to src/themes/custom/app/shared/comcol/comcol-page-handle/comcol-page-handle.component.html

File renamed without changes.

src/themes/custom/app/shared/comcol-page-handle/comcol-page-handle.component.scss renamed to src/themes/custom/app/shared/comcol/comcol-page-handle/comcol-page-handle.component.scss

File renamed without changes.
Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
import { Component } from '@angular/core';
2+
3+
import { ComcolPageHandleComponent as BaseComponent } from '../../../../../../app/shared/comcol/comcol-page-handle/comcol-page-handle.component';
4+
5+
@Component({
6+
selector: 'ds-comcol-page-handle',
7+
// templateUrl: './comcol-page-handle.component.html',
8+
templateUrl: '../../../../../../app/shared/comcol/comcol-page-handle/comcol-page-handle.component.html',
9+
// styleUrls: ['./comcol-page-handle.component.scss'],
10+
styleUrls: ['../../../../../../app/shared/comcol/comcol-page-handle/comcol-page-handle.component.scss'],
11+
})
12+
export class ComcolPageHandleComponent extends BaseComponent {
13+
}

0 commit comments

Comments
 (0)