From 7e58bfdc5f2e6b36cb4f0bfc9f97c8e90771313a Mon Sep 17 00:00:00 2001
From: Sofia Papacharalampous <spapacharalampous@cite.gr>
Date: Wed, 8 May 2024 16:55:08 +0300
Subject: [PATCH] changed tab-titles

---
 dmp-frontend/src/app/app-routing.module.ts    | 33 ++++++++++++-------
 ...description-template-editor.component.html |  1 +
 .../description-template-type.routing.ts      |  6 +++-
 ...iption-template-type-editor.component.html |  2 ++
 ...cription-template-type-editor.component.ts | 11 ++++++-
 .../dmp-blueprint-editor.component.html       |  1 +
 .../editor/language-editor.component.html     |  1 +
 .../editor/language-editor.component.ts       | 10 +++++-
 .../app/ui/admin/language/language.routing.ts |  8 +++--
 .../prefilling-source-editor.component.html   |  1 +
 .../prefilling-source-editor.component.ts     | 10 +++++-
 .../prefilling-source.routing.ts              |  8 +++--
 .../reference-type-editor.component.html      |  3 +-
 .../editor/reference-type-editor.component.ts | 12 +++++--
 .../reference-type/reference-type.routing.ts  |  8 +++--
 .../editor/reference-editor.component.html    |  1 +
 .../editor/reference-editor.component.ts      | 11 ++++++-
 .../ui/admin/reference/reference.routing.ts   | 14 ++++++--
 ...tenant-configuration-editor.component.html |  2 +-
 ...tenant-configuration-editor.component.scss |  3 +-
 dmp-frontend/src/assets/i18n/en.json          | 19 ++++++++++-
 .../notification-template-editor.component.ts | 10 +++++-
 .../notification-template.routing.ts          |  8 +++--
 23 files changed, 148 insertions(+), 35 deletions(-)

diff --git a/dmp-frontend/src/app/app-routing.module.ts b/dmp-frontend/src/app/app-routing.module.ts
index 928379264..41a93bf18 100644
--- a/dmp-frontend/src/app/app-routing.module.ts
+++ b/dmp-frontend/src/app/app-routing.module.ts
@@ -67,7 +67,8 @@ const appRoutes: Routes = [
 			},
 			...BreadcrumbService.generateRouteDataConfiguration({
 				title: 'BREADCRUMBS.DMP-BLUEPRINTS'
-			})
+			}),
+			title: 'GENERAL.TITLES.BLUEPRINTS'
 		}
 	},
 
