diff --git a/apps/red-ui/src/app/components/base-screen/base-screen.component.html b/apps/red-ui/src/app/components/base-screen/base-screen.component.html
index 20eb64e45..0cc8595f3 100644
--- a/apps/red-ui/src/app/components/base-screen/base-screen.component.html
+++ b/apps/red-ui/src/app/components/base-screen/base-screen.component.html
@@ -21,7 +21,7 @@
diff --git a/apps/red-ui/src/app/components/breadcrumbs/breadcrumbs.component.html b/apps/red-ui/src/app/components/breadcrumbs/breadcrumbs.component.html
index 25dae2bc4..0c2b76d41 100644
--- a/apps/red-ui/src/app/components/breadcrumbs/breadcrumbs.component.html
+++ b/apps/red-ui/src/app/components/breadcrumbs/breadcrumbs.component.html
@@ -1,4 +1,4 @@
-
+
{{ 'top-bar.navigation-items.back' | translate }}
@@ -29,15 +29,17 @@
>
-
- {{ option.name$ | async }}
-
-
+
diff --git a/apps/red-ui/src/app/modules/account/account-side-nav/account-side-nav.component.html b/apps/red-ui/src/app/modules/account/account-side-nav/account-side-nav.component.html
index b72fd75dd..1a97e0126 100644
--- a/apps/red-ui/src/app/modules/account/account-side-nav/account-side-nav.component.html
+++ b/apps/red-ui/src/app/modules/account/account-side-nav/account-side-nav.component.html
@@ -4,7 +4,7 @@
*ngIf="item.show"
[routerLinkActiveOptions]="{ exact: false }"
[routerLink]="'../' + item.screen"
- [attr.help-mode-key]="'user_account'"
+ [attr.help-mode-key]="item.helpModeKey"
class="item"
routerLinkActive="active"
>
diff --git a/apps/red-ui/src/app/modules/account/account-side-nav/account-side-nav.component.ts b/apps/red-ui/src/app/modules/account/account-side-nav/account-side-nav.component.ts
index c21b6346c..bebf6d1a1 100644
--- a/apps/red-ui/src/app/modules/account/account-side-nav/account-side-nav.component.ts
+++ b/apps/red-ui/src/app/modules/account/account-side-nav/account-side-nav.component.ts
@@ -9,6 +9,7 @@ interface NavItem {
readonly label: string;
readonly screen: string;
readonly show?: boolean;
+ readonly helpModeKey?: string;
}
@Component({
@@ -24,21 +25,25 @@ export class AccountSideNavComponent {
screen: 'user-profile',
label: _('user-profile'),
show: true,
+ helpModeKey: 'my_profile',
},
{
screen: 'notifications',
show: this.currentUser.isUser && this._permissionsService.has(Roles.notifications.write),
label: _('notifications.label'),
+ helpModeKey: 'notification_preferences',
},
{
screen: 'preferences',
label: _('preferences-screen.label'),
show: this.currentUser.isUser,
+ helpModeKey: 'user_preferences',
},
{
screen: 'warnings-preferences',
label: _('preferences-screen.warnings-label'),
show: this.currentUser.isUser,
+ helpModeKey: 'prompts_and_dialogs',
},
];
diff --git a/apps/red-ui/src/app/modules/admin/shared/components/admin-side-nav/admin-side-nav.component.ts b/apps/red-ui/src/app/modules/admin/shared/components/admin-side-nav/admin-side-nav.component.ts
index e313824b6..bda7582d2 100644
--- a/apps/red-ui/src/app/modules/admin/shared/components/admin-side-nav/admin-side-nav.component.ts
+++ b/apps/red-ui/src/app/modules/admin/shared/components/admin-side-nav/admin-side-nav.component.ts
@@ -86,13 +86,13 @@ export class AdminSideNavComponent implements OnInit {
{
screen: 'info',
label: _('admin-side-nav.dossier-template-info'),
- helpModeKey: 'dossier_templates_info',
+ helpModeKey: 'user_dossier_template_info',
show: true,
},
{
screen: 'entities',
label: _('admin-side-nav.entities'),
- helpModeKey: 'entities',
+ helpModeKey: 'user_dossier_template_entities',
show: true,
},
{
@@ -127,14 +127,14 @@ export class AdminSideNavComponent implements OnInit {
{
screen: 'dossier-states',
label: _('admin-side-nav.dossier-states'),
- helpModeKey: 'dossier_states',
+ helpModeKey: 'user_dossier_template_dossier_states',
show: true,
},
{
screen: 'reports',
label: _('admin-side-nav.reports'),
show: this._permissionsService.has([Roles.reportTemplates.read]),
- helpModeKey: 'reports',
+ helpModeKey: 'user_dossier_template_reports',
},
{
screen: 'justifications',
@@ -170,7 +170,10 @@ export class AdminSideNavComponent implements OnInit {
],
};
- constructor(private readonly _permissionsService: IqserPermissionsService, private readonly _route: ActivatedRoute) {}
+ constructor(
+ private readonly _permissionsService: IqserPermissionsService,
+ private readonly _route: ActivatedRoute,
+ ) {}
@HostBinding('class.smaller') get isSmaller(): boolean {
return [AdminSideNavTypes.dossierTemplates, AdminSideNavTypes.entities].includes(this.type);
diff --git a/apps/red-ui/src/app/modules/dashboard/components/template-stats/template-stats.component.html b/apps/red-ui/src/app/modules/dashboard/components/template-stats/template-stats.component.html
index ea1fd5a08..7c479b1dc 100644
--- a/apps/red-ui/src/app/modules/dashboard/components/template-stats/template-stats.component.html
+++ b/apps/red-ui/src/app/modules/dashboard/components/template-stats/template-stats.component.html
@@ -2,7 +2,7 @@
*ngIf="stats as dossierTemplate"
[class.empty]="dossierTemplate.isEmpty"
[routerLink]="dossierTemplate.isEmpty ? null : ['..', dossierTemplate.dossierTemplateId]"
- [attr.help-mode-key]="!dossierTemplate.isEmpty ? 'dossier_overview' : null"
+ [attr.help-mode-key]="!dossierTemplate.isEmpty ? 'open_dossier_template' : null"
class="dialog"
>
@@ -13,7 +13,7 @@
@@ -21,20 +21,18 @@
-
+
@@ -44,7 +42,7 @@
[config]="translateChartService.translateDossierStates(dossierTemplate.dossiersChartConfig, dossierTemplate.id)"
[radius]="63"
[strokeWidth]="15"
- [subtitles]="['dossier-template-stats.active-dossiers' | translate : { count: dossierTemplate.numberOfActiveDossiers }]"
+ [subtitles]="['dossier-template-stats.active-dossiers' | translate: { count: dossierTemplate.numberOfActiveDossiers }]"
direction="row"
totalType="sum"
>
@@ -76,7 +74,7 @@
*ngIf="permissionsService.canCreateDossier(dossierTemplate)"
[label]="'dashboard.empty-template.new-dossier' | translate"
[type]="iconButtonTypes.primary"
- [attr.help-mode-key]="'new_dossier_button'"
+ [attr.help-mode-key]="'new_dossier'"
icon="iqser:plus"
>
diff --git a/apps/red-ui/src/assets/help-mode/help-mode-keys.json b/apps/red-ui/src/assets/help-mode/help-mode-keys.json
index e6765529b..27a5d1a00 100644
--- a/apps/red-ui/src/assets/help-mode/help-mode-keys.json
+++ b/apps/red-ui/src/assets/help-mode/help-mode-keys.json
@@ -27,14 +27,19 @@
"documentKey": "filter_dossier_list"
},
{
- "elementKey": "navigate_in_breadcrumbs",
- "documentKey": "navigate_in_breadcrumbs"
+ "elementKey": "navigate_breadcrumbs",
+ "documentKey": "navigate_breadcrumbs"
},
{
"elementKey": "new_dossier_button",
"documentKey": "new_dossier_button",
"overlappingElements": ["USER_MENU"]
},
+ {
+ "elementKey": "new_dossier",
+ "documentKey": "new_dossier",
+ "overlappingElements": ["USER_MENU"]
+ },
{
"elementKey": "open_notifications",
"documentKey": "open_notifications"
@@ -48,8 +53,8 @@
"documentKey": "views"
},
{
- "elementKey": "search_in_entire_application",
- "documentKey": "search_in_entire_application"
+ "elementKey": "search_entire_application",
+ "documentKey": "search_entire_application"
},
{
"elementKey": "edit_dossier_in_dossier",
@@ -155,8 +160,20 @@
"overlappingElements": ["USER_MENU", "DOCUMENT_INFO"]
},
{
- "elementKey": "user_account",
- "documentKey": "user_account"
+ "elementKey": "my_profile",
+ "documentKey": "my_profile"
+ },
+ {
+ "elementKey": "notification_preferences",
+ "documentKey": "notification_preferences"
+ },
+ {
+ "elementKey": "user_preferences",
+ "documentKey": "user_preferences"
+ },
+ {
+ "elementKey": "prompts_and_dialogs",
+ "documentKey": "prompts_and_dialogs"
},
{
"elementKey": "my_downloads",
@@ -167,8 +184,8 @@
"documentKey": "trash"
},
{
- "elementKey": "dossier_overview",
- "documentKey": "dossier_overview"
+ "elementKey": "open_dossier_template",
+ "documentKey": "open_dossier_template"
},
{
"elementKey": "home",
@@ -189,7 +206,8 @@
{
"elementKey": "dossier",
"documentKey": "dossier",
- "scrollableParentView": "VIRTUAL_SCROLL"
+ "scrollableParentView": "VIRTUAL_SCROLL",
+ "overlappingElements": ["BREADCRUMBS_MENU"]
},
{
"elementKey": "document_in_editor",
@@ -198,7 +216,8 @@
},
{
"elementKey": "dossier_list",
- "documentKey": "dossier_list"
+ "documentKey": "dossier_list",
+ "overlappingElements": ["BREADCRUMBS_MENU"]
},
{
"elementKey": "dossier_templates",
@@ -210,13 +229,17 @@
"overlappingElements": ["USER_MENU"]
},
{
- "elementKey": "dossier_templates_info",
- "documentKey": "dossier_templates_info"
+ "elementKey": "user_dossier_template_info",
+ "documentKey": "user_dossier_template_info"
},
{
"elementKey": "entities",
"documentKey": "entities"
},
+ {
+ "elementKey": "user_dossier_template_entities",
+ "documentKey": "user_dossier_template_entities"
+ },
{
"elementKey": "edit_delete_entities",
"documentKey": "edit_delete_entities",
@@ -280,8 +303,8 @@
"overlappingElements": ["USER_MENU"]
},
{
- "elementKey": "dossier_states",
- "documentKey": "dossier_states"
+ "elementKey": "user_dossier_template_dossier_states",
+ "documentKey": "user_dossier_template_dossier_states"
},
{
"elementKey": "create_new_dossier_state",
@@ -296,6 +319,10 @@
"documentKey": "reports",
"overlappingElements": ["USER_MENU"]
},
+ {
+ "elementKey": "user_dossier_template_reports",
+ "documentKey": "user_dossier_template_reports"
+ },
{
"elementKey": "justifications",
"documentKey": "justifications"