mirror of
https://github.com/DSpace/dspace-angular.git
synced 2025-10-07 18:14:17 +00:00
Merge remote-tracking branch 'alex/w2p-100079_themed-feedback-form-component_contribute-7.2'
# Conflicts: # src/themes/custom/lazy-theme.module.ts
This commit is contained in:
@@ -0,0 +1,27 @@
|
|||||||
|
import { Component } from '@angular/core';
|
||||||
|
import { ThemedComponent } from '../../../shared/theme-support/themed.component';
|
||||||
|
import { FeedbackFormComponent } from './feedback-form.component';
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Themed wrapper for {@link FeedbackFormComponent}
|
||||||
|
*/
|
||||||
|
@Component({
|
||||||
|
selector: 'ds-themed-feedback-form',
|
||||||
|
styleUrls: [],
|
||||||
|
templateUrl: '../../../shared/theme-support/themed.component.html',
|
||||||
|
})
|
||||||
|
export class ThemedFeedbackFormComponent extends ThemedComponent<FeedbackFormComponent> {
|
||||||
|
|
||||||
|
protected getComponentName(): string {
|
||||||
|
return 'FeedbackFormComponent';
|
||||||
|
}
|
||||||
|
|
||||||
|
protected importThemedComponent(themeName: string): Promise<any> {
|
||||||
|
return import(`../../../../themes/${themeName}/app/info/feedback/feedback-form/feedback-form.component`);
|
||||||
|
}
|
||||||
|
|
||||||
|
protected importUnthemedComponent(): Promise<any> {
|
||||||
|
return import('./feedback-form.component');
|
||||||
|
}
|
||||||
|
|
||||||
|
}
|
@@ -1,3 +1,3 @@
|
|||||||
<div class="container">
|
<div class="container">
|
||||||
<ds-feedback-form></ds-feedback-form>
|
<ds-themed-feedback-form></ds-themed-feedback-form>
|
||||||
</div>
|
</div>
|
||||||
|
@@ -10,6 +10,7 @@ import { ThemedEndUserAgreementComponent } from './end-user-agreement/themed-end
|
|||||||
import { ThemedPrivacyComponent } from './privacy/themed-privacy.component';
|
import { ThemedPrivacyComponent } from './privacy/themed-privacy.component';
|
||||||
import { FeedbackComponent } from './feedback/feedback.component';
|
import { FeedbackComponent } from './feedback/feedback.component';
|
||||||
import { FeedbackFormComponent } from './feedback/feedback-form/feedback-form.component';
|
import { FeedbackFormComponent } from './feedback/feedback-form/feedback-form.component';
|
||||||
|
import { ThemedFeedbackFormComponent } from './feedback/feedback-form/themed-feedback-form.component';
|
||||||
import { ThemedFeedbackComponent } from './feedback/themed-feedback.component';
|
import { ThemedFeedbackComponent } from './feedback/themed-feedback.component';
|
||||||
import { FeedbackGuard } from '../core/feedback/feedback.guard';
|
import { FeedbackGuard } from '../core/feedback/feedback.guard';
|
||||||
|
|
||||||
@@ -23,6 +24,7 @@ const DECLARATIONS = [
|
|||||||
ThemedPrivacyComponent,
|
ThemedPrivacyComponent,
|
||||||
FeedbackComponent,
|
FeedbackComponent,
|
||||||
FeedbackFormComponent,
|
FeedbackFormComponent,
|
||||||
|
ThemedFeedbackFormComponent,
|
||||||
ThemedFeedbackComponent
|
ThemedFeedbackComponent
|
||||||
];
|
];
|
||||||
|
|
||||||
|
@@ -0,0 +1,14 @@
|
|||||||
|
import { Component } from '@angular/core';
|
||||||
|
import {
|
||||||
|
FeedbackFormComponent as BaseComponent
|
||||||
|
} from '../../../../../../app/info/feedback/feedback-form/feedback-form.component';
|
||||||
|
|
||||||
|
@Component({
|
||||||
|
selector: 'ds-feedback-form',
|
||||||
|
// templateUrl: './feedback-form.component.html',
|
||||||
|
templateUrl: '../../../../../../app/info/feedback/feedback-form/feedback-form.component.html',
|
||||||
|
// styleUrls: ['./feedback-form.component.scss'],
|
||||||
|
styleUrls: ['../../../../../../app/info/feedback/feedback-form/feedback-form.component.scss'],
|
||||||
|
})
|
||||||
|
export class FeedbackFormComponent extends BaseComponent {
|
||||||
|
}
|
@@ -133,6 +133,7 @@ import {
|
|||||||
import { MetadataRepresentationListComponent } from './app/item-page/simple/metadata-representation-list/metadata-representation-list.component';
|
import { MetadataRepresentationListComponent } from './app/item-page/simple/metadata-representation-list/metadata-representation-list.component';
|
||||||
import { DsDynamicLookupRelationSearchTabComponent } from './app/shared/form/builder/ds-dynamic-form-ui/relation-lookup-modal/search-tab/dynamic-lookup-relation-search-tab.component';
|
import { DsDynamicLookupRelationSearchTabComponent } from './app/shared/form/builder/ds-dynamic-form-ui/relation-lookup-modal/search-tab/dynamic-lookup-relation-search-tab.component';
|
||||||
import { DsDynamicLookupRelationExternalSourceTabComponent } from './app/shared/form/builder/ds-dynamic-form-ui/relation-lookup-modal/external-source-tab/dynamic-lookup-relation-external-source-tab.component';
|
import { DsDynamicLookupRelationExternalSourceTabComponent } from './app/shared/form/builder/ds-dynamic-form-ui/relation-lookup-modal/external-source-tab/dynamic-lookup-relation-external-source-tab.component';
|
||||||
|
import { FeedbackFormComponent } from './app/info/feedback/feedback-form/feedback-form.component';
|
||||||
|
|
||||||
const DECLARATIONS = [
|
const DECLARATIONS = [
|
||||||
FileSectionComponent,
|
FileSectionComponent,
|
||||||
@@ -173,6 +174,7 @@ const DECLARATIONS = [
|
|||||||
WorkflowItemSendBackComponent,
|
WorkflowItemSendBackComponent,
|
||||||
BreadcrumbsComponent,
|
BreadcrumbsComponent,
|
||||||
FeedbackComponent,
|
FeedbackComponent,
|
||||||
|
FeedbackFormComponent,
|
||||||
CommunityListComponent,
|
CommunityListComponent,
|
||||||
ComcolPageHandleComponent,
|
ComcolPageHandleComponent,
|
||||||
AuthNavMenuComponent,
|
AuthNavMenuComponent,
|
||||||
|
Reference in New Issue
Block a user