@@ -90,7 +91,8 @@ const appRoutes: Routes = [
 			},
 			...BreadcrumbService.generateRouteDataConfiguration({
 				title: 'BREADCRUMBS.DESCRIPTION-TEMPLATES'
-			})
+			}),
+			title: 'GENERAL.TITLES.DESCRIPTION-TEMPLATES'
 		}
 	},
 	{
@@ -102,7 +104,8 @@ const appRoutes: Routes = [
 			},
 			...BreadcrumbService.generateRouteDataConfiguration({
 				title: 'BREADCRUMBS.DESCRIPTION-TEMPLATE-TYPES'
-			})
+			}),
+			title: 'GENERAL.TITLES.DESCRIPTION-TEMPLATE-TYPES'
 		},
 	},
 	{
@@ -212,7 +215,8 @@ const appRoutes: Routes = [
 			},
 			...BreadcrumbService.generateRouteDataConfiguration({
 				title: 'BREADCRUMBS.LANGUAGES'
-			})
+			}),
+			title: 'GENERAL.TITLES.LANGUAGES'
 		},
 	},
 	{
@@ -236,7 +240,8 @@ const appRoutes: Routes = [
 			},
 			...BreadcrumbService.generateRouteDataConfiguration({
 				title: 'BREADCRUMBS.REFERENCES'
-			})
+			}),
+			title: 'GENERAL.TITLES.REFERENCES'
 		},
 	},
 	{
@@ -248,7 +253,8 @@ const appRoutes: Routes = [
 			},
 			...BreadcrumbService.generateRouteDataConfiguration({
 				title: 'BREADCRUMBS.REFERENCE-TYPES'
-			})
+			}),
+			title: 'GENERAL.TITLES.REFERENCE-TYPES'
 		},
 	},
 	{
@@ -260,7 +266,8 @@ const appRoutes: Routes = [
 			},
 			...BreadcrumbService.generateRouteDataConfiguration({
 				title: 'BREADCRUMBS.PREFILLING-SOURCES'
-			})
+			}),
+			title: 'GENERAL.TITLES.PREFILLING-SOURCES'
 		},
 	},
 	{
@@ -284,7 +291,8 @@ const appRoutes: Routes = [
 			},
 			...BreadcrumbService.generateRouteDataConfiguration({
 				title: 'BREADCRUMBS.TENANT-CONFIGURATION'
-			})
+			}),
+			title: 'GENERAL.TITLES.TENANT-CONFIGURATION'
 		},
 	},
 	{
@@ -296,7 +304,8 @@ const appRoutes: Routes = [
 			},
 			...BreadcrumbService.generateRouteDataConfiguration({
 				title: 'BREADCRUMBS.NOTIFICATIONS'
-			})
+			}),
+			title: 'GENERAL.TITLES.NOTIFICATIONS'
 		},
 	},
 	{
@@ -308,7 +317,8 @@ const appRoutes: Routes = [
 			},
 			...BreadcrumbService.generateRouteDataConfiguration({
 				title: 'BREADCRUMBS.NOTIFICATION-TEMPLATES'
-			})
+			}),
+			title: 'GENERAL.TITLES.NOTIFICATION-TEMPLATES'
 		},
 	},
 	{
@@ -332,7 +342,8 @@ const appRoutes: Routes = [
 			},
 			...BreadcrumbService.generateRouteDataConfiguration({
 				title: 'BREADCRUMBS.ENTITY-LOCKS'
-			})
+			}),
+			title: 'GENERAL.TITLES.ENTITY-LOCKS'
 		},
 	},
 	{
diff --git a/dmp-frontend/src/app/ui/admin/description-template/editor/description-template-editor.component.html b/dmp-frontend/src/app/ui/admin/description-template/editor/description-template-editor.component.html
index 8e6fde3c0..54cceb530 100644
--- a/dmp-frontend/src/app/ui/admin/description-template/editor/description-template-editor.component.html
+++ b/dmp-frontend/src/app/ui/admin/description-template/editor/description-template-editor.component.html
@@ -15,6 +15,7 @@
 					</h3>
 
 					<h3 *ngIf="!isNew">{{formGroup.get('label').value}}</h3>
+					<app-navigation-breadcrumb />
 				</div>
 				<ng-container *ngTemplateOutlet="actions"></ng-container>
 			</div>
diff --git a/dmp-frontend/src/app/ui/admin/description-types/description-template-type.routing.ts b/dmp-frontend/src/app/ui/admin/description-types/description-template-type.routing.ts
index 5c8ba058d..879b9de61 100644
--- a/dmp-frontend/src/app/ui/admin/description-types/description-template-type.routing.ts
+++ b/dmp-frontend/src/app/ui/admin/description-types/description-template-type.routing.ts
@@ -23,7 +23,9 @@ const routes: Routes = [
 			},
 			...BreadcrumbService.generateRouteDataConfiguration({
 				title: 'BREADCRUMBS.NEW-DESCRIPTION-TEMPLATE-TYPE'
-			})
+			}),
+			getFromTitleService: true,
+			usePrefix: false
 		},
 		component: DescriptionTemplateTypeEditorComponent,
 		canDeactivate: [PendingChangesGuard],
