diff --git a/client/src/app/give-feedback/give-feedback/give-feedback.component.html b/client/src/app/give-feedback/give-feedback/give-feedback.component.html index d797a23e..4d7a7a43 100644 --- a/client/src/app/give-feedback/give-feedback/give-feedback.component.html +++ b/client/src/app/give-feedback/give-feedback/give-feedback.component.html @@ -11,6 +11,8 @@ matTooltipPosition="left" matTooltip="Brouillons" i18n-matTooltip="@@Title.Drafts" + aria-label="Brouillons" + i18n-aria-label="@@Title.Drafts" (click)="openDraftDialog()" > edit_note diff --git a/client/src/app/request-feedback/request-feedback.component.html b/client/src/app/request-feedback/request-feedback.component.html index 2972f10b..007485fe 100644 --- a/client/src/app/request-feedback/request-feedback.component.html +++ b/client/src/app/request-feedback/request-feedback.component.html @@ -61,10 +61,10 @@

> - +

+

Message

} @if (feedback.status === 'done') { -

Points positifs

+

Points positifs

-

Axes d'améliorations

+

Axes d'améliorations

@if (feedback.comment) { -

Commentaire

+

Commentaire

} } diff --git a/client/src/app/shared/feedback/feedback-list/feedback-list.component.html b/client/src/app/shared/feedback/feedback-list/feedback-list.component.html index 1c794d33..29602585 100644 --- a/client/src/app/shared/feedback/feedback-list/feedback-list.component.html +++ b/client/src/app/shared/feedback/feedback-list/feedback-list.component.html @@ -55,11 +55,8 @@ class="gbl-sys-primary-hover" mat-icon-button matTooltipPosition="left" - [matTooltip]=" - nf(element).type === 'received' || nf(element).type === 'given' - ? viewFeedbackTooltip - : viewFeedbackRequestTooltip - " + [matTooltip]="getActionLabel(nf(element).type)" + [attr.aria-label]="getActionLabel(nf(element).type)" [routerLink]="[asManager() ? '/manager/document' : '/history/id', nf(element).id]" > visibility @@ -72,6 +69,8 @@ matTooltipPosition="right" matTooltip=" Répondre " i18n-matTooltip="@@Feedback.Reply" + aria-label=" Répondre " + i18n-aria-label="@@Feedback.Reply" [appGiveRequestedFeedback]="nf(element).id" > edit diff --git a/client/src/app/shared/feedback/feedback-list/feedback-list.component.ts b/client/src/app/shared/feedback/feedback-list/feedback-list.component.ts index 96c7b204..1f1db356 100644 --- a/client/src/app/shared/feedback/feedback-list/feedback-list.component.ts +++ b/client/src/app/shared/feedback/feedback-list/feedback-list.component.ts @@ -21,7 +21,7 @@ import { RouterLink } from '@angular/router'; import { BreakpointService } from '../../breakpoint'; import { SlashModule } from '../../slash'; import { FeedbackTypeIconPipe } from '../feedback-type-icon.pipe'; -import { NormalizedFeedback } from '../feedback.types'; +import { FeedbackType, NormalizedFeedback } from '../feedback.types'; import { GiveRequestedFeedbackDirective } from '../give-requested-feedback.directive'; @Component({ @@ -67,10 +67,6 @@ export class FeedbackListComponent implements AfterViewInit { return this.dataSource.data.length > this.pageSizeOptions[0]; } - readonly viewFeedbackTooltip = $localize`:@@Action.ViewFeedback:Consulter le feedZback`; - - readonly viewFeedbackRequestTooltip = $localize`:@@Action.ViewFeedbackRequest:Consulter la demande`; - private isMobile = false; constructor() { @@ -98,6 +94,12 @@ export class FeedbackListComponent implements AfterViewInit { return value as NormalizedFeedback; } + protected getActionLabel(type: FeedbackType) { + return type === 'received' || type === 'given' + ? $localize`:@@Action.ViewFeedback:Consulter le feedZback` + : $localize`:@@Action.ViewFeedbackRequest:Consulter la demande`; + } + private init() { this.linkDataSource(); this.applyFilter(this.filter()); diff --git a/client/src/styles/common.scss b/client/src/styles/common.scss index 3971d2e5..0ce4d7b0 100644 --- a/client/src/styles/common.scss +++ b/client/src/styles/common.scss @@ -31,6 +31,17 @@ h1.gbl-page-title { } } +/* ----- button less ----- */ + +.gbl-button-less { + padding: 0; + border: none; + background: none; + color: inherit; + line-height: inherit; + font: inherit; +} + /* ----- Link ----- */ .gbl-link { @@ -162,17 +173,6 @@ ul.gbl-list { } } -/* ----- button less ----- */ - -.gbl-button-less { - padding: 0; - border: none; - background: none; - color: inherit; - line-height: inherit; - font: inherit; -} - /* ----- Overlay menu ----- */ .gbl-overlay-menu {