Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[#12664] - Instructor's Student Records Page: Accessibility issue for comment buttons #13155

Merged
merged 8 commits into from
Aug 2, 2024
Merged

[#12664] - Instructor's Student Records Page: Accessibility issue for comment buttons #13155

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
4e57995
Add voiceover accessibility to delete button and edit button
NeoHW Jul 28, 2024
a95341d
Edit cancel to come before save in dom
NeoHW Jul 28, 2024
667787a
Add margin space between cancel and save button
NeoHW Jul 28, 2024
0522f59
Update snapshot tests
NeoHW Jul 28, 2024
beedc96
Fix lint issues
NeoHW Jul 29, 2024
eb61739
Merge branch 'master' into FIX/12664/accessibility-comment-button
NeoHW Jul 29, 2024
2cbb82e
Merge branch 'master' into FIX/12664/accessibility-comment-button
NeoHW Jul 30, 2024
cdb9495
Merge branch 'master' into FIX/12664/accessibility-comment-button
domoberzin Jul 31, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
28 changes: 22 additions & 6 deletions src/web/app/components/comment-box/comment-edit-form/comment-edit-form.component.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,10 +47,26 @@
placeholderText="Enter your comment here" [isDisabled]="isDisabled"></tm-rich-text-editor>
</div>

<button type="button" class="btn btn-success btn-sm float-end btn-margin-left"
(click)="triggerSaveCommentEvent()" *ngIf="!shouldHideSavingButton" [disabled]="isDisabled"><i class="fas fa-save"></i>
{{ mode === CommentRowMode.EDIT ? 'Save' : 'Add' }}</button>
<div class="d-flex justify-content-end">
<button
type="button"
class="btn btn-light btn-sm me-2"
(click)="triggerCloseCommentBoxEvent()"
*ngIf="!shouldHideClosingButton"
[disabled]="isDisabled"
aria-label="Cancel editing">
<i class="fas fa-times"></i>
Cancel
</button>

<button type="button" class="btn btn-light btn-sm float-end"
(click)="triggerCloseCommentBoxEvent()" *ngIf="!shouldHideClosingButton" [disabled]="isDisabled"><i class="fas fa-times"></i>
Cancel</button>
<button
type="button"
class="btn btn-success btn-sm"
(click)="triggerSaveCommentEvent()"
*ngIf="!shouldHideSavingButton"
[disabled]="isDisabled"
aria-label="Save comment">
<i class="fas fa-save"></i>
{{ mode === CommentRowMode.EDIT ? 'Save' : 'Add' }}
</button>
</div>
NeoHW marked this conversation as resolved.
Show resolved Hide resolved
4 changes: 2 additions & 2 deletions src/web/app/components/comment-box/comment-row/comment-row.component.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,9 +34,9 @@

<div class="float-end">
<button type="button" class="btn-edit-comment btn btn-outline-primary btn-sm" *ngIf="!shouldHideEditButton" ngbTooltip='Edit this comment'
(click)="triggerModelChange('isEditing', true)" [disabled]="isDisabled"><i class="fas fa-pencil-alt"></i></button>
(click)="triggerModelChange('isEditing', true)" [disabled]="isDisabled" aria-label="Edit comment"><i class="fas fa-pencil-alt"></i></button>
<button type="button" class="btn-delete-comment btn btn-outline-primary btn-sm btn-margin-left" *ngIf="!shouldHideDeleteButton" ngbTooltip='Delete this comment'
(click)="triggerDeleteCommentEvent()" [disabled]="isDisabled"><i class="fas fa-trash"></i></button>
(click)="triggerDeleteCommentEvent()" [disabled]="isDisabled" aria-label="Delete comment"><i class="fas fa-trash"></i></button>
</div>
</div>
<div class="comment-text col-12" [innerHTML]="model.originalComment.commentText | safeHtml"></div>
Expand Down
52 changes: 35 additions & 17 deletions ...sion/session-submission-page/__snapshots__/session-submission-page.component.spec.ts.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1253,6 +1253,7 @@ exports[`SessionSubmissionPageComponent should snap with feedback session questi
class="float-end"
>
<button
aria-label="Edit comment"
class="btn-edit-comment btn btn-outline-primary btn-sm"
ngbtooltip="Edit this comment"
type="button"
Expand All @@ -1262,6 +1263,7 @@ exports[`SessionSubmissionPageComponent should snap with feedback session questi
/>
</button>
<button
aria-label="Delete comment"
class="btn-delete-comment btn btn-outline-primary btn-sm btn-margin-left"
ngbtooltip="Delete this comment"
type="button"
Expand Down Expand Up @@ -1535,15 +1537,20 @@ exports[`SessionSubmissionPageComponent should snap with feedback session questi
</div>
</tm-rich-text-editor>
</div>
<button
class="btn btn-light btn-sm float-end"
type="button"
<div
class="d-flex justify-content-end"
>
<i
class="fas fa-times"
/>
Cancel
</button>
<button
aria-label="Cancel editing"
class="btn btn-light btn-sm me-2"
type="button"
>
<i
class="fas fa-times"
/>
Cancel
</button>
</div>
</tm-comment-edit-form>
</tm-comment-row>
</div>
Expand Down Expand Up @@ -1959,6 +1966,7 @@ exports[`SessionSubmissionPageComponent should snap with feedback session questi
class="float-end"
>
<button
aria-label="Edit comment"
class="btn-edit-comment btn btn-outline-primary btn-sm"
ngbtooltip="Edit this comment"
type="button"
Expand All @@ -1968,6 +1976,7 @@ exports[`SessionSubmissionPageComponent should snap with feedback session questi
/>
</button>
<button
aria-label="Delete comment"
class="btn-delete-comment btn btn-outline-primary btn-sm btn-margin-left"
ngbtooltip="Delete this comment"
type="button"
Expand Down Expand Up @@ -4343,6 +4352,7 @@ exports[`SessionSubmissionPageComponent should snap with feedback session questi
class="float-end"
>
<button
aria-label="Edit comment"
class="btn-edit-comment btn btn-outline-primary btn-sm"
disabled=""
ngbtooltip="Edit this comment"
Expand All @@ -4353,6 +4363,7 @@ exports[`SessionSubmissionPageComponent should snap with feedback session questi
/>
</button>
<button
aria-label="Delete comment"
class="btn-delete-comment btn btn-outline-primary btn-sm btn-margin-left"
disabled=""
ngbtooltip="Delete this comment"
Expand Down Expand Up @@ -4624,16 +4635,21 @@ exports[`SessionSubmissionPageComponent should snap with feedback session questi
</div>
</tm-rich-text-editor>
</div>
<button
class="btn btn-light btn-sm float-end"
disabled=""
type="button"
<div
class="d-flex justify-content-end"
>
<i
class="fas fa-times"
/>
Cancel
</button>
<button
aria-label="Cancel editing"
class="btn btn-light btn-sm me-2"
disabled=""
type="button"
>
<i
class="fas fa-times"
/>
Cancel
</button>
</div>
</tm-comment-edit-form>
</tm-comment-row>
</div>
Expand Down Expand Up @@ -5052,6 +5068,7 @@ exports[`SessionSubmissionPageComponent should snap with feedback session questi
class="float-end"
>
<button
aria-label="Edit comment"
class="btn-edit-comment btn btn-outline-primary btn-sm"
disabled=""
ngbtooltip="Edit this comment"
Expand All @@ -5062,6 +5079,7 @@ exports[`SessionSubmissionPageComponent should snap with feedback session questi
/>
</button>
<button
aria-label="Delete comment"
class="btn-delete-comment btn btn-outline-primary btn-sm btn-margin-left"
disabled=""
ngbtooltip="Delete this comment"
Expand Down
Loading