@@ -40,6 +42,8 @@ const routes: Routes = [
 			...BreadcrumbService.generateRouteDataConfiguration({
 				title: 'BREADCRUMBS.EDIT-DESCRIPTION-TEMPLATE-TYPE'
 			}),
+			getFromTitleService: true,
+			usePrefix: false,
 			authContext: {
 				permissions: [AppPermission.EditDescriptionTemplateType]
 			}
diff --git a/dmp-frontend/src/app/ui/admin/description-types/editor/description-template-type-editor.component.html b/dmp-frontend/src/app/ui/admin/description-types/editor/description-template-type-editor.component.html
index 404a057da..f324b5d24 100644
--- a/dmp-frontend/src/app/ui/admin/description-types/editor/description-template-type-editor.component.html
+++ b/dmp-frontend/src/app/ui/admin/description-types/editor/description-template-type-editor.component.html
@@ -4,6 +4,8 @@
 
 			<div class="row justify-content-between align-items-center mb-4 mt-4">
 				<div class="col">
+					<h3 *ngIf="isNew">{{'DESCRIPTION-TEMPLATE-TYPE-EDITOR.NEW' | translate}}</h3>
+					<h3 *ngIf="!isNew">{{formGroup?.get('name')?.value}}</h3>
 					<app-navigation-breadcrumb />
 				</div>
 
diff --git a/dmp-frontend/src/app/ui/admin/description-types/editor/description-template-type-editor.component.ts b/dmp-frontend/src/app/ui/admin/description-types/editor/description-template-type-editor.component.ts
index 71ca5adbe..263030156 100644
--- a/dmp-frontend/src/app/ui/admin/description-types/editor/description-template-type-editor.component.ts
+++ b/dmp-frontend/src/app/ui/admin/description-types/editor/description-template-type-editor.component.ts
@@ -27,6 +27,7 @@ import { ConfigurationService } from '@app/core/services/configuration/configura
 import { LockService } from '@app/core/services/lock/lock.service';
 import { FormValidationErrorsDialogComponent } from '@common/forms/form-validation-errors-dialog/form-validation-errors-dialog.component';
 import { DescriptionTemplateTypeStatus } from '@app/core/common/enum/description-template-type-status';
+import { Title } from '@angular/platform-browser';
 
 @Component({
 	templateUrl: './description-template-type-editor.component.html',
@@ -78,8 +79,16 @@ export class DescriptionTemplateTypeEditorComponent extends BaseEditor<Descripti
 		public enumUtils: EnumUtils,
 		private descriptionTemplateTypeService: DescriptionTemplateTypeService,
 		private logger: LoggingService,
-		private descriptionTemplateTypeEditorService: DescriptionTemplateTypeEditorService
+		private descriptionTemplateTypeEditorService: DescriptionTemplateTypeEditorService,
+		public titleService: Title
 	) {
+		
+		const descriptionLabel:string = route.snapshot.data['entity']?.name;
+		if (descriptionLabel) {
+			titleService.setTitle(descriptionLabel);
+		} else {
+			titleService.setTitle('DESCRIPTION-TEMPLATE-TYPE-EDITOR.TITLE-EDIT-DESCRIPTION-TEMPLATE-TYPE');
+		}
 		super(dialog, language, formService, router, uiNotificationService, httpErrorHandlingService, filterService, datePipe, route, queryParamsService, lockService, authService, configurationService);
 	}
 
diff --git a/dmp-frontend/src/app/ui/admin/dmp-blueprint/editor/dmp-blueprint-editor.component.html b/dmp-frontend/src/app/ui/admin/dmp-blueprint/editor/dmp-blueprint-editor.component.html
index 5188bbdc6..356d8d57a 100644
--- a/dmp-frontend/src/app/ui/admin/dmp-blueprint/editor/dmp-blueprint-editor.component.html
+++ b/dmp-frontend/src/app/ui/admin/dmp-blueprint/editor/dmp-blueprint-editor.component.html
@@ -13,6 +13,7 @@
 						<span>{{'DMP-BLUEPRINT-EDITOR.TITLE.NEW-VERSION' | translate}}</span>
 						{{formGroup.get('label').value}}
 					</h3>
+					<app-navigation-breadcrumb />					
 				</div>
 				<div class="col-md-auto mb-md-0 col-12 mb-2" *ngIf="!isNew && !isClone && !isNewVersion && this.editorModel.belongsToCurrentTenant != false">
 					<button [disabled]="isLocked" mat-button class="action-btn" type="button" (click)="delete()">
diff --git a/dmp-frontend/src/app/ui/admin/language/editor/language-editor.component.html b/dmp-frontend/src/app/ui/admin/language/editor/language-editor.component.html
index f95e3f4ea..bd04c3369 100644
--- a/dmp-frontend/src/app/ui/admin/language/editor/language-editor.component.html
+++ b/dmp-frontend/src/app/ui/admin/language/editor/language-editor.component.html
@@ -4,6 +4,7 @@
 			<div class="row align-items-center mt-4 mb-4" *ngIf="formGroup">
 				<div class="col">
 					<h3 *ngIf="isNew && !isClone">{{'LANGUAGE-EDITOR.NEW' | translate}}</h3>
+					<h3 *ngIf="!isNew">{{ formGroup.get('code')?.value }}</h3>
 					<app-navigation-breadcrumb />
 				</div>
 				<div class="col-auto">
diff --git a/dmp-frontend/src/app/ui/admin/language/editor/language-editor.component.ts b/dmp-frontend/src/app/ui/admin/language/editor/language-editor.component.ts
index 10afbf9b6..5bd7fe4f9 100644
--- a/dmp-frontend/src/app/ui/admin/language/editor/language-editor.component.ts
+++ b/dmp-frontend/src/app/ui/admin/language/editor/language-editor.component.ts
@@ -31,6 +31,7 @@ import { LanguageHttpService } from '@app/core/services/language/language.http.s
 import { MatCheckboxChange } from '@angular/material/checkbox';
 import { ConfigurationService } from '@app/core/services/configuration/configuration.service';
 import { LockService } from '@app/core/services/lock/lock.service';
+import { Title } from '@angular/platform-browser';
 
 
 @Component({
@@ -86,8 +87,15 @@ export class LanguageEditorComponent extends BaseEditor<LanguageEditorModel, Lan
 		private logger: LoggingService,
 		private languageEditorService: LanguageEditorService,
 		private fileUtils: FileUtils,
-		private matomoService: MatomoService
+		private matomoService: MatomoService,
+		private titleService: Title
 	) {
+		const descriptionLabel:string = route.snapshot.data['entity']?.code;
+		if (descriptionLabel) {
+			titleService.setTitle(descriptionLabel);
+		} else {
+			titleService.setTitle('LANGUAGE-EDITOR.TITLE-EDIT-LANGUAGE');
+		}
 		super(dialog, language, formService, router, uiNotificationService, httpErrorHandlingService, filterService, datePipe, route, queryParamsService, lockService, authService, configurationService);
 	}
 
diff --git a/dmp-frontend/src/app/ui/admin/language/language.routing.ts b/dmp-frontend/src/app/ui/admin/language/language.routing.ts
index 1e138b019..a17f6031d 100644
--- a/dmp-frontend/src/app/ui/admin/language/language.routing.ts
+++ b/dmp-frontend/src/app/ui/admin/language/language.routing.ts
@@ -25,7 +25,9 @@ const routes: Routes = [
 			},
 			...BreadcrumbService.generateRouteDataConfiguration({
 				title: 'BREADCRUMBS.NEW-LANGUAGE'
-			})
+			}),
+			getFromTitleService: true,
+			usePrefix: false
 		}
 	},
 	{
@@ -42,7 +44,9 @@ const routes: Routes = [
 			}),
 			authContext: {
 				permissions: [AppPermission.EditLanguage]
-			}
+			},
+			getFromTitleService: true,
+			usePrefix: false
 		}
 
 	},
