diff --git a/src/app/components/creator/_dialogs/delete-comments/delete-comments.component.html b/src/app/components/creator/_dialogs/delete-comments/delete-comments.component.html index 5fa0fc81b0216bf2714121b2fb72a33924c2d7b8..85738fe9c252b3418156103a49e80db54046390c 100644 --- a/src/app/components/creator/_dialogs/delete-comments/delete-comments.component.html +++ b/src/app/components/creator/_dialogs/delete-comments/delete-comments.component.html @@ -1,4 +1,4 @@ -<h1 aria-labelledby="really-delete-comments">{{ 'room-page.sure' | translate }}</h1> +<h1>{{ 'room-page.sure' | translate }}</h1> <mat-divider></mat-divider> <p>{{ 'room-page.really-delete-comments' | translate }}</p> <div fxLayout="row" fxLayoutAlign="center" fxLayoutGap="10px"> @@ -9,7 +9,3 @@ {{ 'content.delete' | translate }} </button> </div> - -<div class="visually-hidden"> - <div id ="really-delete-comments">{{'room-page.really-delete-comments' | translate}}</div> -</div> diff --git a/src/app/components/creator/_dialogs/delete-comments/delete-comments.component.ts b/src/app/components/creator/_dialogs/delete-comments/delete-comments.component.ts index 555e26ea80b2b30b3b763d08bec8f09100698ae7..f8f3d9730140fc7d6b979aa7a5ad745bad4a0330 100644 --- a/src/app/components/creator/_dialogs/delete-comments/delete-comments.component.ts +++ b/src/app/components/creator/_dialogs/delete-comments/delete-comments.component.ts @@ -1,6 +1,7 @@ import { Component, Inject, OnInit } from '@angular/core'; import { MAT_DIALOG_DATA, MatDialogRef } from '@angular/material'; import { RoomEditComponent } from '../room-edit/room-edit.component'; +import { LiveAnnouncer } from '@angular/cdk/a11y'; @Component({ selector: 'app-delete-comment', @@ -10,9 +11,15 @@ import { RoomEditComponent } from '../room-edit/room-edit.component'; export class DeleteCommentsComponent implements OnInit { constructor(public dialogRef: MatDialogRef<RoomEditComponent>, - @Inject(MAT_DIALOG_DATA) public data: any) { } + @Inject(MAT_DIALOG_DATA) public data: any, + private liveAnnouncer: LiveAnnouncer) { } + ngOnInit() { + this.announce(); + } + public announce() { + this.liveAnnouncer.announce('Willst du wirklich alle Fragen dieser Session löschen?', 'assertive'); } close(type: string): void { diff --git a/src/app/components/creator/_dialogs/moderator-delete/moderator-delete.component.ts b/src/app/components/creator/_dialogs/moderator-delete/moderator-delete.component.ts index 3cabf69178af779a6b947de04f1d6167e8296016..90a6fda8218ec1021f3424190bda49b8c2c8938b 100644 --- a/src/app/components/creator/_dialogs/moderator-delete/moderator-delete.component.ts +++ b/src/app/components/creator/_dialogs/moderator-delete/moderator-delete.component.ts @@ -1,6 +1,7 @@ import { Component, Inject, OnInit } from '@angular/core'; import { MAT_DIALOG_DATA, MatDialogRef } from '@angular/material'; import { ModeratorsComponent } from '../moderators/moderators.component'; +import { LiveAnnouncer } from '@angular/cdk/a11y'; @Component({ selector: 'app-moderator-delete', @@ -12,11 +13,16 @@ export class ModeratorDeleteComponent implements OnInit { loginId: string; constructor(public dialogRef: MatDialogRef<ModeratorsComponent>, - @Inject(MAT_DIALOG_DATA) public data: any) { } + @Inject(MAT_DIALOG_DATA) public data: any, + private liveAnnouncer: LiveAnnouncer) { } ngOnInit() { - } + this.announce(); + } + public announce() { + this.liveAnnouncer.announce('Willst du wirklich diesen Moderator löschen?', 'assertive'); + } close(type: string): void { this.dialogRef.close(type); } diff --git a/src/app/components/creator/_dialogs/room-delete/room-delete.component.ts b/src/app/components/creator/_dialogs/room-delete/room-delete.component.ts index 347e0d56f05efd4749371de98449cffc24f97567..ac76ee5e8aa6607bf2a8049d15081fbf4cd4ad5d 100644 --- a/src/app/components/creator/_dialogs/room-delete/room-delete.component.ts +++ b/src/app/components/creator/_dialogs/room-delete/room-delete.component.ts @@ -2,6 +2,8 @@ import { Component, Inject, OnInit } from '@angular/core'; import { MAT_DIALOG_DATA, MatDialogRef } from '@angular/material'; import { Room } from '../../../../models/room'; import { RoomEditComponent } from '../room-edit/room-edit.component'; +import { LiveAnnouncer } from '@angular/cdk/a11y'; + @Component({ selector: 'app-room-delete', @@ -12,13 +14,19 @@ export class RoomDeleteComponent implements OnInit { room: Room; constructor(public dialogRef: MatDialogRef<RoomEditComponent>, - @Inject(MAT_DIALOG_DATA) public data: any) { - } + @Inject(MAT_DIALOG_DATA) public data: any, + private liveAnnouncer: LiveAnnouncer) { } + onNoClick(): void { this.dialogRef.close(); } ngOnInit() { + this.announce(); + } + public announce() { + this.liveAnnouncer.announce('Willst du die Session wirklich löschen? Diese Aktion kann nicht rückgängig gemacht werden.', 'assertive'); + } } diff --git a/src/app/components/creator/room-creator-page/room-creator-page.component.ts b/src/app/components/creator/room-creator-page/room-creator-page.component.ts index 4b9017a7efd4273e8c0465bdb6b4215f9d39e89f..6beefe5c64b1822d7b31d106876a00d7292ca982 100644 --- a/src/app/components/creator/room-creator-page/room-creator-page.component.ts +++ b/src/app/components/creator/room-creator-page/room-creator-page.component.ts @@ -15,6 +15,7 @@ import { WsCommentServiceService } from '../../../services/websockets/ws-comment import { CommentService } from '../../../services/http/comment.service'; import { ModeratorsComponent } from '../_dialogs/moderators/moderators.component'; import { CommentSettingsComponent } from '../_dialogs/comment-settings/comment-settings.component'; +import { LiveAnnouncer } from '@angular/cdk/a11y'; @Component({ selector: 'app-room-creator-page', @@ -39,7 +40,8 @@ export class RoomCreatorPageComponent extends RoomPageComponent implements OnIni private translateService: TranslateService, protected langService: LanguageService, protected wsCommentService: WsCommentServiceService, - protected commentService: CommentService) { + protected commentService: CommentService, + private liveAnnouncer: LiveAnnouncer) { super(roomService, route, location, wsCommentService, commentService); langService.langEmitter.subscribe(lang => translateService.use(lang)); } @@ -50,7 +52,13 @@ export class RoomCreatorPageComponent extends RoomPageComponent implements OnIni this.route.params.subscribe(params => { this.initializeRoom(params['roomId']); }); + this.announce(); } + public announce() { + this.liveAnnouncer.announce('Sie befinden sich nun in der Session mit ID.', 'assertive'); + } + + afterRoomLoadHook() { if (this.moderationEnabled) {