diff --git a/src/app/components/creator/_dialogs/delete-comment/delete-comment.component.html b/src/app/components/creator/_dialogs/delete-comment/delete-comment.component.html
index 9b81130f02b15b55905d0cdf1d553eb7c9742f3a..3ad5c141cc6fbab7b3339665070ae8c3bfb67caa 100644
--- a/src/app/components/creator/_dialogs/delete-comment/delete-comment.component.html
+++ b/src/app/components/creator/_dialogs/delete-comment/delete-comment.component.html
@@ -1,4 +1,5 @@
<h3>{{ 'room-page.sure' | translate }}</h3>
+<mat-divider></mat-divider>
<p>{{ 'room-page.really-delete-comments' | translate }}</p>
<div fxLayout="row" fxLayoutAlign="center" fxLayoutGap="10px">
<button mat-raised-button class="abort" (click)="close('abort')">
diff --git a/src/app/components/creator/_dialogs/moderator-delete/moderator-delete.component.html b/src/app/components/creator/_dialogs/moderator-delete/moderator-delete.component.html
new file mode 100644
index 0000000000000000000000000000000000000000..626d7d52c433f655725d181833914ae3d37b4d8e
--- /dev/null
+++ b/src/app/components/creator/_dialogs/moderator-delete/moderator-delete.component.html
@@ -0,0 +1,12 @@
+<h2>{{ 'room-page.sure' | translate }}</h2>
+<mat-divider></mat-divider>
+<h3>{{ 'room-page.really-remove-moderator' | translate }}</h3>
+<p>{{loginId}}</p>
+<div fxLayout="row" fxLayoutAlign="center" fxLayoutGap="10px">
+ <button mat-raised-button class="abort" (click)="close('abort')">
+ {{ 'content.abort' | translate }}
+ </button>
+ <button mat-raised-button class="delete" (click)="close('delete')">
+ {{ 'content.delete' | translate }}
+ </button>
+</div>
diff --git a/src/app/components/creator/_dialogs/moderator-delete/moderator-delete.component.scss b/src/app/components/creator/_dialogs/moderator-delete/moderator-delete.component.scss
new file mode 100644
index 0000000000000000000000000000000000000000..9b78e8b53910e8ab6e9b97a76ce45034d61f3f5b
--- /dev/null
+++ b/src/app/components/creator/_dialogs/moderator-delete/moderator-delete.component.scss
@@ -0,0 +1,23 @@
+h2 {
+ color: var(--on-surface);
+}
+
+h3 {
+ color: var(--on-surface);
+}
+
+p {
+ color: var(--on-surface);
+ font-weight: bold;
+ text-align: center;
+}
+
+.delete {
+ background-color: var(--red);
+ color: var(--on-secondary);
+}
+
+.abort {
+ background-color: var(--secondary);
+ color: var(--on-secondary);
+}
diff --git a/src/app/components/creator/_dialogs/moderator-delete/moderator-delete.component.spec.ts b/src/app/components/creator/_dialogs/moderator-delete/moderator-delete.component.spec.ts
new file mode 100644
index 0000000000000000000000000000000000000000..93d29ea732c49d32b1c1d98946b627425859b943
--- /dev/null
+++ b/src/app/components/creator/_dialogs/moderator-delete/moderator-delete.component.spec.ts
@@ -0,0 +1,25 @@
+/*import { async, ComponentFixture, TestBed } from '@angular/core/testing';
+
+import { ModeratorDeleteComponent } from './moderator-delete.component';
+
+describe('ModeratorDeleteComponent', () => {
+ let component: ModeratorDeleteComponent;
+ let fixture: ComponentFixture<ModeratorDeleteComponent>;
+
+ beforeEach(async(() => {
+ TestBed.configureTestingModule({
+ declarations: [ ModeratorDeleteComponent ]
+ })
+ .compileComponents();
+ }));
+
+ beforeEach(() => {
+ fixture = TestBed.createComponent(ModeratorDeleteComponent);
+ component = fixture.componentInstance;
+ fixture.detectChanges();
+ });
+
+ it('should create', () => {
+ expect(component).toBeTruthy();
+ });
+});*/
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
new file mode 100644
index 0000000000000000000000000000000000000000..3cabf69178af779a6b947de04f1d6167e8296016
--- /dev/null
+++ b/src/app/components/creator/_dialogs/moderator-delete/moderator-delete.component.ts
@@ -0,0 +1,24 @@
+import { Component, Inject, OnInit } from '@angular/core';
+import { MAT_DIALOG_DATA, MatDialogRef } from '@angular/material';
+import { ModeratorsComponent } from '../moderators/moderators.component';
+
+@Component({
+ selector: 'app-moderator-delete',
+ templateUrl: './moderator-delete.component.html',
+ styleUrls: ['./moderator-delete.component.scss']
+})
+export class ModeratorDeleteComponent implements OnInit {
+
+ loginId: string;
+
+ constructor(public dialogRef: MatDialogRef<ModeratorsComponent>,
+ @Inject(MAT_DIALOG_DATA) public data: any) { }
+
+ ngOnInit() {
+ }
+
+ close(type: string): void {
+ this.dialogRef.close(type);
+ }
+
+}
diff --git a/src/app/components/creator/_dialogs/moderators/moderators.component.html b/src/app/components/creator/_dialogs/moderators/moderators.component.html
index 1d27bca5a87612a8d7f41bbc16e69ea21d05905d..87b47dc8dd3a9ca7760df6704d41ab3bdd744b87 100644
--- a/src/app/components/creator/_dialogs/moderators/moderators.component.html
+++ b/src/app/components/creator/_dialogs/moderators/moderators.component.html
@@ -18,7 +18,7 @@
{{i+1}}. {{moderator.loginId}}
</h3>
<span class="fill-remaining-space"></span>
- <button mat-icon-button class="close" (click)="removeModerator(moderator.userId, i)">
+ <button mat-icon-button class="close" (click)="openDeleteRoomDialog(moderator)">
<mat-icon class="close-icon">close</mat-icon>
</button>
</div>
diff --git a/src/app/components/creator/_dialogs/moderators/moderators.component.ts b/src/app/components/creator/_dialogs/moderators/moderators.component.ts
index 16343b9c4e6ab4ca3874ce0d7a180eb1896653eb..e506335aa3eaf82f36598914695cb151a23c4404 100644
--- a/src/app/components/creator/_dialogs/moderators/moderators.component.ts
+++ b/src/app/components/creator/_dialogs/moderators/moderators.component.ts
@@ -6,6 +6,8 @@ import { ModeratorService } from '../../../../services/http/moderator.service';
import { RoomCreatorPageComponent } from '../../room-creator-page/room-creator-page.component';
import { LanguageService } from '../../../../services/util/language.service';
import { Moderator } from '../../../../models/moderator';
+import { RoomDeleteComponent } from '../room-delete/room-delete.component';
+import { ModeratorDeleteComponent } from '../moderator-delete/moderator-delete.component';
@Component({
selector: 'app-moderators',
@@ -62,6 +64,19 @@ export class ModeratorsComponent implements OnInit {
});
}
+ openDeleteRoomDialog(moderator: Moderator): void {
+ const dialogRef = this.dialog.open(ModeratorDeleteComponent, {
+ width: '400px'
+ });
+ dialogRef.componentInstance.loginId = moderator.loginId;
+ dialogRef.afterClosed()
+ .subscribe(result => {
+ if (result === 'delete') {
+ this.removeModerator(moderator.userId, this.moderators.indexOf(moderator));
+ }
+ });
+ }
+
removeModerator(userId: string, index: number) {
this.moderatorService.delete(this.roomId, userId).subscribe();
this.translationService.get('room-page.moderator-removed').subscribe(msg => {
diff --git a/src/app/components/creator/_dialogs/room-delete/room-delete.component.html b/src/app/components/creator/_dialogs/room-delete/room-delete.component.html
index 0edb8b68eca8bae526f29f5541f0903f792bb159..f4ea308d43236ff25c6bc821e05477641f8b81fb 100644
--- a/src/app/components/creator/_dialogs/room-delete/room-delete.component.html
+++ b/src/app/components/creator/_dialogs/room-delete/room-delete.component.html
@@ -1,4 +1,5 @@
<h3>{{ 'room-page.sure' | translate }}</h3>
+<mat-divider></mat-divider>
<p>{{ 'room-page.reallySession' | translate}}<strong>{{room.name}}</strong>{{ 'room-page.really2' | translate}}</p>
<div fxLayout="row" fxLayoutAlign="center" fxLayoutGap="10px">
<button mat-raised-button class="abort" (click)="onNoClick()">
diff --git a/src/app/components/creator/creator.module.ts b/src/app/components/creator/creator.module.ts
index d1e478d5108bd025036693481782ba01b605f5f4..1f37d69dba774826e26853e0d5440716130e0fcb 100644
--- a/src/app/components/creator/creator.module.ts
+++ b/src/app/components/creator/creator.module.ts
@@ -24,6 +24,7 @@ import { ContentPresentationComponent } from './content-presentation/content-pre
import { CommentExportComponent } from './_dialogs/comment-export/comment-export.component';
import { ModeratorsComponent } from './_dialogs/moderators/moderators.component';
import { CommentSettingsComponent } from './_dialogs/comment-settings/comment-settings.component';
+import { ModeratorDeleteComponent } from './_dialogs/moderator-delete/moderator-delete.component';
@NgModule({
imports: [
@@ -56,7 +57,8 @@ import { CommentSettingsComponent } from './_dialogs/comment-settings/comment-se
ContentPresentationComponent,
CommentExportComponent,
ModeratorsComponent,
- CommentSettingsComponent
+ CommentSettingsComponent,
+ ModeratorDeleteComponent
],
entryComponents: [
RoomDeleteComponent,
@@ -70,7 +72,8 @@ import { CommentSettingsComponent } from './_dialogs/comment-settings/comment-se
ContentEditComponent,
CommentExportComponent,
ModeratorsComponent,
- CommentSettingsComponent
+ CommentSettingsComponent,
+ ModeratorDeleteComponent
]
})
export class CreatorModule {
diff --git a/src/assets/i18n/creator/de.json b/src/assets/i18n/creator/de.json
index 132e5ee12e992c3a2cbd405fe17e4e3f8659957a..01aa691fe2b7e9adfd11651f048a6174bfd291e9 100644
--- a/src/assets/i18n/creator/de.json
+++ b/src/assets/i18n/creator/de.json
@@ -28,6 +28,7 @@
"moderator-not-found": "Kein Benutzer mit dieser E-Mail gefunden.",
"moderator-added": "Moderator wurde hinzugefügt.",
"moderator-removed": "Moderator wurde entfernt.",
+ "really-remove-moderator": "Wollen sie folgenden Moderator wirklich entfernen?",
"session-settings": "Session-Verwaltung",
"general": "Allgemein",
"threshold": "Schwellenwert für sichtbare Kommentare: ",
diff --git a/src/assets/i18n/creator/en.json b/src/assets/i18n/creator/en.json
index f82d1155b385394d6f418d87ea638e5fb901931a..9a9a12dc460bf97cd3117be6571d088ce10ccdb2 100644
--- a/src/assets/i18n/creator/en.json
+++ b/src/assets/i18n/creator/en.json
@@ -28,6 +28,7 @@
"moderator-not-found": "No user was found with this E-Mail.",
"moderator-added": "Moderator was added.",
"moderator-removed": "Moderator has been removed.",
+ "really-remove-moderator": "Do you really want to remove the following moderator?",
"session-settings": "Session administration",
"general": "General",
"threshold": "Threshold for visible comments: ",