diff --git a/apps/red-ui/src/app/components/notifications/notifications.component.html b/apps/red-ui/src/app/components/notifications/notifications.component.html index 517a15f89..8b65174a4 100644 --- a/apps/red-ui/src/app/components/notifications/notifications.component.html +++ b/apps/red-ui/src/app/components/notifications/notifications.component.html @@ -1,6 +1,8 @@ diff --git a/apps/red-ui/src/app/modules/dossier-overview/components/dossier-details/dossier-details.component.html b/apps/red-ui/src/app/modules/dossier-overview/components/dossier-details/dossier-details.component.html index bb343b8be..bf4d3b642 100644 --- a/apps/red-ui/src/app/modules/dossier-overview/components/dossier-details/dossier-details.component.html +++ b/apps/red-ui/src/app/modules/dossier-overview/components/dossier-details/dossier-details.component.html @@ -23,7 +23,6 @@ [icon]="'iqser:edit'" [iqserHelpMode]="'dashboard_in_dossier'" [overlappingElements]="['USER_MENU']" - [tooltipPosition]="'below'" [tooltip]="'dossier-details.edit-owner' | translate" class="ml-14" > diff --git a/apps/red-ui/src/app/modules/dossier-overview/components/screen-header/dossier-overview-screen-header.component.html b/apps/red-ui/src/app/modules/dossier-overview/components/screen-header/dossier-overview-screen-header.component.html index 1610f806f..85a93243d 100644 --- a/apps/red-ui/src/app/modules/dossier-overview/components/screen-header/dossier-overview-screen-header.component.html +++ b/apps/red-ui/src/app/modules/dossier-overview/components/screen-header/dossier-overview-screen-header.component.html @@ -13,7 +13,6 @@ [files]="entitiesService.all$ | async" [iqserHelpMode]="'edit_dossier_in_dossier'" [overlappingElements]="['USER_MENU']" - [tooltipPosition]="'below'" > @@ -33,7 +31,6 @@ [disabled]="listingService.areSomeSelected$ | async" [icon]="'iqser:refresh'" [tooltipClass]="'small warn'" - [tooltipPosition]="'below'" [tooltip]="'dossier-overview.new-rule.toast.actions.reanalyse-all' | translate" [type]="circleButtonTypes.warn" > @@ -45,7 +42,6 @@ [icon]="'iqser:upload'" [iqserHelpMode]="'edit_dossier_in_dossier'" [overlappingElements]="['USER_MENU']" - [tooltipPosition]="'below'" [tooltip]="'dossier-overview.header-actions.upload-document' | translate" [type]="circleButtonTypes.primary" class="ml-14" diff --git a/apps/red-ui/src/app/modules/file-preview/components/user-management/user-management.component.html b/apps/red-ui/src/app/modules/file-preview/components/user-management/user-management.component.html index 6684b0f1b..544237635 100644 --- a/apps/red-ui/src/app/modules/file-preview/components/user-management/user-management.component.html +++ b/apps/red-ui/src/app/modules/file-preview/components/user-management/user-management.component.html @@ -9,7 +9,6 @@ @@ -38,7 +37,6 @@ [icon]="'iqser:edit'" [iqserHelpMode]="'document_features_in_editor'" [overlappingElements]="['USER_MENU']" - [tooltipPosition]="'below'" [tooltip]="assignTooltip$ | async" > @@ -46,7 +44,6 @@ (action)="fileAssignService.assignToMe([file])" *ngIf="canAssignToSelf$ | async" [icon]="'red:assign-me'" - [tooltipPosition]="'below'" [tooltip]="'file-preview.assign-me' | translate" buttonId="assign-me" > diff --git a/apps/red-ui/src/app/modules/file-preview/components/view-switch/view-switch.component.html b/apps/red-ui/src/app/modules/file-preview/components/view-switch/view-switch.component.html index ec5944a2b..2ced8dc13 100644 --- a/apps/red-ui/src/app/modules/file-preview/components/view-switch/view-switch.component.html +++ b/apps/red-ui/src/app/modules/file-preview/components/view-switch/view-switch.component.html @@ -4,12 +4,13 @@ [class.active]="viewMode === viewModes.STANDARD" [iqserHelpMode]="'views'" [matTooltip]="'file-preview.standard-tooltip' | translate" + [matTooltipPosition]="'above'" class="red-tab" > {{ 'file-preview.standard' | translate }} -
+
-
+
-
+
diff --git a/apps/red-ui/src/app/modules/shared-dossiers/components/file-actions/file-actions.component.ts b/apps/red-ui/src/app/modules/shared-dossiers/components/file-actions/file-actions.component.ts index 287b6a518..2f55e51cb 100644 --- a/apps/red-ui/src/app/modules/shared-dossiers/components/file-actions/file-actions.component.ts +++ b/apps/red-ui/src/app/modules/shared-dossiers/components/file-actions/file-actions.component.ts @@ -8,7 +8,7 @@ import { getCurrentUser, IConfirmationDialogData, IqserPermissionsService, - IqserTooltipPosition, + IqserTooltipPositions, LoadingService, OverlappingElements, ScrollableParentView, @@ -76,7 +76,7 @@ export class FileActionsComponent implements OnChanges { isDossierOverviewList = false; isDossierOverviewWorkflow = false; isFilePreview = false; - tooltipPosition: IqserTooltipPosition; + tooltipPosition = IqserTooltipPositions.above; buttons: Action[]; scrollableParentView: ScrollableParentView; @@ -416,8 +416,6 @@ export class FileActionsComponent implements OnChanges { this.isDossierOverview = this.type.startsWith('dossier-overview'); this.isFilePreview = this.type === 'file-preview'; - this.tooltipPosition = this.isFilePreview ? 'below' : 'above'; - this.assignTooltip = this.file.isUnderApproval ? _('dossier-overview.assign-approver') : _('dossier-overview.assign-reviewer'); this.buttonType = this.isFilePreview ? CircleButtonTypes.default : CircleButtonTypes.dark; this.showAssign = diff --git a/apps/red-ui/src/assets/i18n/redact/de.json b/apps/red-ui/src/assets/i18n/redact/de.json index ba2c6f114..6abce8b1d 100644 --- a/apps/red-ui/src/assets/i18n/redact/de.json +++ b/apps/red-ui/src/assets/i18n/redact/de.json @@ -6,6 +6,9 @@ }, "multiple-values": "" }, + "user-menu": { + "button-text": "" + }, "account-settings": "Account Einstellungen", "actions": { "all": "Alle", @@ -1767,7 +1770,8 @@ "deleted-dossier": "", "label": "Benachrichtigungen", "mark-all-as-read": "Alle als gelesen markieren", - "mark-as": "" + "mark-as": "", + "button-text": "" }, "ocr": { "confirmation-dialog": { diff --git a/apps/red-ui/src/assets/i18n/redact/en.json b/apps/red-ui/src/assets/i18n/redact/en.json index a6950c81d..43581d4fa 100644 --- a/apps/red-ui/src/assets/i18n/redact/en.json +++ b/apps/red-ui/src/assets/i18n/redact/en.json @@ -6,6 +6,9 @@ }, "multiple-values": "Multiple recommendations selected" }, + "user-menu": { + "button-text": "User menu" + }, "account-settings": "Account Settings", "actions": { "all": "All", @@ -1767,7 +1770,8 @@ "deleted-dossier": "Deleted Dossier", "label": "Notifications", "mark-all-as-read": "Mark all as read", - "mark-as": "Mark as {type, select, read{read} unread{unread} other{}}" + "mark-as": "Mark as {type, select, read{read} unread{unread} other{}}", + "button-text": "Notifications" }, "ocr": { "confirmation-dialog": { diff --git a/libs/common-ui b/libs/common-ui index ba21886e2..bb562d63f 160000 --- a/libs/common-ui +++ b/libs/common-ui @@ -1 +1 @@ -Subproject commit ba21886e27187490c526816c4692c541384e1f5f +Subproject commit bb562d63fd5ccc353c71b1ca026caa8de5a42926