diff --git a/dmp-frontend/src/app/ui/admin/prefilling-source/editor/prefilling-source-editor.component.html b/dmp-frontend/src/app/ui/admin/prefilling-source/editor/prefilling-source-editor.component.html
index 8a059826a..a6811d483 100644
--- a/dmp-frontend/src/app/ui/admin/prefilling-source/editor/prefilling-source-editor.component.html
+++ b/dmp-frontend/src/app/ui/admin/prefilling-source/editor/prefilling-source-editor.component.html
@@ -5,6 +5,7 @@
 			<div class="row justify-content-between align-items-center mt-4 mb-4">
 				<div class="col">
 					<h3 *ngIf="isNew">{{'PREFILLING-SOURCE-EDITOR.NEW' | translate}}</h3>
+					<h3 *ngIf="!isNew">{{ formGroup.get('label')?.value }}</h3>
 					<app-navigation-breadcrumb />
 				</div>
 				<div class="col-auto">
diff --git a/dmp-frontend/src/app/ui/admin/prefilling-source/editor/prefilling-source-editor.component.ts b/dmp-frontend/src/app/ui/admin/prefilling-source/editor/prefilling-source-editor.component.ts
index 02f9a4557..b2dbbeeee 100644
--- a/dmp-frontend/src/app/ui/admin/prefilling-source/editor/prefilling-source-editor.component.ts
+++ b/dmp-frontend/src/app/ui/admin/prefilling-source/editor/prefilling-source-editor.component.ts
@@ -30,6 +30,7 @@ import { ResultFieldsMappingConfigurationEditorModel } from '@app/ui/external-fe
 import { MatCheckboxChange } from '@angular/material/checkbox';
 import { ConfigurationService } from '@app/core/services/configuration/configuration.service';
 import { LockService } from '@app/core/services/lock/lock.service';
