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 27464cdbd..c6b7b8f21 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 @@ -25,7 +25,7 @@ [placeholder]="'search.placeholder' | translate" > - +
-
-
+
+
diff --git a/apps/red-ui/src/app/modules/account/base-account-screen/base-account-screen-component.ts b/apps/red-ui/src/app/modules/account/base-account-screen/base-account-screen-component.ts index 5345190e8..3305fc65f 100644 --- a/apps/red-ui/src/app/modules/account/base-account-screen/base-account-screen-component.ts +++ b/apps/red-ui/src/app/modules/account/base-account-screen/base-account-screen-component.ts @@ -11,14 +11,14 @@ import { accountTranslations } from '@translations/account-translations'; export class BaseAccountScreenComponent implements OnInit { readonly translations = accountTranslations; readonly path: string; - readonly shouldHideTitle: boolean; + readonly isWarningsScreen: boolean; constructor( private readonly _router: Router, private readonly _hostRef: ViewContainerRef, ) { this.path = this._router.url.split('/').pop(); - this.shouldHideTitle = this.path === 'warnings-preferences'; + this.isWarningsScreen = this.path === 'warnings-preferences'; } ngOnInit(): void { diff --git a/apps/red-ui/src/app/modules/account/screens/preferences/dialog-defaults/dialog-defaults.component.html b/apps/red-ui/src/app/modules/account/screens/preferences/dialog-defaults/dialog-defaults.component.html index 11a3af117..29a462da6 100644 --- a/apps/red-ui/src/app/modules/account/screens/preferences/dialog-defaults/dialog-defaults.component.html +++ b/apps/red-ui/src/app/modules/account/screens/preferences/dialog-defaults/dialog-defaults.component.html @@ -1,77 +1,79 @@ -
-
-

{{ 'dialog-defaults-form.title' | translate }}

-

{{ 'dialog-defaults-form.redaction.title' | translate }}

-
- - - - {{ - option.label | translate - }} - - - {{ - 'dialog-defaults-form.extra-option-label' | translate - }} +
+ +
+

{{ 'dialog-defaults-form.title' | translate }}

+

{{ 'dialog-defaults-form.redaction.title' | translate }}

+
+ + + + {{ + option.label | translate + }} + + + {{ + 'dialog-defaults-form.extra-option-label' | translate + }} +
+
+ + + + {{ + option.label | translate + }} + + + {{ + 'dialog-defaults-form.extra-option-label' | translate + }} +
+

{{ 'dialog-defaults-form.recommendation.title' | translate }}

+
+ + + + {{ + option.label | translate + }} + + + {{ + 'dialog-defaults-form.extra-option-label' | translate + }} +
+

{{ 'dialog-defaults-form.hint.title' | translate }}

+
+ + + + {{ option.label | translate }} + + + {{ + 'dialog-defaults-form.extra-option-label' | translate + }} +
+
+ + + + {{ option.label | translate }} + + + {{ + 'dialog-defaults-form.extra-option-label' | translate + }} +
-
- - - - {{ - option.label | translate - }} - - - {{ - 'dialog-defaults-form.extra-option-label' | translate - }} +
+
-

{{ 'dialog-defaults-form.recommendation.title' | translate }}

-
- - - - {{ - option.label | translate - }} - - - {{ - 'dialog-defaults-form.extra-option-label' | translate - }} -
-

{{ 'dialog-defaults-form.hint.title' | translate }}

-
- - - - {{ option.label | translate }} - - - {{ - 'dialog-defaults-form.extra-option-label' | translate - }} -
-
- - - - {{ option.label | translate }} - - - {{ - 'dialog-defaults-form.extra-option-label' | translate - }} -
-
-
- -
- + +
diff --git a/apps/red-ui/src/app/modules/account/screens/preferences/dialog-defaults/dialog-defaults.component.scss b/apps/red-ui/src/app/modules/account/screens/preferences/dialog-defaults/dialog-defaults.component.scss index 4584dd57c..931d87f46 100644 --- a/apps/red-ui/src/app/modules/account/screens/preferences/dialog-defaults/dialog-defaults.component.scss +++ b/apps/red-ui/src/app/modules/account/screens/preferences/dialog-defaults/dialog-defaults.component.scss @@ -2,6 +2,15 @@ mat-checkbox { margin: 8px 0 0 8px; } -.dialog-actions { - border-top: none; +h3 { + margin-top: 24px; + margin-bottom: 4px; +} + +form .iqser-input-group:not(first-of-type) { + margin-top: 8px; +} + +.dialog { + margin-bottom: 0; } diff --git a/apps/red-ui/src/app/modules/account/screens/preferences/preferences.component.html b/apps/red-ui/src/app/modules/account/screens/preferences/preferences.component.html index d8954aa2d..ad1f6dd44 100644 --- a/apps/red-ui/src/app/modules/account/screens/preferences/preferences.component.html +++ b/apps/red-ui/src/app/modules/account/screens/preferences/preferences.component.html @@ -1,47 +1,53 @@ -
-
-
-
- -
- - {{ 'preferences-screen.form.auto-expand-filters-on-action' | translate }} - -
+
+ +
+
+ +
+ + {{ 'preferences-screen.form.auto-expand-filters-on-action' | translate }} + +
-
- - {{ 'preferences-screen.form.open-structured-view-by-default' | translate }} - -
+
+ + {{ 'preferences-screen.form.open-structured-view-by-default' | translate }} + +
-
- - -
-
+
+ + +
+ - -

{{ 'preferences-screen.warnings-subtitle' | translate }}

-

{{ 'preferences-screen.warnings-description' | translate }}

+ +

{{ 'preferences-screen.warnings-subtitle' | translate }}

+

{{ 'preferences-screen.warnings-description' | translate }}

-
- - {{ 'preferences-screen.form.load-all-annotations-warning' | translate }} - -
-
+
+ + {{ 'preferences-screen.form.load-all-annotations-warning' | translate }} + +
+
+ + {{ 'preferences-screen.form.help-mode-dialog' | translate }} + +
+
+
-
-
- -
- +
+ +
+ +
diff --git a/apps/red-ui/src/app/modules/account/screens/preferences/preferences.component.scss b/apps/red-ui/src/app/modules/account/screens/preferences/preferences.component.scss index efe894308..76f9b7458 100644 --- a/apps/red-ui/src/app/modules/account/screens/preferences/preferences.component.scss +++ b/apps/red-ui/src/app/modules/account/screens/preferences/preferences.component.scss @@ -1,9 +1,3 @@ -@use 'variables'; - -.content-delimiter { - border-top: 1px solid var(--iqser-separator); -} - .warnings-description { width: 105%; } diff --git a/apps/red-ui/src/app/modules/account/screens/preferences/preferences.component.ts b/apps/red-ui/src/app/modules/account/screens/preferences/preferences.component.ts index 0d640eb8d..c33a60f26 100644 --- a/apps/red-ui/src/app/modules/account/screens/preferences/preferences.component.ts +++ b/apps/red-ui/src/app/modules/account/screens/preferences/preferences.component.ts @@ -1,7 +1,7 @@ import { ChangeDetectionStrategy, ChangeDetectorRef, Component, OnInit } from '@angular/core'; import { FormBuilder, FormGroup } from '@angular/forms'; import { ActivatedRoute } from '@angular/router'; -import { BaseFormComponent, getConfig, IqserPermissionsService, isIqserDevMode, LoadingService } from '@iqser/common-ui'; +import { BaseFormComponent, getConfig, IqserPermissionsService, isIqserDevMode, KEYS, LoadingService } from '@iqser/common-ui'; import { AsControl } from '@iqser/common-ui/lib/utils'; import { Roles } from '@users/roles'; import { PreferencesKeys, UserPreferenceService } from '@users/user-preference.service'; @@ -13,6 +13,7 @@ interface PreferencesForm { tableExtractionType: string; // warnings preferences loadAllAnnotationsWarning: boolean; + helpModeDialog: boolean; [k: string]: any; } @@ -55,6 +56,7 @@ export class PreferencesComponent extends BaseFormComponent implements OnInit { tableExtractionType: [this.userPreferenceService.getTableExtractionType()], // warnings preferences loadAllAnnotationsWarning: [this.userPreferenceService.getBool(PreferencesKeys.loadAllAnnotationsWarning)], + helpModeDialog: [this.userPreferenceService.getBool(KEYS.helpModeDialog)], }); if (!this._permissionsService.has(Roles.managePreferences)) { @@ -95,6 +97,10 @@ export class PreferencesComponent extends BaseFormComponent implements OnInit { ); } + if (this.form.controls.helpModeDialog.value !== this.userPreferenceService.getBool(KEYS.helpModeDialog)) { + await this.userPreferenceService.save(KEYS.helpModeDialog, String(this.form.controls.helpModeDialog.value)); + } + await this.userPreferenceService.reload(); this.#patchValues(); @@ -108,6 +114,7 @@ export class PreferencesComponent extends BaseFormComponent implements OnInit { openScmDialogByDefault: this.userPreferenceService.getOpenScmDialogByDefault(), tableExtractionType: this.userPreferenceService.getTableExtractionType(), loadAllAnnotationsWarning: this.userPreferenceService.getBool(PreferencesKeys.loadAllAnnotationsWarning), + helpModeDialog: this.userPreferenceService.getBool(KEYS.helpModeDialog), }); } } diff --git a/apps/red-ui/src/app/modules/admin/dialogs/add-edit-dossier-template-dialog/add-edit-clone-dossier-template-dialog.component.html b/apps/red-ui/src/app/modules/admin/dialogs/add-edit-dossier-template-dialog/add-edit-clone-dossier-template-dialog.component.html index e48d987f3..8d93d72aa 100644 --- a/apps/red-ui/src/app/modules/admin/dialogs/add-edit-dossier-template-dialog/add-edit-clone-dossier-template-dialog.component.html +++ b/apps/red-ui/src/app/modules/admin/dialogs/add-edit-dossier-template-dialog/add-edit-clone-dossier-template-dialog.component.html @@ -151,10 +151,7 @@ [buttonId]="'saveButton'" > - +
diff --git a/apps/red-ui/src/app/modules/admin/dialogs/add-entity-dialog/add-entity-dialog.component.html b/apps/red-ui/src/app/modules/admin/dialogs/add-entity-dialog/add-entity-dialog.component.html index 5acca05b3..e795801a3 100644 --- a/apps/red-ui/src/app/modules/admin/dialogs/add-entity-dialog/add-entity-dialog.component.html +++ b/apps/red-ui/src/app/modules/admin/dialogs/add-entity-dialog/add-entity-dialog.component.html @@ -16,7 +16,7 @@ [type]="iconButtonTypes.primary" > - +
diff --git a/apps/red-ui/src/app/modules/admin/screens/entities/screens/entity-info/entity-info.component.html b/apps/red-ui/src/app/modules/admin/screens/entities/screens/entity-info/entity-info.component.html index d6c524524..22a89ba5b 100644 --- a/apps/red-ui/src/app/modules/admin/screens/entities/screens/entity-info/entity-info.component.html +++ b/apps/red-ui/src/app/modules/admin/screens/entities/screens/entity-info/entity-info.component.html @@ -27,7 +27,7 @@
- +
diff --git a/apps/red-ui/src/app/modules/admin/screens/file-attributes-listing/add-edit-file-attribute-dialog/add-edit-file-attribute-dialog.component.html b/apps/red-ui/src/app/modules/admin/screens/file-attributes-listing/add-edit-file-attribute-dialog/add-edit-file-attribute-dialog.component.html index ff2097450..ef389318d 100644 --- a/apps/red-ui/src/app/modules/admin/screens/file-attributes-listing/add-edit-file-attribute-dialog/add-edit-file-attribute-dialog.component.html +++ b/apps/red-ui/src/app/modules/admin/screens/file-attributes-listing/add-edit-file-attribute-dialog/add-edit-file-attribute-dialog.component.html @@ -1,5 +1,5 @@
-
+
@@ -51,7 +51,7 @@ - +
diff --git a/apps/red-ui/src/app/modules/file-preview/dialogs/edit-redaction-dialog/edit-redaction-dialog.component.html b/apps/red-ui/src/app/modules/file-preview/dialogs/edit-redaction-dialog/edit-redaction-dialog.component.html index b73fa0ade..58636d2b0 100644 --- a/apps/red-ui/src/app/modules/file-preview/dialogs/edit-redaction-dialog/edit-redaction-dialog.component.html +++ b/apps/red-ui/src/app/modules/file-preview/dialogs/edit-redaction-dialog/edit-redaction-dialog.component.html @@ -116,7 +116,7 @@
- +
diff --git a/apps/red-ui/src/app/modules/file-preview/dialogs/force-redaction-dialog/force-annotation-dialog.component.html b/apps/red-ui/src/app/modules/file-preview/dialogs/force-redaction-dialog/force-annotation-dialog.component.html index 1b45af6e6..3c4c15b55 100644 --- a/apps/red-ui/src/app/modules/file-preview/dialogs/force-redaction-dialog/force-annotation-dialog.component.html +++ b/apps/red-ui/src/app/modules/file-preview/dialogs/force-redaction-dialog/force-annotation-dialog.component.html @@ -44,7 +44,7 @@ > - +
diff --git a/apps/red-ui/src/app/modules/file-preview/dialogs/highlight-action-dialog/highlight-action-dialog.component.html b/apps/red-ui/src/app/modules/file-preview/dialogs/highlight-action-dialog/highlight-action-dialog.component.html index 6f104f52e..90d8d8ae5 100644 --- a/apps/red-ui/src/app/modules/file-preview/dialogs/highlight-action-dialog/highlight-action-dialog.component.html +++ b/apps/red-ui/src/app/modules/file-preview/dialogs/highlight-action-dialog/highlight-action-dialog.component.html @@ -23,7 +23,7 @@
- {{ translations[data.operation].confirmation | translate : { count: data.highlights.length } }} + {{ translations[data.operation].confirmation | translate: { count: data.highlights.length } }}
@@ -39,7 +39,7 @@
- + diff --git a/apps/red-ui/src/app/modules/file-preview/dialogs/remove-redaction-dialog/remove-redaction-dialog.component.html b/apps/red-ui/src/app/modules/file-preview/dialogs/remove-redaction-dialog/remove-redaction-dialog.component.html index 1acb8a0e6..57a5a3655 100644 --- a/apps/red-ui/src/app/modules/file-preview/dialogs/remove-redaction-dialog/remove-redaction-dialog.component.html +++ b/apps/red-ui/src/app/modules/file-preview/dialogs/remove-redaction-dialog/remove-redaction-dialog.component.html @@ -39,7 +39,7 @@
- + diff --git a/apps/red-ui/src/app/modules/shared-dossiers/dialogs/edit-dossier-dialog/edit-dossier-dialog.component.html b/apps/red-ui/src/app/modules/shared-dossiers/dialogs/edit-dossier-dialog/edit-dossier-dialog.component.html index b8160faad..e4961c79b 100644 --- a/apps/red-ui/src/app/modules/shared-dossiers/dialogs/edit-dossier-dialog/edit-dossier-dialog.component.html +++ b/apps/red-ui/src/app/modules/shared-dossiers/dialogs/edit-dossier-dialog/edit-dossier-dialog.component.html @@ -74,7 +74,7 @@
- + diff --git a/apps/red-ui/src/app/modules/shared/dialogs/add-dossier-dialog/add-dossier-dialog.component.html b/apps/red-ui/src/app/modules/shared/dialogs/add-dossier-dialog/add-dossier-dialog.component.html index 4b42e518a..56a0eb045 100644 --- a/apps/red-ui/src/app/modules/shared/dialogs/add-dossier-dialog/add-dossier-dialog.component.html +++ b/apps/red-ui/src/app/modules/shared/dialogs/add-dossier-dialog/add-dossier-dialog.component.html @@ -121,7 +121,7 @@ icon="red:assign" > - + diff --git a/apps/red-ui/src/assets/i18n/redact/de.json b/apps/red-ui/src/assets/i18n/redact/de.json index 29b01990b..c92861f44 100644 --- a/apps/red-ui/src/assets/i18n/redact/de.json +++ b/apps/red-ui/src/assets/i18n/redact/de.json @@ -367,7 +367,6 @@ "annotation": { "pending": "(Pending analysis)" }, - "annotations": "", "archived-dossiers-listing": { "no-data": { "title": "No archived dossiers." @@ -1643,9 +1642,11 @@ }, "help-mode": { "bottom-text": "Hilfe-Modus", - "button-text": "Help mode (H)", "clicking-anywhere-on": "Klicken Sie auf eine beliebige Stelle des Bildschirms um zu sehen, welche Bereiche interaktiv sind. Wenn Sie mit der Maus über einen interaktiven Bereich fahren, verändert sich der Mauszeiger, um Ihnen zu zeigen, ob ein Element interaktiv ist.", "instructions": "Hilfe-Modus-Anleitungen öffnen", + "options": { + "do-not-show-again": "" + }, "welcome-to-help-mode": " Willkommen im Hilfe-Modus!
Klicken Sie auf interaktive Elemente, um in einem neuen Tab Infos dazu zu erhalten.
" }, "highlight-action-dialog": { @@ -1969,6 +1970,7 @@ }, "form": { "auto-expand-filters-on-action": "Auto-expand filters on my actions", + "help-mode-dialog": "", "load-all-annotations-warning": "Warning regarding loading all annotations at once in file preview", "open-structured-view-by-default": "Display structured component management modal by default", "table-extraction-type": "Table extraction type" diff --git a/apps/red-ui/src/assets/i18n/redact/en.json b/apps/red-ui/src/assets/i18n/redact/en.json index 6b06cd7d5..a698d6731 100644 --- a/apps/red-ui/src/assets/i18n/redact/en.json +++ b/apps/red-ui/src/assets/i18n/redact/en.json @@ -1643,9 +1643,11 @@ }, "help-mode": { "bottom-text": "Help mode", - "button-text": "Help mode (H)", "clicking-anywhere-on": " Clicking anywhere on the screen will show you which areas are interactive. Hovering an interactive area will change the mouse cursor to let you know if the element is interactive.", "instructions": "Open help mode instructions", + "options": { + "do-not-show-again": "Do not show again" + }, "welcome-to-help-mode": " Welcome to help mode!
Clicking on interactive elements will open info about them in new tab.
" }, "highlight-action-dialog": { @@ -1969,6 +1971,7 @@ }, "form": { "auto-expand-filters-on-action": "Auto-expand filters on my actions", + "help-mode-dialog": "Help Mode Dialog", "load-all-annotations-warning": "Warning regarding loading all annotations at once in file preview", "open-structured-view-by-default": "Display structured component management modal by default", "table-extraction-type": "Table extraction type" diff --git a/apps/red-ui/src/assets/i18n/scm/de.json b/apps/red-ui/src/assets/i18n/scm/de.json index 6f0e37608..464198d20 100644 --- a/apps/red-ui/src/assets/i18n/scm/de.json +++ b/apps/red-ui/src/assets/i18n/scm/de.json @@ -367,7 +367,6 @@ "annotation": { "pending": "(Pending analysis)" }, - "annotations": "", "archived-dossiers-listing": { "no-data": { "title": "No archived dossiers." @@ -1643,9 +1642,11 @@ }, "help-mode": { "bottom-text": "Hilfe-Modus", - "button-text": "Help mode (H)", "clicking-anywhere-on": "Klicken Sie auf eine beliebige Stelle des Bildschirms um zu sehen, welche Bereiche interaktiv sind. Wenn Sie mit der Maus über einen interaktiven Bereich fahren, verändert sich der Mauszeiger, um Ihnen zu zeigen, ob ein Element interaktiv ist.", "instructions": "Hilfe-Modus-Anleitungen öffnen", + "options": { + "do-not-show-again": "" + }, "welcome-to-help-mode": " Willkommen im Hilfe-Modus!
Klicken Sie auf interaktive Elemente, um in einem neuen Tab Infos dazu zu erhalten.
" }, "highlight-action-dialog": { @@ -1969,6 +1970,7 @@ }, "form": { "auto-expand-filters-on-action": "Auto expand filters on my actions", + "help-mode-dialog": "", "load-all-annotations-warning": "Warning regarding loading all annotations at once in file preview", "open-structured-view-by-default": "Display Component View by default when opening a document", "table-extraction-type": "Table extraction type" diff --git a/apps/red-ui/src/assets/i18n/scm/en.json b/apps/red-ui/src/assets/i18n/scm/en.json index 396eb3396..cc0d3ace5 100644 --- a/apps/red-ui/src/assets/i18n/scm/en.json +++ b/apps/red-ui/src/assets/i18n/scm/en.json @@ -1643,9 +1643,11 @@ }, "help-mode": { "bottom-text": "Help mode", - "button-text": "Help mode (H)", "clicking-anywhere-on": " Clicking anywhere on the screen will show you which areas are interactive. Hovering an interactive area will change the mouse cursor to let you know if the element is interactive.", "instructions": "Open help mode instructions", + "options": { + "do-not-show-again": "Do not show again" + }, "welcome-to-help-mode": " Welcome to help mode!
Clicking on interactive elements will open info about them in new tab.
" }, "highlight-action-dialog": { @@ -1969,6 +1971,7 @@ }, "form": { "auto-expand-filters-on-action": "Auto expand filters on my actions", + "help-mode-dialog": "Help Mode Dialog", "load-all-annotations-warning": "Warning regarding loading all annotations at once in file preview", "open-structured-view-by-default": "Display Component View by default when opening a document", "table-extraction-type": "Table extraction type"