diff --git a/dmp-frontend/src/app/ui/description/listing/description-listing.component.ts b/dmp-frontend/src/app/ui/description/listing/description-listing.component.ts index 3654a612d..8f9921174 100644 --- a/dmp-frontend/src/app/ui/description/listing/description-listing.component.ts +++ b/dmp-frontend/src/app/ui/description/listing/description-listing.component.ts @@ -157,10 +157,11 @@ export class DescriptionListingComponent extends BaseComponent implements OnInit isStepUnique: false }, { - selector: '.description-tour', + selector: '.dataset-tour', content: 'Step 2', orientation: Orientation.Right, - isStepUnique: false + isStepUnique: false, + useHighlightPadding: true } ] }; @@ -330,23 +331,24 @@ export class DescriptionListingComponent extends BaseComponent implements OnInit public restartTour(): void { this.setDashboardTourDmpText(); + console.log('lalala'); this.setDashboardTourDescriptionText(); + console.log(this.dashboardTour); this.guidedTourService.startTour(this.dashboardTour); } public setDashboardTourDmpText(): void { - this.dmpText = this.language.instant('DESCRIPTION-LISTING.TEXT-INFO') + '\n\n' + - this.language.instant('DESCRIPTION-LISTING.TEXT-INFO-QUESTION') + ' ' + - this.language.instant('DESCRIPTION-LISTING.LINK-ZENODO') + ' ' + - this.language.instant('DESCRIPTION-LISTING.GET-IDEA'); + this.dmpText = this.language.instant('DMP-LISTING.TEXT-INFO') + '\n\n' + + this.language.instant('DMP-LISTING.TEXT-INFO-QUESTION') + ' ' + + this.language.instant('DMP-LISTING.LINK-ZENODO') + ' ' + + this.language.instant('DMP-LISTING.GET-IDEA'); this.dashboardTour.steps[0].title = this.dmpText; } public setDashboardTourDescriptionText(): void { - this.descriptionText = this.language.instant('DESCRIPTION-LISTING.TEXT-INFO') + - this.language.instant('DESCRIPTION-LISTING.LINK-PUBLIC-DATASETS') + ' ' + - this.language.instant('DESCRIPTION-LISTING.TEXT-INFO-REST') + '\n\n' + - this.language.instant('DESCRIPTION-LISTING.TEXT-INFO-PAR'); + this.descriptionText = this.language.instant('DESCRIPTION-LISTING.TEXT-INFO') + '\n\n' + + this.language.instant('DESCRIPTION-LISTING.TEXT-INFO-QUESTION') + ' ' + + this.language.instant('DESCRIPTION-LISTING.GET-IDEA'); this.dashboardTour.steps[1].title = this.descriptionText; } diff --git a/dmp-frontend/src/app/ui/dmp/listing/dmp-listing.component.ts b/dmp-frontend/src/app/ui/dmp/listing/dmp-listing.component.ts index b488ce9da..50cfefde4 100644 --- a/dmp-frontend/src/app/ui/dmp/listing/dmp-listing.component.ts +++ b/dmp-frontend/src/app/ui/dmp/listing/dmp-listing.component.ts @@ -152,10 +152,9 @@ export class DmpListingComponent extends BaseComponent implements OnInit { //IBr this.language.instant('DMP-LISTING.LINK-ZENODO') + ' ' + this.language.instant('DMP-LISTING.GET-IDEA'); - this.dashboardTour.steps[1].title = this.language.instant('DATASET-LISTING.TEXT-INFO') + - this.language.instant('DATASET-LISTING.LINK-PUBLIC-DATASETS') + ' ' + - this.language.instant('DATASET-LISTING.TEXT-INFO-REST') + '\n\n' + - this.language.instant('DATASET-LISTING.TEXT-INFO-PAR'); + this.dashboardTour.steps[1].title = this.language.instant('DESCRIPTION-LISTING.TEXT-INFO') + '\n\n' + + this.language.instant('DESCRIPTION-LISTING.TEXT-INFO-QUESTION') + ' ' + + this.language.instant('DESCRIPTION-LISTING.GET-IDEA'); this.guidedTourService.startTour(this.dashboardTour); }); @@ -370,10 +369,9 @@ export class DmpListingComponent extends BaseComponent implements OnInit { //IBr } public setDashboardTourDatasetText(): void { - const datasetText = this.language.instant('DATASET-LISTING.TEXT-INFO') + - this.language.instant('DATASET-LISTING.LINK-PUBLIC-DATASETS') + ' ' + - this.language.instant('DATASET-LISTING.TEXT-INFO-REST') + '\n\n' + - this.language.instant('DATASET-LISTING.TEXT-INFO-PAR'); + const datasetText = this.language.instant('DESCRIPTION-LISTING.TEXT-INFO') + '\n\n' + + this.language.instant('DESCRIPTION-LISTING.TEXT-INFO-QUESTION') + ' ' + + this.language.instant('DESCRIPTION-LISTING.GET-IDEA'); this.dashboardTour.steps[1].title = datasetText; } diff --git a/dmp-frontend/src/assets/i18n/en.json b/dmp-frontend/src/assets/i18n/en.json index e61837759..1e8afabf7 100644 --- a/dmp-frontend/src/assets/i18n/en.json +++ b/dmp-frontend/src/assets/i18n/en.json @@ -668,6 +668,8 @@ "TEXT-INFO-REST": " for a look at Descriptions in {{ APP_NAME }} Plans", "LINK-PUBLIC-DATASETS": "Public Descriptions", "TEXT-INFO-PAR": "New Descriptions can be added to existing Plans at any time and be described with more than one template. Descriptions can also be cloned and re-used in other Plans as well as be deleted without negatively affecting the Plan as a whole.", + "TEXT-INFO-QUESTION": "New descriptions can be added to existing DMPs at any time and be described with more than one template. ", + "GET-IDEA": " Descriptions can also be cloned and re-used in other DMPs as well as be deleted without negatively affecting the DMP as a whole.", "DESCRIPTION": "Description", "GRANT": "Grant", "LOCKED": "Description is Locked by another user",