+import { Title } from '@angular/platform-browser';
 
 @Component({
 	selector: 'app-prefilling-source-editor-component',
@@ -76,8 +77,15 @@ export class PrefillingSourceEditorComponent extends BaseEditor<PrefillingSource
 		private prefillingSourceService: PrefillingSourceService,
 		private logger: LoggingService,
 		private prefillingSourceEditorService: PrefillingSourceEditorService,
-		private matomoService: MatomoService
+		private matomoService: MatomoService,
+		private titleService: Title
 	) {
+		const descriptionLabel:string = route.snapshot.data['entity']?.label;
+		if (descriptionLabel) {
+			titleService.setTitle(descriptionLabel);
+		} else {
+			titleService.setTitle('PREFILLING-SOURCE-EDITOR.TITLE-EDIT-PREFILLING-SOURCE');
+		}
 		super(dialog, language, formService, router, uiNotificationService, httpErrorHandlingService, filterService, datePipe, route, queryParamsService, lockService, authService, configurationService);
 	}
 
diff --git a/dmp-frontend/src/app/ui/admin/prefilling-source/prefilling-source.routing.ts b/dmp-frontend/src/app/ui/admin/prefilling-source/prefilling-source.routing.ts
index 4eedc48fe..0a22d62b3 100644
--- a/dmp-frontend/src/app/ui/admin/prefilling-source/prefilling-source.routing.ts
+++ b/dmp-frontend/src/app/ui/admin/prefilling-source/prefilling-source.routing.ts
@@ -26,7 +26,9 @@ const routes: Routes = [
 			},
 			...BreadcrumbService.generateRouteDataConfiguration({
 				title: 'BREADCRUMBS.NEW-PREFILLING-SOURCE'
-			})
+			}),
+			getFromTitleService: true,
+			usePrefix: false
 		}
 	},
 	{
@@ -43,7 +45,9 @@ const routes: Routes = [
 			}),
 			authContext: {
 				permissions: [AppPermission.EditPrefillingSource]
-			}
+			},
+			getFromTitleService: true,
+			usePrefix: false
 		}
 
 	},
diff --git a/dmp-frontend/src/app/ui/admin/reference-type/editor/reference-type-editor.component.html b/dmp-frontend/src/app/ui/admin/reference-type/editor/reference-type-editor.component.html
index 2b6bffbd9..c6f501d52 100644
--- a/dmp-frontend/src/app/ui/admin/reference-type/editor/reference-type-editor.component.html
+++ b/dmp-frontend/src/app/ui/admin/reference-type/editor/reference-type-editor.component.html
@@ -1,9 +1,10 @@
 <div class="container-fluid">
 	<div class="row reference-type-editor">
 		<div class="col-md-10 offset-md-1 colums-gapped">
-			<div class="row justify-content-between align-items-center">
+			<div class="row align-items-center mt-4 mb-4">
 				<div class="col-md col-12">
 					<h3 *ngIf="isNew">{{'REFERENCE-TYPE-EDITOR.NEW' | translate}}</h3>
+					<h3 *ngIf="!isNew">{{ formGroup?.get('name')?.value }}</h3>
 					<app-navigation-breadcrumb />
 				</div>
 
diff --git a/dmp-frontend/src/app/ui/admin/reference-type/editor/reference-type-editor.component.ts b/dmp-frontend/src/app/ui/admin/reference-type/editor/reference-type-editor.component.ts
index 0c3b13f5e..33c8d657e 100644
--- a/dmp-frontend/src/app/ui/admin/reference-type/editor/reference-type-editor.component.ts
+++ b/dmp-frontend/src/app/ui/admin/reference-type/editor/reference-type-editor.component.ts
@@ -30,6 +30,7 @@ import { ReferenceTypeEditorResolver } from './reference-type-editor.resolver';
 import { ReferenceTypeEditorService } from './reference-type-editor.service';
 import { ConfigurationService } from '@app/core/services/configuration/configuration.service';
 import { LockService } from '@app/core/services/lock/lock.service';
+import { Title } from '@angular/platform-browser';
 
 
 @Component({
@@ -88,8 +89,15 @@ export class ReferenceTypeEditorComponent extends BaseEditor<ReferenceTypeEditor
 		public enumUtils: EnumUtils,
 		public referenceTypeService: ReferenceTypeService,
 		private logger: LoggingService,
-		private referenceTypeEditorService: ReferenceTypeEditorService
-	) {
+		private referenceTypeEditorService: ReferenceTypeEditorService,
+		private titleService: Title
+	) {	
+		const descriptionLabel:string = route.snapshot.data['entity']?.name;
+		if (descriptionLabel) {
+			titleService.setTitle(descriptionLabel);
+		} else {
+			titleService.setTitle('REFERENCE-TYPE-EDITOR.TITLE-EDIT-REFERENCE-TYPE');
+		}
 		super(dialog, language, formService, router, uiNotificationService, httpErrorHandlingService, filterService, datePipe, route, queryParamsService, lockService, authService, configurationService);
 	}
 
diff --git a/dmp-frontend/src/app/ui/admin/reference-type/reference-type.routing.ts b/dmp-frontend/src/app/ui/admin/reference-type/reference-type.routing.ts
index c467a3596..8b13bdf31 100644
--- a/dmp-frontend/src/app/ui/admin/reference-type/reference-type.routing.ts
+++ b/dmp-frontend/src/app/ui/admin/reference-type/reference-type.routing.ts
@@ -27,7 +27,9 @@ const routes: Routes = [
 				},
 				...BreadcrumbService.generateRouteDataConfiguration({
 					title: 'BREADCRUMBS.NEW-REFERENCE-TYPE'
-				})
+				}),
+				getFromTitleService: true,
+				usePrefix: false
 			}
 	},
  	{
@@ -44,7 +46,9 @@ const routes: Routes = [
 			}),
 			authContext: {
 				permissions: [AppPermission.EditReferenceType]
-			}
+			},
+			getFromTitleService: true,
+			usePrefix: false
 		}
 
 	},
