From 120aaaf4086e556f5bf56a012a7ce83829a73468 Mon Sep 17 00:00:00 2001
From: Alex ORLUC <alex.orluc@maarch.org>
Date: Thu, 3 Jan 2019 10:46:46 +0100
Subject: [PATCH] refactoring setHeader
---
src/frontend/app/about-us.component.ts | 2 +-
.../action/action-administration.component.ts | 4 ++--
.../action/actions-administration.component.ts | 2 +-
.../app/administration/administration.component.ts | 2 +-
.../basket/basket-administration.component.ts | 4 ++--
.../basket/baskets-administration.component.ts | 2 +-
.../contact/contacts-filling-administration.component.ts | 2 +-
.../contact/contacts-group-administration.component.ts | 4 ++--
.../contact/contacts-groups-administration.component.ts | 3 ++-
.../diffusionModel-administration.component.ts | 4 ++--
.../diffusionModels-administration.component.ts | 2 +-
.../docserver/docserver-administration.component.ts | 2 +-
.../docserver/docservers-administration.component.ts | 2 +-
.../doctype/doctypes-administration.component.ts | 2 +-
.../entity/entities-administration.component.ts | 2 +-
.../group/group-administration.component.ts | 4 ++--
.../group/groups-administration.component.ts | 2 +-
.../history/history-administration.component.ts | 2 +-
.../notification/notification-administration.component.ts | 4 ++--
.../notifications-administration.component.ts | 3 ++-
.../parameter/parameter-administration.component.ts | 4 ++--
.../parameter/parameters-administration.component.ts | 2 +-
.../priority/priority-administration.component.ts | 4 ++--
.../report/reports-administration.component.ts | 2 +-
.../security/securities-administration.component.ts | 2 +-
.../sendmail/sendmail-administration.component.ts | 2 +-
.../status/status-administration.component.ts | 4 ++--
.../status/statuses-administration.component.ts | 2 +-
.../template/template-administration.component.ts | 4 ++--
.../template/templates-administration.component.ts | 2 +-
.../update-status-administration.component.ts | 2 +-
.../administration/user/user-administration.component.ts | 4 ++--
.../administration/user/users-administration.component.ts | 2 +-
.../versions-update-administration.component.ts | 2 +-
src/frontend/app/home.component.ts | 2 +-
src/frontend/app/list/basket-list.component.ts | 3 +--
src/frontend/app/menu/main-header.component.html | 3 +--
src/frontend/app/profile.component.ts | 2 +-
src/frontend/app/save-numeric-package.component.ts | 2 +-
src/frontend/service/header.service.ts | 8 +++++++-
40 files changed, 59 insertions(+), 53 deletions(-)
diff --git a/src/frontend/app/about-us.component.ts b/src/frontend/app/about-us.component.ts
index 5de7435dcd3..ae348368713 100755
--- a/src/frontend/app/about-us.component.ts
+++ b/src/frontend/app/about-us.component.ts
@@ -39,7 +39,7 @@ export class AboutUsComponent implements OnInit {
}
ngOnInit(): void {
- this.headerService.headerMessage = this.lang.aboutUs;
+ this.headerService.setHeader(this.lang.aboutUs);
window['MainHeaderComponent'].setSnav(this.sidenavLeft);
window['MainHeaderComponent'].setSnavRight(null);
diff --git a/src/frontend/app/administration/action/action-administration.component.ts b/src/frontend/app/administration/action/action-administration.component.ts
index c7866d094c2..92f05e42dca 100755
--- a/src/frontend/app/administration/action/action-administration.component.ts
+++ b/src/frontend/app/administration/action/action-administration.component.ts
@@ -63,7 +63,7 @@ export class ActionAdministrationComponent implements OnInit {
this.actionPagesList = data.action_pagesList;
this.keywordsList = data.keywordsList;
- this.headerService.headerMessage = this.lang.actionCreation;
+ this.headerService.setHeader(this.lang.actionCreation);
this.loading = false;
});
}
@@ -81,7 +81,7 @@ export class ActionAdministrationComponent implements OnInit {
this.actionPagesList = data.action_pagesList;
this.keywordsList = data.keywordsList;
- this.headerService.headerMessage = this.lang.actionModification + " <small>" + data.action.label_action + "</small>";
+ this.headerService.setHeader(this.lang.actionCreation, data.action.label_action);
this.loading = false;
});
}
diff --git a/src/frontend/app/administration/action/actions-administration.component.ts b/src/frontend/app/administration/action/actions-administration.component.ts
index ec21725b69a..7c329ff136c 100755
--- a/src/frontend/app/administration/action/actions-administration.component.ts
+++ b/src/frontend/app/administration/action/actions-administration.component.ts
@@ -62,7 +62,7 @@ export class ActionsAdministrationComponent implements OnInit {
this.http.get(this.coreUrl + 'rest/actions')
.subscribe((data) => {
this.actions = data['actions'];
- this.headerService.headerMessage = this.lang.administration + ' ' + this.lang.actions;
+ this.headerService.setHeader(this.lang.administration + ' ' + this.lang.actions);
this.loading = false;
setTimeout(() => {
this.dataSource = new MatTableDataSource(this.actions);
diff --git a/src/frontend/app/administration/administration.component.ts b/src/frontend/app/administration/administration.component.ts
index 783ef18d514..cf044db156c 100755
--- a/src/frontend/app/administration/administration.component.ts
+++ b/src/frontend/app/administration/administration.component.ts
@@ -40,7 +40,7 @@ export class AdministrationComponent implements OnInit {
}
ngOnInit(): void {
- this.headerService.headerMessage = this.lang.administration;
+ this.headerService.setHeader(this.lang.administration);
window['MainHeaderComponent'].setSnav(this.sidenavLeft);
window['MainHeaderComponent'].setSnavRight(null);
diff --git a/src/frontend/app/administration/basket/basket-administration.component.ts b/src/frontend/app/administration/basket/basket-administration.component.ts
index 9cdab07f69e..bcc541e7e12 100755
--- a/src/frontend/app/administration/basket/basket-administration.component.ts
+++ b/src/frontend/app/administration/basket/basket-administration.component.ts
@@ -78,7 +78,7 @@ export class BasketAdministrationComponent implements OnInit {
this.route.params.subscribe((params: any) => {
if (typeof params['id'] == "undefined") {
- this.headerService.headerMessage = this.lang.basketCreation;
+ this.headerService.setHeader(this.lang.basketCreation);
window['MainHeaderComponent'].setSnav(this.sidenavLeft);
window['MainHeaderComponent'].setSnavRight(null);
@@ -95,7 +95,7 @@ export class BasketAdministrationComponent implements OnInit {
this.id = params['id'];
this.http.get(this.coreUrl + "rest/baskets/" + this.id)
.subscribe((data: any) => {
- this.headerService.headerMessage = this.lang.basketModification + " <small>" + data.basket.basket_name + "</small>";
+ this.headerService.setHeader(this.lang.basketModification, data.basket.basket_name);
this.basket = data.basket;
this.basket.id = data.basket.basket_id;
diff --git a/src/frontend/app/administration/basket/baskets-administration.component.ts b/src/frontend/app/administration/basket/baskets-administration.component.ts
index 6a275c96112..de0666f1142 100755
--- a/src/frontend/app/administration/basket/baskets-administration.component.ts
+++ b/src/frontend/app/administration/basket/baskets-administration.component.ts
@@ -54,7 +54,7 @@ export class BasketsAdministrationComponent implements OnInit {
}
ngOnInit(): void {
- this.headerService.headerMessage = this.lang.administration + ' ' + this.lang.baskets;
+ this.headerService.setHeader(this.lang.administration + ' ' + this.lang.baskets);
window['MainHeaderComponent'].setSnav(this.sidenavLeft);
window['MainHeaderComponent'].setSnavRight(null);
diff --git a/src/frontend/app/administration/contact/contacts-filling-administration.component.ts b/src/frontend/app/administration/contact/contacts-filling-administration.component.ts
index c200b60bfb9..7709cd8181d 100755
--- a/src/frontend/app/administration/contact/contacts-filling-administration.component.ts
+++ b/src/frontend/app/administration/contact/contacts-filling-administration.component.ts
@@ -105,7 +105,7 @@ export class ContactsFillingAdministrationComponent implements OnInit {
this.loading = true;
- this.headerService.headerMessage = this.lang.contactsFillingAdministration;
+ this.headerService.setHeader(this.lang.contactsFillingAdministration);
window['MainHeaderComponent'].setSnav(this.sidenavLeft);
window['MainHeaderComponent'].setSnavRight(null);
diff --git a/src/frontend/app/administration/contact/contacts-group-administration.component.ts b/src/frontend/app/administration/contact/contacts-group-administration.component.ts
index 4da5925a90b..84cb1c67af2 100755
--- a/src/frontend/app/administration/contact/contacts-group-administration.component.ts
+++ b/src/frontend/app/administration/contact/contacts-group-administration.component.ts
@@ -102,7 +102,7 @@ export class ContactsGroupAdministrationComponent implements OnInit {
this.route.params.subscribe(params => {
if (typeof params['id'] == "undefined") {
- this.headerService.headerMessage = this.lang.contactGroupCreation;
+ this.headerService.setHeader(this.lang.contactGroupCreation);
window['MainHeaderComponent'].setSnav(this.sidenavLeft);
window['MainHeaderComponent'].setSnavRight(null);
@@ -123,7 +123,7 @@ export class ContactsGroupAdministrationComponent implements OnInit {
this.http.get(this.coreUrl + 'rest/contactsGroups/' + params['id'])
.subscribe((data: any) => {
this.contactsGroup = data.contactsGroup;
- this.headerService.headerMessage = this.lang.contactsGroupModification + " <small>" + this.contactsGroup.label + "</small>";
+ this.headerService.setHeader(this.lang.contactsGroupModification, this.contactsGroup.label);
this.nbContact = this.contactsGroup.nbContacts;
setTimeout(() => {
this.dataSourceAdded = new MatTableDataSource(this.contactsGroup.contacts);
diff --git a/src/frontend/app/administration/contact/contacts-groups-administration.component.ts b/src/frontend/app/administration/contact/contacts-groups-administration.component.ts
index 44a13aa2ed3..8cb6c732865 100755
--- a/src/frontend/app/administration/contact/contacts-groups-administration.component.ts
+++ b/src/frontend/app/administration/contact/contacts-groups-administration.component.ts
@@ -55,7 +55,8 @@ export class ContactsGroupsAdministrationComponent implements OnInit {
}
ngOnInit(): void {
- this.headerService.headerMessage = this.lang.administration + ' ' + this.lang.contactsGroups;
+ this.headerService.setHeader(this.lang.administration + ' ' + this.lang.contactsGroups);
+
window['MainHeaderComponent'].setSnav(this.sidenavLeft);
window['MainHeaderComponent'].setSnavRight(null);
diff --git a/src/frontend/app/administration/diffusionModel/diffusionModel-administration.component.ts b/src/frontend/app/administration/diffusionModel/diffusionModel-administration.component.ts
index 6a19c8359c1..1b1a020f68c 100755
--- a/src/frontend/app/administration/diffusionModel/diffusionModel-administration.component.ts
+++ b/src/frontend/app/administration/diffusionModel/diffusionModel-administration.component.ts
@@ -60,7 +60,7 @@ export class DiffusionModelAdministrationComponent extends AutoCompletePlugin im
this.route.params.subscribe(params => {
if (typeof params['id'] == "undefined") {
- this.headerService.headerMessage = this.lang.diffusionModelCreation;
+ this.headerService.setHeader(this.lang.diffusionModelCreation);
window['MainHeaderComponent'].setSnav(this.sidenavLeft);
window['MainHeaderComponent'].setSnavRight(this.sidenavRight);
@@ -77,7 +77,7 @@ export class DiffusionModelAdministrationComponent extends AutoCompletePlugin im
this.http.get(this.coreUrl + "rest/listTemplates/" + params['id'])
.subscribe((data: any) => {
this.diffusionModel = data['listTemplate'];
- this.headerService.headerMessage = this.lang.diffusionModelModification + " <small>" + this.diffusionModel.title + "</small>";
+ this.headerService.setHeader(this.lang.diffusionModelModification, this.diffusionModel.title);
if (this.diffusionModel.diffusionList[0]) {
this.idCircuit = this.diffusionModel.diffusionList[0].id;
}
diff --git a/src/frontend/app/administration/diffusionModel/diffusionModels-administration.component.ts b/src/frontend/app/administration/diffusionModel/diffusionModels-administration.component.ts
index c1da579723c..d0b6e1030f6 100755
--- a/src/frontend/app/administration/diffusionModel/diffusionModels-administration.component.ts
+++ b/src/frontend/app/administration/diffusionModel/diffusionModels-administration.component.ts
@@ -55,7 +55,7 @@ export class DiffusionModelsAdministrationComponent implements OnInit {
}
ngOnInit(): void {
- this.headerService.headerMessage = this.lang.administration + ' ' + this.lang.diffusionModels;
+ this.headerService.setHeader(this.lang.administration + ' ' + this.lang.diffusionModels);
window['MainHeaderComponent'].setSnav(this.sidenavLeft);
window['MainHeaderComponent'].setSnavRight(null);
diff --git a/src/frontend/app/administration/docserver/docserver-administration.component.ts b/src/frontend/app/administration/docserver/docserver-administration.component.ts
index 7784868782a..231eb665a1f 100755
--- a/src/frontend/app/administration/docserver/docserver-administration.component.ts
+++ b/src/frontend/app/administration/docserver/docserver-administration.component.ts
@@ -47,7 +47,7 @@ export class DocserverAdministrationComponent implements OnInit {
}
ngOnInit(): void {
- this.headerService.headerMessage = this.lang.docserverCreation;
+ this.headerService.setHeader(this.lang.docserverCreation);
window['MainHeaderComponent'].setSnav(this.sidenavLeft);
window['MainHeaderComponent'].setSnavRight(null);
this.coreUrl = angularGlobals.coreUrl;
diff --git a/src/frontend/app/administration/docserver/docservers-administration.component.ts b/src/frontend/app/administration/docserver/docservers-administration.component.ts
index 00a3e9d5879..be75d674730 100755
--- a/src/frontend/app/administration/docserver/docservers-administration.component.ts
+++ b/src/frontend/app/administration/docserver/docservers-administration.component.ts
@@ -47,7 +47,7 @@ export class DocserversAdministrationComponent implements OnInit {
}
ngOnInit(): void {
- this.headerService.headerMessage = this.lang.administration + ' ' + this.lang.docservers;
+ this.headerService.setHeader(this.lang.administration + ' ' + this.lang.docservers);
window['MainHeaderComponent'].setSnav(this.sidenavLeft);
window['MainHeaderComponent'].setSnavRight(null);
diff --git a/src/frontend/app/administration/doctype/doctypes-administration.component.ts b/src/frontend/app/administration/doctype/doctypes-administration.component.ts
index f3437a45cf3..6d9d155d47e 100755
--- a/src/frontend/app/administration/doctype/doctypes-administration.component.ts
+++ b/src/frontend/app/administration/doctype/doctypes-administration.component.ts
@@ -60,7 +60,7 @@ export class DoctypesAdministrationComponent implements OnInit {
}
ngOnInit(): void {
- this.headerService.headerMessage = this.lang.administration + ' ' + this.lang.doctypesAdmin;
+ this.headerService.setHeader(this.lang.administration + ' ' + this.lang.doctypesAdmin);
window['MainHeaderComponent'].setSnav(this.sidenavLeft);
window['MainHeaderComponent'].setSnavRight(this.sidenavRight);
diff --git a/src/frontend/app/administration/entity/entities-administration.component.ts b/src/frontend/app/administration/entity/entities-administration.component.ts
index cf6903c8a83..78635a4cf5c 100755
--- a/src/frontend/app/administration/entity/entities-administration.component.ts
+++ b/src/frontend/app/administration/entity/entities-administration.component.ts
@@ -68,7 +68,7 @@ export class EntitiesAdministrationComponent extends AutoCompletePlugin implemen
}
ngOnInit(): void {
- this.headerService.headerMessage = this.lang.administration + ' ' + this.lang.entities;
+ this.headerService.setHeader(this.lang.administration + ' ' + this.lang.entities);
window['MainHeaderComponent'].setSnav(this.sidenavLeft);
window['MainHeaderComponent'].setSnavRight(null);
diff --git a/src/frontend/app/administration/group/group-administration.component.ts b/src/frontend/app/administration/group/group-administration.component.ts
index 174605410a7..74168ffefa8 100755
--- a/src/frontend/app/administration/group/group-administration.component.ts
+++ b/src/frontend/app/administration/group/group-administration.component.ts
@@ -74,7 +74,7 @@ export class GroupAdministrationComponent extends AutoCompletePlugin implements
this.route.params.subscribe(params => {
if (typeof params['id'] == "undefined") {
- this.headerService.headerMessage = this.lang.groupCreation;
+ this.headerService.setHeader(this.lang.groupCreation);
window['MainHeaderComponent'].setSnav(this.sidenavLeft);
window['MainHeaderComponent'].setSnavRight(null);
@@ -89,7 +89,7 @@ export class GroupAdministrationComponent extends AutoCompletePlugin implements
this.http.get(this.coreUrl + "rest/groups/" + params['id'] + "/details")
.subscribe((data : any) => {
this.group = data['group'];
- this.headerService.headerMessage = this.lang.groupModification + " <small>" + this.group['group_desc'] + "</small>";
+ this.headerService.setHeader(this.lang.groupModification, this.group['group_desc']);
this.loading = false;
setTimeout(() => {
this.usersDataSource = new MatTableDataSource(this.group.users);
diff --git a/src/frontend/app/administration/group/groups-administration.component.ts b/src/frontend/app/administration/group/groups-administration.component.ts
index 398409e8af8..bfceb9e91c7 100755
--- a/src/frontend/app/administration/group/groups-administration.component.ts
+++ b/src/frontend/app/administration/group/groups-administration.component.ts
@@ -58,7 +58,7 @@ export class GroupsAdministrationComponent implements OnInit {
}
ngOnInit(): void {
- this.headerService.headerMessage = this.lang.administration + ' ' + this.lang.groups;
+ this.headerService.setHeader(this.lang.administration + ' ' + this.lang.groups);
window['MainHeaderComponent'].setSnav(this.sidenavLeft);
window['MainHeaderComponent'].setSnavRight(null);
diff --git a/src/frontend/app/administration/history/history-administration.component.ts b/src/frontend/app/administration/history/history-administration.component.ts
index 228f0f39af1..74e421d0c94 100755
--- a/src/frontend/app/administration/history/history-administration.component.ts
+++ b/src/frontend/app/administration/history/history-administration.component.ts
@@ -79,7 +79,7 @@ export class HistoryAdministrationComponent implements OnInit {
}
ngOnInit(): void {
- this.headerService.headerMessage = this.lang.administration + ' ' + this.lang.history;
+ this.headerService.setHeader(this.lang.administration + ' ' + this.lang.history);
window['MainHeaderComponent'].setSnav(this.sidenavLeft);
window['MainHeaderComponent'].setSnavRight(null);
diff --git a/src/frontend/app/administration/notification/notification-administration.component.ts b/src/frontend/app/administration/notification/notification-administration.component.ts
index b274e615932..b69b3b254d8 100755
--- a/src/frontend/app/administration/notification/notification-administration.component.ts
+++ b/src/frontend/app/administration/notification/notification-administration.component.ts
@@ -50,7 +50,7 @@ export class NotificationAdministrationComponent implements OnInit {
this.route.params.subscribe((params: any) => {
if (typeof params['identifier'] == "undefined") {
- this.headerService.headerMessage = this.lang.notificationCreation;
+ this.headerService.setHeader(this.lang.notificationCreation);
window['MainHeaderComponent'].setSnav(this.sidenavLeft);
window['MainHeaderComponent'].setSnavRight(null);
@@ -70,7 +70,7 @@ export class NotificationAdministrationComponent implements OnInit {
this.creationMode = false;
this.http.get(this.coreUrl + 'rest/notifications/' + params['identifier'])
.subscribe((data: any) => {
- this.headerService.headerMessage = this.lang.notificationModification + " <small>" + data.notification.description + "</small>";
+ this.headerService.setHeader(this.lang.notificationModification, data.notification.description);
this.notification = data.notification;
this.notification.attachfor_properties = [];
diff --git a/src/frontend/app/administration/notification/notifications-administration.component.ts b/src/frontend/app/administration/notification/notifications-administration.component.ts
index 724b8a47f83..6b4831e7d8f 100755
--- a/src/frontend/app/administration/notification/notifications-administration.component.ts
+++ b/src/frontend/app/administration/notification/notifications-administration.component.ts
@@ -72,7 +72,8 @@ export class NotificationsAdministrationComponent implements OnInit {
}
ngOnInit(): void {
- this.headerService.headerMessage = this.lang.administration + ' ' + this.lang.notifications;
+ this.headerService.setHeader(this.lang.administration + ' ' + this.lang.notifications);
+
window['MainHeaderComponent'].setSnav(this.sidenavLeft);
window['MainHeaderComponent'].setSnavRight(null);
diff --git a/src/frontend/app/administration/parameter/parameter-administration.component.ts b/src/frontend/app/administration/parameter/parameter-administration.component.ts
index ca945437e30..7c02d084432 100755
--- a/src/frontend/app/administration/parameter/parameter-administration.component.ts
+++ b/src/frontend/app/administration/parameter/parameter-administration.component.ts
@@ -49,7 +49,7 @@ export class ParameterAdministrationComponent implements OnInit {
this.route.params.subscribe((params) => {
if (typeof params['id'] == "undefined") {
- this.headerService.headerMessage = this.lang.parameterCreation;
+ this.headerService.setHeader(this.lang.parameterCreation);
window['MainHeaderComponent'].setSnav(this.sidenavLeft);
window['MainHeaderComponent'].setSnavRight(null);
@@ -63,7 +63,7 @@ export class ParameterAdministrationComponent implements OnInit {
this.http.get(this.coreUrl + "rest/parameters/" + params['id'])
.subscribe((data: any) => {
this.parameter = data.parameter;
- this.headerService.headerMessage = this.lang.parameterModification + " <small>" + this.parameter.id + "</small>";
+ this.headerService.setHeader(this.lang.parameterModification, this.parameter.id);
if (typeof (this.parameter.param_value_int) == "number") {
this.type = "int";
} else if (this.parameter.param_value_date) {
diff --git a/src/frontend/app/administration/parameter/parameters-administration.component.ts b/src/frontend/app/administration/parameter/parameters-administration.component.ts
index efc25a29de0..c4d0f34800e 100755
--- a/src/frontend/app/administration/parameter/parameters-administration.component.ts
+++ b/src/frontend/app/administration/parameter/parameters-administration.component.ts
@@ -53,7 +53,7 @@ export class ParametersAdministrationComponent implements OnInit {
}
ngOnInit(): void {
- this.headerService.headerMessage = this.lang.administration + ' ' + this.lang.parameters;
+ this.headerService.setHeader(this.lang.administration + ' ' + this.lang.parameters);
window['MainHeaderComponent'].setSnav(this.sidenavLeft);
window['MainHeaderComponent'].setSnavRight(null);
diff --git a/src/frontend/app/administration/priority/priority-administration.component.ts b/src/frontend/app/administration/priority/priority-administration.component.ts
index 8c5c58c271a..6f34c48709e 100755
--- a/src/frontend/app/administration/priority/priority-administration.component.ts
+++ b/src/frontend/app/administration/priority/priority-administration.component.ts
@@ -57,7 +57,7 @@ export class PriorityAdministrationComponent implements OnInit {
this.route.params.subscribe((params) => {
if (typeof params['id'] == "undefined") {
- this.headerService.headerMessage = this.lang.priorityCreation;
+ this.headerService.setHeader(this.lang.priorityCreation);
window['MainHeaderComponent'].setSnav(this.sidenavLeft);
window['MainHeaderComponent'].setSnavRight(null);
@@ -72,7 +72,7 @@ export class PriorityAdministrationComponent implements OnInit {
this.http.get(this.coreUrl + "rest/priorities/" + this.id)
.subscribe((data: any) => {
this.priority = data.priority;
- this.headerService.headerMessage = this.lang.priorityModification + " <small>" + this.priority.label + "</small>";
+ this.headerService.setHeader(this.lang.priorityModification, this.priority.label);
this.priority.useDoctypeDelay = this.priority.delays != null;
if (this.priority.working_days === true) {
this.priority.working_days = "true";
diff --git a/src/frontend/app/administration/report/reports-administration.component.ts b/src/frontend/app/administration/report/reports-administration.component.ts
index 66b1bf50ab2..616ac0e1f19 100755
--- a/src/frontend/app/administration/report/reports-administration.component.ts
+++ b/src/frontend/app/administration/report/reports-administration.component.ts
@@ -45,7 +45,7 @@ export class ReportsAdministrationComponent implements OnInit {
}
ngOnInit(): void {
- this.headerService.headerMessage = this.lang.administration + ' ' + this.lang.reports;
+ this.headerService.setHeader(this.lang.administration + ' ' + this.lang.reports);
window['MainHeaderComponent'].setSnav(this.sidenavLeft);
window['MainHeaderComponent'].setSnavRight(null);
diff --git a/src/frontend/app/administration/security/securities-administration.component.ts b/src/frontend/app/administration/security/securities-administration.component.ts
index eb0bd9f29f0..dc6fa711624 100755
--- a/src/frontend/app/administration/security/securities-administration.component.ts
+++ b/src/frontend/app/administration/security/securities-administration.component.ts
@@ -54,7 +54,7 @@ export class SecuritiesAdministrationComponent implements OnInit {
}
ngOnInit(): void {
- this.headerService.headerMessage = this.lang.securitiesAdministration;
+ this.headerService.setHeader(this.lang.securitiesAdministration);
window['MainHeaderComponent'].setSnav(this.sidenavLeft);
window['MainHeaderComponent'].setSnavRight(null);
diff --git a/src/frontend/app/administration/sendmail/sendmail-administration.component.ts b/src/frontend/app/administration/sendmail/sendmail-administration.component.ts
index 45950ed3ec5..53665f04d16 100644
--- a/src/frontend/app/administration/sendmail/sendmail-administration.component.ts
+++ b/src/frontend/app/administration/sendmail/sendmail-administration.component.ts
@@ -61,7 +61,7 @@ export class SendmailAdministrationComponent implements OnInit {
}
ngOnInit(): void {
- this.headerService.headerMessage = this.lang.sendmail;
+ this.headerService.setHeader(this.lang.sendmail);
window['MainHeaderComponent'].setSnav(this.sidenavLeft);
window['MainHeaderComponent'].setSnavRight(null);
diff --git a/src/frontend/app/administration/status/status-administration.component.ts b/src/frontend/app/administration/status/status-administration.component.ts
index a551ea27b3f..17c182d4f1f 100755
--- a/src/frontend/app/administration/status/status-administration.component.ts
+++ b/src/frontend/app/administration/status/status-administration.component.ts
@@ -64,7 +64,7 @@ export class StatusAdministrationComponent implements OnInit {
this.route.params.subscribe((params: any) => {
if (typeof params['identifier'] == "undefined") {
- this.headerService.headerMessage = this.lang.statusCreation;
+ this.headerService.setHeader(this.lang.statusCreation);
window['MainHeaderComponent'].setSnav(this.sidenavLeft);
window['MainHeaderComponent'].setSnavRight(null);
@@ -87,7 +87,7 @@ export class StatusAdministrationComponent implements OnInit {
this.http.get(this.coreUrl + 'rest/statuses/' + params['identifier'])
.subscribe((data: any) => {
this.status = data['status'][0];
- this.headerService.headerMessage = this.lang.statusModification + " <small>" + this.status['label_status'] + "</small>";
+ this.headerService.setHeader(this.lang.statusModification, this.status['label_status']);
if (this.status.can_be_searched == 'Y') {
this.status.can_be_searched = true;
diff --git a/src/frontend/app/administration/status/statuses-administration.component.ts b/src/frontend/app/administration/status/statuses-administration.component.ts
index cdac8952345..deccb08e8a3 100755
--- a/src/frontend/app/administration/status/statuses-administration.component.ts
+++ b/src/frontend/app/administration/status/statuses-administration.component.ts
@@ -51,7 +51,7 @@ export class StatusesAdministrationComponent implements OnInit {
}
ngOnInit(): void {
- this.headerService.headerMessage = this.lang.administration + ' ' + this.lang.statuses;
+ this.headerService.setHeader(this.lang.administration + ' ' + this.lang.statuses);
window['MainHeaderComponent'].setSnav(this.sidenavLeft);
window['MainHeaderComponent'].setSnavRight(null);
diff --git a/src/frontend/app/administration/template/template-administration.component.ts b/src/frontend/app/administration/template/template-administration.component.ts
index 159eb5b9b20..60f572e33c7 100755
--- a/src/frontend/app/administration/template/template-administration.component.ts
+++ b/src/frontend/app/administration/template/template-administration.component.ts
@@ -65,7 +65,7 @@ export class TemplateAdministrationComponent implements OnInit {
this.route.params.subscribe(params => {
if (typeof params['id'] == "undefined") {
- this.headerService.headerMessage = this.lang.templateCreation;
+ this.headerService.setHeader(this.lang.templateCreation);
window['MainHeaderComponent'].setSnav(this.sidenavLeft);
window['MainHeaderComponent'].setSnavRight(this.sidenavRight);
@@ -88,7 +88,7 @@ export class TemplateAdministrationComponent implements OnInit {
.subscribe((data: any) => {
this.setInitialValue(data);
this.template = data.template;
- this.headerService.headerMessage = this.lang.templateModification + " <small>" + this.template.template_label + "</small>";
+ this.headerService.setHeader(this.lang.templateModification, this.template.template_label);
this.loading = false;
if(this.template.template_type=='HTML'){
this.initMce();
diff --git a/src/frontend/app/administration/template/templates-administration.component.ts b/src/frontend/app/administration/template/templates-administration.component.ts
index ee42fd116b6..8470847eb32 100755
--- a/src/frontend/app/administration/template/templates-administration.component.ts
+++ b/src/frontend/app/administration/template/templates-administration.component.ts
@@ -61,7 +61,7 @@ export class TemplatesAdministrationComponent implements OnInit {
}
ngOnInit(): void {
- this.headerService.headerMessage = this.lang.administration + ' ' + this.lang.templates;
+ this.headerService.setHeader(this.lang.administration + ' ' + this.lang.templates);
window['MainHeaderComponent'].setSnav(this.sidenavLeft);
window['MainHeaderComponent'].setSnavRight(null);
diff --git a/src/frontend/app/administration/updateStatus/update-status-administration.component.ts b/src/frontend/app/administration/updateStatus/update-status-administration.component.ts
index 72b71270952..b2e38e04019 100755
--- a/src/frontend/app/administration/updateStatus/update-status-administration.component.ts
+++ b/src/frontend/app/administration/updateStatus/update-status-administration.component.ts
@@ -49,7 +49,7 @@ export class UpdateStatusAdministrationComponent extends AutoCompletePlugin impl
}
ngOnInit(): void {
- this.headerService.headerMessage = this.lang.updateStatus;
+ this.headerService.setHeader(this.lang.updateStatus);
window['MainHeaderComponent'].setSnav(this.sidenavLeft);
window['MainHeaderComponent'].setSnavRight(null);
diff --git a/src/frontend/app/administration/user/user-administration.component.ts b/src/frontend/app/administration/user/user-administration.component.ts
index a361cc61d7e..760cecdf16f 100755
--- a/src/frontend/app/administration/user/user-administration.component.ts
+++ b/src/frontend/app/administration/user/user-administration.component.ts
@@ -108,7 +108,7 @@ export class UserAdministrationComponent extends AutoCompletePlugin implements O
window['MainHeaderComponent'].setSnav(this.sidenavLeft);
window['MainHeaderComponent'].setSnavRight(null);
- this.headerService.headerMessage = this.lang.userCreation;
+ this.headerService.setHeader(this.lang.userCreation);
this.creationMode = true;
this.loading = false;
} else {
@@ -124,7 +124,7 @@ export class UserAdministrationComponent extends AutoCompletePlugin implements O
this.data = data.history;
this.userId = data.user_id;
this.minDate = new Date(this.CurrentYear + '-' + this.currentMonth + '-01');
- this.headerService.headerMessage = this.lang.userModification + " <small>" + data.firstname + " " + data.lastname + "</small>";
+ this.headerService.setHeader(this.lang.userModification, data.firstname + " " + data.lastname);
this.loading = false;
setTimeout(() => {
this.dataSource = new MatTableDataSource(this.data);
diff --git a/src/frontend/app/administration/user/users-administration.component.ts b/src/frontend/app/administration/user/users-administration.component.ts
index 125e25af915..a5db724851a 100755
--- a/src/frontend/app/administration/user/users-administration.component.ts
+++ b/src/frontend/app/administration/user/users-administration.component.ts
@@ -63,7 +63,7 @@ export class UsersAdministrationComponent extends AutoCompletePlugin implements
}
ngOnInit(): void {
- this.headerService.headerMessage = this.lang.administration + ' ' + this.lang.users;
+ this.headerService.setHeader(this.lang.administration + ' ' + this.lang.users);
window['MainHeaderComponent'].setSnav(this.sidenavLeft);
window['MainHeaderComponent'].setSnavRight(null);
diff --git a/src/frontend/app/administration/versionUpdate/versions-update-administration.component.ts b/src/frontend/app/administration/versionUpdate/versions-update-administration.component.ts
index f5a7ca7e524..d8cc34d7b0f 100755
--- a/src/frontend/app/administration/versionUpdate/versions-update-administration.component.ts
+++ b/src/frontend/app/administration/versionUpdate/versions-update-administration.component.ts
@@ -40,7 +40,7 @@ export class VersionsUpdateAdministrationComponent implements OnInit {
}
ngOnInit(): void {
- this.headerService.headerMessage = this.lang.updateVersionControl;
+ this.headerService.setHeader(this.lang.updateVersionControl);
window['MainHeaderComponent'].setSnav(this.sidenavLeft);
window['MainHeaderComponent'].setSnavRight(null);
diff --git a/src/frontend/app/home.component.ts b/src/frontend/app/home.component.ts
index 8caf65ed961..dbd94b95a07 100755
--- a/src/frontend/app/home.component.ts
+++ b/src/frontend/app/home.component.ts
@@ -58,7 +58,7 @@ export class HomeComponent extends AutoCompletePlugin implements OnInit {
if (this.mobileMode) {
this.displayedColumns = ['res_id', 'subject'];
}
- this.headerService.headerMessage = this.lang.home;
+ this.headerService.setHeader(this.lang.home);
window['MainHeaderComponent'].setSnav(this.snav);
window['MainHeaderComponent'].setSnavRight(null);
diff --git a/src/frontend/app/list/basket-list.component.ts b/src/frontend/app/list/basket-list.component.ts
index 14e45b6a4b4..ade4cdbd305 100755
--- a/src/frontend/app/list/basket-list.component.ts
+++ b/src/frontend/app/list/basket-list.component.ts
@@ -175,8 +175,7 @@ export class BasketListComponent implements OnInit {
// Flip flag to show that loading has finished.
this.isLoadingResults = false;
this.resultsLength = data.count;
- this.headerService.headerMessage = data.basketLabel;
- this.headerService.subHeaderMessage = this.resultsLength + ' ' + this.lang.entries;
+ this.headerService.setHeader(data.basketLabel, this.resultsLength + ' ' + this.lang.entries);
return data.resources;
}),
catchError((err: any) => {
diff --git a/src/frontend/app/menu/main-header.component.html b/src/frontend/app/menu/main-header.component.html
index fcd483cfc94..3ec2233ddd0 100755
--- a/src/frontend/app/menu/main-header.component.html
+++ b/src/frontend/app/menu/main-header.component.html
@@ -3,8 +3,7 @@
<mat-icon class="fa fa-bars fa-2x"></mat-icon>
</button>
<a href="#" title="{{lang.home}}" *ngIf="!mobileMode" style="margin-right: 30px;"><mat-icon class="maarchLogo" svgIcon="maarchLogo"></mat-icon></a>
- <h1 class="admin-toolbar-title" [innerHTML]="headerService.headerMessage">
- </h1><span class="admin-toolbar-title-small">{{headerService.subHeaderMessage}}</span>
+ <h1 class="admin-toolbar-title">{{headerService.headerMessage}}</h1><span class="admin-toolbar-title-small">{{headerService.subHeaderMessage}}</span>
<span style="flex: 1 1 auto;"></span>
<search-home></search-home>
<button mat-button [matMenuTriggerFor]="applications" *ngIf="!mobileMode" style="min-width:0px;width:65px;height: 40px;margin-left: 10px" matTooltip="{{lang.menu}}">
diff --git a/src/frontend/app/profile.component.ts b/src/frontend/app/profile.component.ts
index 12cdf227994..6907267ddd5 100755
--- a/src/frontend/app/profile.component.ts
+++ b/src/frontend/app/profile.component.ts
@@ -395,7 +395,7 @@ export class ProfileComponent extends AutoCompletePlugin implements OnInit {
}
ngOnInit(): void {
- this.headerService.headerMessage = this.lang.myProfile;
+ this.headerService.setHeader(this.lang.myProfile);
window['MainHeaderComponent'].setSnav(this.sidenavLeft);
window['MainHeaderComponent'].setSnavRight(this.sidenavRight);
this.coreUrl = angularGlobals.coreUrl;
diff --git a/src/frontend/app/save-numeric-package.component.ts b/src/frontend/app/save-numeric-package.component.ts
index 1cda7cbd0b5..7d90a147868 100755
--- a/src/frontend/app/save-numeric-package.component.ts
+++ b/src/frontend/app/save-numeric-package.component.ts
@@ -49,7 +49,7 @@ export class SaveNumericPackageComponent implements OnInit {
}
ngOnInit(): void {
- this.headerService.headerMessage = this.lang.saveNumericPackage;
+ this.headerService.setHeader(this.lang.saveNumericPackage);
this.coreUrl = angularGlobals.coreUrl;
this.loading = false;
diff --git a/src/frontend/service/header.service.ts b/src/frontend/service/header.service.ts
index 2908fee2db7..d4abbcc94f5 100755
--- a/src/frontend/service/header.service.ts
+++ b/src/frontend/service/header.service.ts
@@ -3,5 +3,11 @@ import { Injectable } from '@angular/core';
@Injectable()
export class HeaderService {
headerMessage : string = "";
- subHeaderMessage : string = "";
+ subHeaderMessage : string = "";
+
+
+ setHeader(maintTitle: string, subTitle: any = '') {
+ this.headerMessage = maintTitle;
+ this.subHeaderMessage = subTitle;
+ }
}
--
GitLab