diff --git a/src/app/features/admin/funding-agencies/components/routables/admin-funding-agencies-detail/admin-funding-agencies-detail.routable.html b/src/app/features/admin/funding-agencies/components/routables/admin-funding-agencies-detail/admin-funding-agencies-detail.routable.html
index 7799d770da970f356d048427b7a97f43fb9a20ef..e31bb67b05ce1156e3b9034a8f1bfc4e86c4a500 100644
--- a/src/app/features/admin/funding-agencies/components/routables/admin-funding-agencies-detail/admin-funding-agencies-detail.routable.html
+++ b/src/app/features/admin/funding-agencies/components/routables/admin-funding-agencies-detail/admin-funding-agencies-detail.routable.html
@@ -1,15 +1,24 @@
<div class="button-toolbar">
- <button mat-flat-button
+ <button mat-button
+ color="accent"
+ (click)="backToList()"
+ >
+ <mat-icon>navigate_before</mat-icon>
+ {{KEY_BACK_BUTTON | translate}}
+ </button>
+ <button mat-button
color="primary"
(click)="edit()"
>
+ <mat-icon>edit</mat-icon>
{{KEY_EDIT_BUTTON | translate}}
</button>
- <button mat-flat-button
+ <button mat-button
color="accent"
[disabled]="!(currentObs| async)"
(click)="delete()"
>
+ <mat-icon>delete</mat-icon>
{{KEY_DELETE_BUTTON | translate}}
</button>
</div>
diff --git a/src/app/features/admin/institution/components/routables/admin-institution-detail/admin-institution-detail.routable.html b/src/app/features/admin/institution/components/routables/admin-institution-detail/admin-institution-detail.routable.html
index a2e398205fcdc7d4b11099a3204f1e1969d0b400..dce938234fb48482e71ca879d20a3b58ead904a2 100644
--- a/src/app/features/admin/institution/components/routables/admin-institution-detail/admin-institution-detail.routable.html
+++ b/src/app/features/admin/institution/components/routables/admin-institution-detail/admin-institution-detail.routable.html
@@ -1,15 +1,24 @@
<div class="button-toolbar">
- <button mat-flat-button
+ <button mat-button
+ color="accent"
+ (click)="backToList()"
+ >
+ <mat-icon>navigate_before</mat-icon>
+ {{KEY_BACK_BUTTON | translate}}
+ </button>
+ <button mat-button
color="primary"
(click)="edit()"
>
+ <mat-icon>edit</mat-icon>
{{KEY_EDIT_BUTTON | translate}}
</button>
- <button mat-flat-button
+ <button mat-button
color="accent"
[disabled]="!(currentObs| async)"
(click)="delete()"
>
+ <mat-icon>delete</mat-icon>
{{KEY_DELETE_BUTTON | translate}}
</button>
</div>
diff --git a/src/app/features/admin/license/components/routables/admin-license-detail/admin-license-detail.routable.html b/src/app/features/admin/license/components/routables/admin-license-detail/admin-license-detail.routable.html
index f78a517748a5455bc1bfa51b5214991cd8039b4c..99777a20d04cc3ed792e0be3dc4034dcfb52599d 100644
--- a/src/app/features/admin/license/components/routables/admin-license-detail/admin-license-detail.routable.html
+++ b/src/app/features/admin/license/components/routables/admin-license-detail/admin-license-detail.routable.html
@@ -1,15 +1,24 @@
<div class="button-toolbar">
- <button mat-flat-button
+ <button mat-button
+ color="accent"
+ (click)="backToList()"
+ >
+ <mat-icon>navigate_before</mat-icon>
+ {{KEY_BACK_BUTTON | translate}}
+ </button>
+ <button mat-button
color="primary"
(click)="edit()"
>
+ <mat-icon>edit</mat-icon>
{{KEY_EDIT_BUTTON | translate}}
</button>
- <button mat-flat-button
+ <button mat-button
color="accent"
[disabled]="!(currentObs| async)"
(click)="delete()"
>
+ <mat-icon>delete</mat-icon>
{{KEY_DELETE_BUTTON | translate}}
</button>
</div>
diff --git a/src/app/features/admin/oauth2-client/components/routables/admin-oauth2-client-detail/admin-oauth2-client-detail.routable.html b/src/app/features/admin/oauth2-client/components/routables/admin-oauth2-client-detail/admin-oauth2-client-detail.routable.html
index 075c0d70b366053a887bd9f8a01edfc1ade4abf6..86cc37f4c5837f99bfc059e9cde005c2d2c51db7 100644
--- a/src/app/features/admin/oauth2-client/components/routables/admin-oauth2-client-detail/admin-oauth2-client-detail.routable.html
+++ b/src/app/features/admin/oauth2-client/components/routables/admin-oauth2-client-detail/admin-oauth2-client-detail.routable.html
@@ -1,15 +1,24 @@
<div class="button-toolbar">
- <button mat-flat-button
+ <button mat-button
+ color="accent"
+ (click)="backToList()"
+ >
+ <mat-icon>navigate_before</mat-icon>
+ {{KEY_BACK_BUTTON | translate}}
+ </button>
+ <button mat-button
color="primary"
(click)="edit()"
>
+ <mat-icon>edit</mat-icon>
{{KEY_EDIT_BUTTON | translate}}
</button>
- <button mat-flat-button
+ <button mat-button
color="accent"
[disabled]="!(currentObs| async)"
(click)="delete()"
>
+ <mat-icon>delete</mat-icon>
{{KEY_DELETE_BUTTON | translate}}
</button>
</div>
diff --git a/src/app/features/admin/orgunit/components/routables/admin-orgunit-detail/admin-orgunit-detail.routable.html b/src/app/features/admin/orgunit/components/routables/admin-orgunit-detail/admin-orgunit-detail.routable.html
index e6c282d138cb5775de6f27acdc3e587a15487584..0923b7b683bd60e55d0e05ac6652aa0d6429febb 100644
--- a/src/app/features/admin/orgunit/components/routables/admin-orgunit-detail/admin-orgunit-detail.routable.html
+++ b/src/app/features/admin/orgunit/components/routables/admin-orgunit-detail/admin-orgunit-detail.routable.html
@@ -1,15 +1,24 @@
<div class="button-toolbar">
- <button mat-flat-button
+ <button mat-button
+ color="accent"
+ (click)="backToList()"
+ >
+ <mat-icon>navigate_before</mat-icon>
+ {{KEY_BACK_BUTTON | translate}}
+ </button>
+ <button mat-button
color="primary"
(click)="edit()"
>
+ <mat-icon>edit</mat-icon>
{{KEY_EDIT_BUTTON | translate}}
</button>
- <button mat-flat-button
+ <button mat-button
color="accent"
[disabled]="!(currentObs| async)"
(click)="delete()"
>
+ <mat-icon>delete</mat-icon>
{{KEY_DELETE_BUTTON | translate}}
</button>
</div>
diff --git a/src/app/features/admin/person/components/routables/admin-person-detail/admin-person-detail.routable.html b/src/app/features/admin/person/components/routables/admin-person-detail/admin-person-detail.routable.html
index c13def6a59008291ced1d6dbe2ae7d1449ebd742..419df60e437bc090ad7b2d4b09e950cbdc005e6d 100644
--- a/src/app/features/admin/person/components/routables/admin-person-detail/admin-person-detail.routable.html
+++ b/src/app/features/admin/person/components/routables/admin-person-detail/admin-person-detail.routable.html
@@ -1,15 +1,24 @@
<div class="button-toolbar">
- <button mat-flat-button
+ <button mat-button
+ color="accent"
+ (click)="backToList()"
+ >
+ <mat-icon>navigate_before</mat-icon>
+ {{KEY_BACK_BUTTON | translate}}
+ </button>
+ <button mat-button
color="primary"
(click)="edit()"
>
+ <mat-icon>edit</mat-icon>
{{KEY_EDIT_BUTTON | translate}}
</button>
- <button mat-flat-button
+ <button mat-button
color="accent"
[disabled]="!(currentObs| async)"
(click)="delete()"
>
+ <mat-icon>delete</mat-icon>
{{KEY_DELETE_BUTTON | translate}}
</button>
</div>
diff --git a/src/app/features/admin/preservation-policy/components/routables/admin-preservation-policy-detail/admin-preservation-policy-detail.routable.html b/src/app/features/admin/preservation-policy/components/routables/admin-preservation-policy-detail/admin-preservation-policy-detail.routable.html
index 577a85f02e929690f58b23cf08d290e20528140f..56809c955d84f8b824a54141de3964b4cebd406e 100644
--- a/src/app/features/admin/preservation-policy/components/routables/admin-preservation-policy-detail/admin-preservation-policy-detail.routable.html
+++ b/src/app/features/admin/preservation-policy/components/routables/admin-preservation-policy-detail/admin-preservation-policy-detail.routable.html
@@ -1,15 +1,24 @@
<div class="button-toolbar">
- <button mat-flat-button
+ <button mat-button
+ color="accent"
+ (click)="backToList()"
+ >
+ <mat-icon>navigate_before</mat-icon>
+ {{KEY_BACK_BUTTON | translate}}
+ </button>
+ <button mat-button
color="primary"
(click)="edit()"
>
+ <mat-icon>edit</mat-icon>
{{KEY_EDIT_BUTTON | translate}}
</button>
- <button mat-flat-button
+ <button mat-button
color="accent"
[disabled]="!(currentObs| async)"
(click)="delete()"
>
+ <mat-icon>delete</mat-icon>
{{KEY_DELETE_BUTTON | translate}}
</button>
</div>
diff --git a/src/app/features/admin/role/components/routables/admin-role-detail/admin-role-detail.routable.html b/src/app/features/admin/role/components/routables/admin-role-detail/admin-role-detail.routable.html
index 8a1983dd6946529cd8f7d8eb4df42ca4d27613d3..03db9a3b3ee1175e1ee5028b9854642f3e90fc3c 100644
--- a/src/app/features/admin/role/components/routables/admin-role-detail/admin-role-detail.routable.html
+++ b/src/app/features/admin/role/components/routables/admin-role-detail/admin-role-detail.routable.html
@@ -1,8 +1,16 @@
<div class="button-toolbar">
- <button mat-flat-button
+ <button mat-button
+ color="accent"
+ (click)="backToList()"
+ >
+ <mat-icon>navigate_before</mat-icon>
+ {{KEY_BACK_BUTTON | translate}}
+ </button>
+ <button mat-button
color="primary"
(click)="edit()"
>
+ <mat-icon>edit</mat-icon>
{{KEY_EDIT_BUTTON | translate}}
</button>
</div>
diff --git a/src/app/features/admin/submission-policy/components/routables/admin-submission-policy-detail/admin-submission-policy-detail.routable.html b/src/app/features/admin/submission-policy/components/routables/admin-submission-policy-detail/admin-submission-policy-detail.routable.html
index 90ef8d3225e6ee39e49777ec2e0391ae5de6b177..e1465f4734f6ee5a21b37af4bbb73a78a100f8c8 100644
--- a/src/app/features/admin/submission-policy/components/routables/admin-submission-policy-detail/admin-submission-policy-detail.routable.html
+++ b/src/app/features/admin/submission-policy/components/routables/admin-submission-policy-detail/admin-submission-policy-detail.routable.html
@@ -1,15 +1,24 @@
<div class="button-toolbar">
- <button mat-flat-button
+ <button mat-button
+ color="accent"
+ (click)="backToList()"
+ >
+ <mat-icon>navigate_before</mat-icon>
+ {{KEY_BACK_BUTTON | translate}}
+ </button>
+ <button mat-button
color="primary"
(click)="edit()"
>
+ <mat-icon>edit</mat-icon>
{{KEY_EDIT_BUTTON | translate}}
</button>
- <button mat-flat-button
+ <button mat-button
color="accent"
[disabled]="!(currentObs| async)"
(click)="delete()"
>
+ <mat-icon>delete</mat-icon>
{{KEY_DELETE_BUTTON | translate}}
</button>
</div>
diff --git a/src/app/features/admin/user/components/routables/admin-user-detail/admin-user-detail.routable.html b/src/app/features/admin/user/components/routables/admin-user-detail/admin-user-detail.routable.html
index 293a36152ebdfe2a98192dc1d8b6ae414c5e748f..388c58fd5fb7384000b5aa45c03f6170956c7d42 100644
--- a/src/app/features/admin/user/components/routables/admin-user-detail/admin-user-detail.routable.html
+++ b/src/app/features/admin/user/components/routables/admin-user-detail/admin-user-detail.routable.html
@@ -1,15 +1,24 @@
<div class="button-toolbar">
- <button mat-flat-button
+ <button mat-button
+ color="accent"
+ (click)="backToList()"
+ >
+ <mat-icon>navigate_before</mat-icon>
+ {{KEY_BACK_BUTTON | translate}}
+ </button>
+ <button mat-button
color="primary"
(click)="edit()"
>
+ <mat-icon>edit</mat-icon>
{{KEY_EDIT_BUTTON | translate}}
</button>
- <button mat-flat-button
+ <button mat-button
color="accent"
[disabled]="!(currentObs| async)"
(click)="delete()"
>
+ <mat-icon>delete</mat-icon>
{{KEY_DELETE_BUTTON | translate}}
</button>
</div>
diff --git a/src/app/features/deposit/components/routables/deposit-detail/deposit-detail.routable.html b/src/app/features/deposit/components/routables/deposit-detail/deposit-detail.routable.html
index 20854e16f0cb135dc628c9fa5cfcbce1ac2251a7..540489e374f6a4cfae30db494586faa36d9f3869 100644
--- a/src/app/features/deposit/components/routables/deposit-detail/deposit-detail.routable.html
+++ b/src/app/features/deposit/components/routables/deposit-detail/deposit-detail.routable.html
@@ -37,7 +37,7 @@
(click)="backToList()"
>
<mat-icon>navigate_before</mat-icon>
- {{'deposit.backToList' | translate}}
+ {{KEY_BACK_BUTTON | translate}}
</button>
<button *ngIf="canDoAlterationActions && ((currentObs| async)?.status === statusEnum.INPROGRESS ||
(currentObs| async)?.status === statusEnum.INERROR)"
diff --git a/src/app/features/deposit/components/routables/deposit-detail/deposit-detail.routable.ts b/src/app/features/deposit/components/routables/deposit-detail/deposit-detail.routable.ts
index 363a0a1492d0f876d476701843ab1754076d090d..f49ed04b272983cd5e817a55ffccf728359b5d04 100644
--- a/src/app/features/deposit/components/routables/deposit-detail/deposit-detail.routable.ts
+++ b/src/app/features/deposit/components/routables/deposit-detail/deposit-detail.routable.ts
@@ -263,8 +263,4 @@ export class DepositDetailRoutable extends SharedAbstractDetailRoutable<DepositE
}
return true;
}
-
- backToList(): void {
- this.store.dispatch(new Navigate([RoutesEnum.deposit]));
- }
}
diff --git a/src/app/features/organizational-unit/components/routables/orgunit-detail/orgunit-detail.routable.html b/src/app/features/organizational-unit/components/routables/orgunit-detail/orgunit-detail.routable.html
index 16e03ca0c41c51d6a3ed59b3cc81c1eb07dde2a4..f0a9f722e5a93a2e2be48849beaf2773c3fc6223 100644
--- a/src/app/features/organizational-unit/components/routables/orgunit-detail/orgunit-detail.routable.html
+++ b/src/app/features/organizational-unit/components/routables/orgunit-detail/orgunit-detail.routable.html
@@ -1,8 +1,16 @@
<div class="button-toolbar">
- <button mat-flat-button
+ <button mat-button
+ color="accent"
+ (click)="backToList()"
+ >
+ <mat-icon>navigate_before</mat-icon>
+ {{KEY_BACK_BUTTON | translate}}
+ </button>
+ <button mat-button
color="primary"
(click)="edit()"
>
+ <mat-icon>edit</mat-icon>
{{KEY_EDIT_BUTTON | translate}}
</button>
</div>
diff --git a/src/app/shared/components/routables/shared-abstract-detail/shared-abstract-detail.routable.ts b/src/app/shared/components/routables/shared-abstract-detail/shared-abstract-detail.routable.ts
index c6aa49f1e71e07a5a308328ed73b3acd2b9ef377..f1e337b2a63f2e0e821c2dba67c1e95b717562a1 100644
--- a/src/app/shared/components/routables/shared-abstract-detail/shared-abstract-detail.routable.ts
+++ b/src/app/shared/components/routables/shared-abstract-detail/shared-abstract-detail.routable.ts
@@ -22,6 +22,7 @@ import {
ResourceNameSpace,
ResourceStateModel,
StoreUtil,
+ TRANSLATE,
} from "solidify-frontend";
import {LocalStateEnum} from "../../../enums/local-state.enum";
@@ -32,6 +33,7 @@ export abstract class SharedAbstractDetailRoutable<TResourceModel, UResourceStat
abstract readonly KEY_PARAM_NAME: string;
abstract readonly KEY_EDIT_BUTTON: string;
abstract readonly KEY_DELETE_BUTTON: string;
+ readonly KEY_BACK_BUTTON: string = TRANSLATE("app.navigation.button.backToList");
protected _resId: string;
@@ -93,6 +95,10 @@ export abstract class SharedAbstractDetailRoutable<TResourceModel, UResourceStat
data: datas,
});
}
+
+ backToList(): void {
+ this.store.dispatch(new Navigate([StoreRouteLocalUtil.getRootRoute(this.state)]));
+ }
}
export interface OptionSharedAbstractCreateRoutable {
diff --git a/src/app/shared/utils/store-route-local.util.ts b/src/app/shared/utils/store-route-local.util.ts
index 70a971632647e77a159a608336a735bc2a28b8fa..6f175e4e82bd56a9fdaa6774db6ec6e1120908b8 100644
--- a/src/app/shared/utils/store-route-local.util.ts
+++ b/src/app/shared/utils/store-route-local.util.ts
@@ -101,12 +101,24 @@ export class StoreRouteLocalUtil {
if (state === LocalStateEnum.admin_license) {
return RoutesEnum.adminLicense;
}
+ if (state === LocalStateEnum.admin_institution) {
+ return RoutesEnum.adminInstitution;
+ }
if (state === LocalStateEnum.admin_user) {
return RoutesEnum.adminUser;
}
+ if (state === LocalStateEnum.admin_oauth2Client) {
+ return RoutesEnum.adminOAuth2client;
+ }
if (state === LocalStateEnum.admin_person) {
return RoutesEnum.adminPerson;
}
+ if (state === LocalStateEnum.admin_role) {
+ return RoutesEnum.adminRole;
+ }
+ if (state === LocalStateEnum.admin_fundingAgencies) {
+ return RoutesEnum.adminFundingAgencies;
+ }
throw Error(StringUtil.format(StoreRouteLocalUtil.messageNotFound, "Root", state));
}
diff --git a/src/assets/i18n/de.json b/src/assets/i18n/de.json
index 03e216747d90e0fda9f7f50d488b261dc8aff546..da25a907777787fa193363bf4184ec3411dd73c0 100644
--- a/src/assets/i18n/de.json
+++ b/src/assets/i18n/de.json
@@ -476,7 +476,8 @@
},
"navigation": {
"button": {
- "backToDetail": "Leave edit mode"
+ "backToDetail": "Leave edit mode",
+ "backToList": "app.navigation.button.backToList"
}
},
"person": {
@@ -641,7 +642,6 @@
"title": "Authors"
},
"backToEdit": "Return to editing",
- "backToList": "Deposit list",
"collectionBegin": "Data Collection Start Date",
"collectionEnd": "Data Collection End Date",
"delete": "Delete",
@@ -1056,4 +1056,4 @@
}
}
}
-}
+}
\ No newline at end of file
diff --git a/src/assets/i18n/en.json b/src/assets/i18n/en.json
index 03e216747d90e0fda9f7f50d488b261dc8aff546..7fa355f97dba6595b65a18b0cd382bf0e43e8379 100644
--- a/src/assets/i18n/en.json
+++ b/src/assets/i18n/en.json
@@ -476,7 +476,8 @@
},
"navigation": {
"button": {
- "backToDetail": "Leave edit mode"
+ "backToDetail": "Leave edit mode",
+ "backToList": "Back to list"
}
},
"person": {
@@ -641,7 +642,6 @@
"title": "Authors"
},
"backToEdit": "Return to editing",
- "backToList": "Deposit list",
"collectionBegin": "Data Collection Start Date",
"collectionEnd": "Data Collection End Date",
"delete": "Delete",
diff --git a/src/assets/i18n/fr.json b/src/assets/i18n/fr.json
index e110e4de4bff01da2709c8316ce42ed03a29d30a..9a801c8a4eeb2ceeca57b0d1ac8f91b981393cd6 100644
--- a/src/assets/i18n/fr.json
+++ b/src/assets/i18n/fr.json
@@ -476,7 +476,8 @@
},
"navigation": {
"button": {
- "backToDetail": "Quitter le mode édition"
+ "backToDetail": "Quitter le mode édition",
+ "backToList": "Retour à la liste"
}
},
"person": {
@@ -641,7 +642,6 @@
"title": "Auteurs"
},
"backToEdit": "Retour en édition",
- "backToList": "Liste des dépôts",
"collectionBegin": "Début de la collecte des données",
"collectionEnd": "Fin de la collecte des données",
"delete": "Supprimer",