diff --git a/dmp-frontend/src/app/ui/admin/reference/editor/reference-editor.component.html b/dmp-frontend/src/app/ui/admin/reference/editor/reference-editor.component.html
index dc36864f5..77c42be33 100644
--- a/dmp-frontend/src/app/ui/admin/reference/editor/reference-editor.component.html
+++ b/dmp-frontend/src/app/ui/admin/reference/editor/reference-editor.component.html
@@ -4,6 +4,7 @@
 			<div class="row align-items-center mt-4 mb-4" *ngIf="formGroup">
 				<div class="col-md col-12">
 					<h3 *ngIf="isNew && !isClone">{{'REFERENCE-EDITOR.NEW' | translate}}</h3>
+					<h3 *ngIf="!isNew">{{ formGroup.get('label').value }}</h3>
 					<app-navigation-breadcrumb />
 				</div>
 				<div class="col-auto">
diff --git a/dmp-frontend/src/app/ui/admin/reference/editor/reference-editor.component.ts b/dmp-frontend/src/app/ui/admin/reference/editor/reference-editor.component.ts
index fd151de11..ecb703132 100644
--- a/dmp-frontend/src/app/ui/admin/reference/editor/reference-editor.component.ts
+++ b/dmp-frontend/src/app/ui/admin/reference/editor/reference-editor.component.ts
@@ -32,6 +32,7 @@ import { ReferenceEditorResolver } from './reference-editor.resolver';
 import { ReferenceEditorService } from './reference-editor.service';
 import { LockService } from '@app/core/services/lock/lock.service';
 import { ConfigurationService } from '@app/core/services/configuration/configuration.service';
+import { Title } from '@angular/platform-browser';
 
 
 @Component({
@@ -88,8 +89,16 @@ export class ReferenceEditorComponent extends BaseEditor<ReferenceEditorModel, R
 		private referenceEditorService: ReferenceEditorService,
 		private fileUtils: FileUtils,
 		private matomoService: MatomoService,
-		public referenceTypeService: ReferenceTypeService
+		public referenceTypeService: ReferenceTypeService,
+		public titleService: Title
 	) {
+		
+		const descriptionLabel:string = route.snapshot.data['entity']?.label;
+		if (descriptionLabel) {
+			titleService.setTitle(descriptionLabel);
+		} else {
+			titleService.setTitle('REFERENCE-EDITOR.TITLE-EDIT-REFERENCE');
+		}
 		super(dialog, language, formService, router, uiNotificationService, httpErrorHandlingService, filterService, datePipe, route, queryParamsService, lockService, authService, configurationService);
 	}
 
diff --git a/dmp-frontend/src/app/ui/admin/reference/reference.routing.ts b/dmp-frontend/src/app/ui/admin/reference/reference.routing.ts
index 32fef48fe..357e6b33c 100644
--- a/dmp-frontend/src/app/ui/admin/reference/reference.routing.ts
+++ b/dmp-frontend/src/app/ui/admin/reference/reference.routing.ts
@@ -13,7 +13,10 @@ const routes: Routes = [
 	{
 		path: '',
 		component: ReferenceListingComponent,
-		canActivate: [AuthGuard]
+		canActivate: [AuthGuard],
+		data: {
+			breadcrumb: true
+		}
 	},
 	{
 		path: 'new',
@@ -26,7 +29,9 @@ const routes: Routes = [
 			},
 			...BreadcrumbService.generateRouteDataConfiguration({
 				title: 'BREADCRUMBS.NEW-REFERENCE'
-			})
+			}),
+			getFromTitleService: true,
+			usePrefix: false
 		}
 	},
 	{
@@ -38,12 +43,15 @@ const routes: Routes = [
 			'entity': ReferenceEditorResolver
 		},
 		data: {
+			breadcrumb: true,
 			...BreadcrumbService.generateRouteDataConfiguration({
 				title: 'BREADCRUMBS.EDIT-REFERENCE'
 			}),
 			authContext: {
 				permissions: [AppPermission.EditReference]
-			}
+			},
+			getFromTitleService: true,
+			usePrefix: false
 		}
 
 	},
diff --git a/dmp-frontend/src/app/ui/admin/tenant-configuration/editor/tenant-configuration-editor.component.html b/dmp-frontend/src/app/ui/admin/tenant-configuration/editor/tenant-configuration-editor.component.html
index 0bcc1e28e..f5cc7f30b 100644
--- a/dmp-frontend/src/app/ui/admin/tenant-configuration/editor/tenant-configuration-editor.component.html
+++ b/dmp-frontend/src/app/ui/admin/tenant-configuration/editor/tenant-configuration-editor.component.html
@@ -1,6 +1,6 @@
 <div class="container-fluid">
 	<div class="row">
-		<div class="col-md-10 offset-md-1 tenant-configuration-component">
+		<div class="col-md-10 offset-md-1">
 			<div class="row align-items-center mb-4 mt-4" >
 				<div class="col-md col-12">
 					<h3>{{'TENANT-CONFIGURATION-EDITOR.TITLE' | translate}}</h3>
diff --git a/dmp-frontend/src/app/ui/admin/tenant-configuration/editor/tenant-configuration-editor.component.scss b/dmp-frontend/src/app/ui/admin/tenant-configuration/editor/tenant-configuration-editor.component.scss
index 552facec6..ff55f8558 100644
--- a/dmp-frontend/src/app/ui/admin/tenant-configuration/editor/tenant-configuration-editor.component.scss
+++ b/dmp-frontend/src/app/ui/admin/tenant-configuration/editor/tenant-configuration-editor.component.scss
@@ -1,6 +1,5 @@
 .tenant-configuration-component {
-	padding-top: 1em;
-
+	
 	.configuration-container {
 		margin-top: 2em;
 	}
diff --git a/dmp-frontend/src/assets/i18n/en.json b/dmp-frontend/src/assets/i18n/en.json
index 48b90a413..7343e758c 100644
--- a/dmp-frontend/src/assets/i18n/en.json
+++ b/dmp-frontend/src/assets/i18n/en.json
@@ -90,6 +90,17 @@
 			"PLANS": "My Plans",
 			"EXPLORE-PLANS": "Published Plans",
 			"DESCRIPTIONS": "My Descriptions",
+			"BLUEPRINTS": "Blueprints",
+			"DESCRIPTION-TEMPLATES": "Description Templates",
+			"DESCRIPTION-TEMPLATE-TYPES": "Description Types",
+			"ENTITY-LOCKS": "Entity Locks",
+			"REFERENCES": "References",
+			"LANGUAGES": "Languages",
+			"REFERENCE-TYPES": "Reference Types",
+			"PREFILLING-SOURCES": "Prefilling Sources",
+			"TENANT-CONFIGURATION": "Tenant Configuration",
+			"NOTIFICATIONS": "Notifications",
+			"NOTIFICATION-TEMPLATES": "Notification Templates",
 			"EXPLORE": "Published Descriptions",
 			"USERS": "Users",
 			"PROFILE": "My Profile",
@@ -368,7 +379,7 @@
 			"NEW-PROFILE-VERSION": "New Version Of ",
 			"NEW-PROFILE-CLONE": "New Clone Of "
 		},
-		"TITLE-EDIT-DESCRIPTION-TEMPLATE": "Edit Description Template",
+		"TITLE-EDIT-DESCRIPTION-TEMPLATE": "Editing Description Template",
 		"FIELDS": {
 			"DATASET-TITLE": "Description Template Name",
 			"DATASET-DESCRIPTION": "Description"
@@ -1063,6 +1074,7 @@
 	},
 	"LANGUAGE-EDITOR": {
 		"NEW": "New Language",
+		"TITLE-EDIT-LANGUAGE": "Editing Language",
 		"FIELDS": {
 			"CODE": "Code",
 			"PAYLOAD": "Payload",
@@ -1131,6 +1143,7 @@
 		},
 		"NOTIFICATION-TEMPLATE-EDITOR": {
 			"NEW": "New Notification Template",
+			"TITLE-EDIT-NOTIFICATION-TEMPLATE": "Editing Notification Template", 
 			"FIELDS": {
 				"NOTIFICATION-TYPE": "Notification Type",
 				"LANGUAGE": "Language",
@@ -1244,6 +1257,7 @@
 	},
 	"DESCRIPTION-TEMPLATE-TYPE-EDITOR": {
 		"NEW": "New Description Type",
+		"TITLE-EDIT-DESCRIPTION-TEMPLATE-TYPE": "Editing Description Template Type",
 		"FIELDS": {
 			"NAME": "Name"
 		},
@@ -1264,6 +1278,7 @@
 	},
 	"REFERENCE-TYPE-EDITOR": {
 		"NEW": "New Reference Type",
+		"TITLE-EDIT-REFERENCE-TYPE": "Editing Reference Type",
 		"SOURCES-REQUIRED": "Required",
 		"FIELDS": {
 			"SOURCE-CONFIGURATION": "Source Configuration",
@@ -1361,6 +1376,7 @@
 	},
 	"PREFILLING-SOURCE-EDITOR": {
 		"NEW": "New Prefilling Source",
+		"TITLE-EDIT-PREFILLING-SOURCE": "Editing Prefilling Source",
 		"FIELDS": {
 			"FIXED-VALUE-FIELDS": "Fixed Value Fields",
 			"FIELDS": "API Fields",
@@ -1386,6 +1402,7 @@
 	},
 	"REFERENCE-EDITOR": {
 		"NEW": "New Reference",
+		"TITLE-EDIT-REFERENCE": "Editing Reference",
 		"FIELDS": {
 			"LABEL": "Label",
 			"TYPE": "Type",
diff --git a/dmp-frontend/src/notification-service/ui/admin/notification-template/editor/notification-template-editor.component.ts b/dmp-frontend/src/notification-service/ui/admin/notification-template/editor/notification-template-editor.component.ts
index 306bbe72a..fd2943a11 100644
--- a/dmp-frontend/src/notification-service/ui/admin/notification-template/editor/notification-template-editor.component.ts
+++ b/dmp-frontend/src/notification-service/ui/admin/notification-template/editor/notification-template-editor.component.ts
@@ -36,6 +36,7 @@ import { NotificationTemplateKind } from '@notification-service/core/enum/notifi
 import { NotificationType } from '@notification-service/core/enum/notification-type.enum';
 import { EmailOverrideMode } from '@notification-service/core/enum/email-override-mode';
 import { NotificationDataType } from '@notification-service/core/enum/notification-data-type';
+import { Title } from '@angular/platform-browser';
 
 @Component({
 	selector: 'app-notification-template-editor',
@@ -98,8 +99,15 @@ export class NotificationTemplateEditorComponent extends BaseEditor<Notification
 		private notificationTemplateService: NotificationTemplateService,
 		private notificationTemplateEditorService: NotificationTemplateEditorService,
 		private logger: LoggingService,
-		private matomoService: MatomoService
+		private matomoService: MatomoService,
+		private titleService: Title
 	) {
+		const descriptionLabel:string = route.snapshot.data['entity']?.notificationType;
+		if (descriptionLabel) {
+			titleService.setTitle(descriptionLabel);
+		} else {
+			titleService.setTitle('NOTIFICATION-SERVICE.NOTIFICATION-TEMPLATE-EDITOR.TITLE-EDIT-NOTIFICATION-TEMPLATE');
+		}
 		super(dialog, language, formService, router, uiNotificationService, httpErrorHandlingService, filterService, datePipe, route, queryParamsService, lockService, authService, configurationService);
 	}
 
diff --git a/dmp-frontend/src/notification-service/ui/admin/notification-template/notification-template.routing.ts b/dmp-frontend/src/notification-service/ui/admin/notification-template/notification-template.routing.ts
index 5a0e1bfd6..9c3fef1ec 100644
--- a/dmp-frontend/src/notification-service/ui/admin/notification-template/notification-template.routing.ts
+++ b/dmp-frontend/src/notification-service/ui/admin/notification-template/notification-template.routing.ts
@@ -26,7 +26,9 @@ const routes: Routes = [
 			},
 			...BreadcrumbService.generateRouteDataConfiguration({
 				title: 'BREADCRUMBS.NEW-TENANT'
-			})
+			}),
+			getFromTitleService: true,
+			usePrefix: false
 		}
 	},
 	{
@@ -43,7 +45,9 @@ const routes: Routes = [
 			}),
 			authContext: {
 				permissions: [AppPermission.EditNotificationTemplate]
-			}
+			},
+			getFromTitleService: true,
+			usePrefix: false
 		}
 
 	},