diff --git a/src/app/components/creator/room-creator-page/room-creator-page.component.html b/src/app/components/creator/room-creator-page/room-creator-page.component.html
index ac7a221f4b20d0c6ffa09b8773b275fcb3b6dc03..253c7528b9077f1e9a9a4bbf51ad563196eeef8a 100644
--- a/src/app/components/creator/room-creator-page/room-creator-page.component.html
+++ b/src/app/components/creator/room-creator-page/room-creator-page.component.html
@@ -20,6 +20,9 @@
</button>
</mat-card-title>
<mat-card-subtitle fxLayoutAlign="center">
+ <mat-icon *ngIf="moderationEnabled" class="gavel">
+ gavel
+ </mat-icon>
<span class="room-short-id">
{{ 'room-page.session-id' | translate}}: {{ room.shortId }}
</span>
diff --git a/src/app/components/creator/room-creator-page/room-creator-page.component.scss b/src/app/components/creator/room-creator-page/room-creator-page.component.scss
index fb0fd0d2d8356fcd2da226fd23f9c1fa278534bf..3175e508a2c8921dac2bce4a5c8fe1877f305fb2 100644
--- a/src/app/components/creator/room-creator-page/room-creator-page.component.scss
+++ b/src/app/components/creator/room-creator-page/room-creator-page.component.scss
@@ -50,10 +50,10 @@ mat-card-content > :first-child {
}
.room-short-id {
- font-size: 14px;
+ font-size: larger;
font-weight: bold;
color: var(--on-surface) !important;
- margin-top: 10%;
+ margin: 1em;
}
mat-grid-list {
@@ -99,9 +99,8 @@ mat-expansion-panel {
}
#copy {
- margin-left: 10px;
- width: 50px;
- height: 55px;
+ width: 24px;
+ height: 24px;
}
.copy {
@@ -111,7 +110,7 @@ mat-expansion-panel {
}
.gavel {
- margin: 5% 2% 0 0;
+ margin: 0.9em 0.25em 0 0;
color: var(--on-surface);
}
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 a79feab2c2f0cdfa80287704ab4bfbf5bf483788..e2b51f0888fe2f112892d828946bc229e4c52d44 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
@@ -348,13 +348,13 @@ export class RoomCreatorPageComponent extends RoomPageComponent implements OnIni
updateCommentSettings(settings: CommentSettingsDialog){
this.room.tags = settings.tags;
- if (this.moderationEnabled && !settings.enableModeration){
+ if (this.moderationEnabled && settings.directSend){
this.viewModuleCount = this.viewModuleCount - 1;
- }else if (!this.moderationEnabled && settings.enableModeration){
+ }else if (!this.moderationEnabled && !settings.directSend){
this.viewModuleCount = this.viewModuleCount + 1;
}
- this.moderationEnabled = settings.enableModeration;
+ this.moderationEnabled = !settings.directSend;
localStorage.setItem('moderationEnabled', String(this.moderationEnabled));
}
diff --git a/src/app/components/moderator/room-moderator-page/room-moderator-page.component.scss b/src/app/components/moderator/room-moderator-page/room-moderator-page.component.scss
index 4559fe424a26788e8ae38186a1097f837d077c64..7723c0971055b484a2fe1c8a20686790350d4dc7 100644
--- a/src/app/components/moderator/room-moderator-page/room-moderator-page.component.scss
+++ b/src/app/components/moderator/room-moderator-page/room-moderator-page.component.scss
@@ -66,7 +66,7 @@ mat-card-content > :first-child {
font-size: larger;
font-weight: bold;
color: var(--on-surface) !important;
- margin: 5% 5% 0 0;
+ margin: 1em;
}
mat-grid-list {
@@ -130,7 +130,7 @@ mat-expansion-panel {
}
.gavel {
- margin: 5% 2% 0 0;
+ margin: 0.9em 0.25em 0 0;
color: var(--on-surface);
}
diff --git a/src/app/components/moderator/room-moderator-page/room-moderator-page.component.ts b/src/app/components/moderator/room-moderator-page/room-moderator-page.component.ts
index 466dc34e6c8ac31f174be4617257fa90e2fed111..d9303a6a9b6981bbb63d9d0660f0f12244a1e45a 100644
--- a/src/app/components/moderator/room-moderator-page/room-moderator-page.component.ts
+++ b/src/app/components/moderator/room-moderator-page/room-moderator-page.component.ts
@@ -47,7 +47,7 @@ export class RoomModeratorPageComponent extends RoomPageComponent implements OnI
this.roomService.getRoomByShortId(id).subscribe(room => {
this.room = room;
this.isLoading = false;
- this.moderationEnabled = this.room.moderated;
+ this.moderationEnabled = !this.room.directSend;
if (this.moderationEnabled) {
this.viewModuleCount = this.viewModuleCount + 1;
}
diff --git a/src/app/components/participant/room-participant-page/room-participant-page.component.html b/src/app/components/participant/room-participant-page/room-participant-page.component.html
index 86b613e8beb52e5278a21d6cd99b937b911abc6a..1540046f597424ef2650231da4bacdc37a937424 100644
--- a/src/app/components/participant/room-participant-page/room-participant-page.component.html
+++ b/src/app/components/participant/room-participant-page/room-participant-page.component.html
@@ -12,7 +12,7 @@
<mat-icon *ngIf="moderationEnabled" class="gavel" matTooltip="{{ 'room-page.moderation-enabled' | translate }}">
gavel
</mat-icon>
- <h3>
+ <h3 class="room-short-id">
{{ 'room-page.session-id' | translate}}: {{ room.shortId }}
</h3>
</mat-card-subtitle>
diff --git a/src/app/components/participant/room-participant-page/room-participant-page.component.scss b/src/app/components/participant/room-participant-page/room-participant-page.component.scss
index 541953744871d3ecfa761fa6e10c348225509995..0ff3603617a4abd6aed79393c40fd517c23a9f35 100644
--- a/src/app/components/participant/room-participant-page/room-participant-page.component.scss
+++ b/src/app/components/participant/room-participant-page/room-participant-page.component.scss
@@ -91,10 +91,17 @@ mat-grid-tile {
}
.gavel {
- margin: 5% 2% 0 0;
+ margin: 0.9em 0.25em 0 0;
color: var(--on-surface);
}
+.room-short-id {
+ font-size: larger;
+ font-weight: bold;
+ color: var(--on-surface) !important;
+ margin: 1em;
+}
+
::ng-deep .mat-badge-content {
background: var(--secondary);
color: var(--on-secondary);
diff --git a/src/app/components/shared/header/header.component.html b/src/app/components/shared/header/header.component.html
index f864a02026a522293c8260b57fd02762e195ebad..f0e6149f81e8ffd90b2e803274e6aecff31219da 100644
--- a/src/app/components/shared/header/header.component.html
+++ b/src/app/components/shared/header/header.component.html
@@ -43,6 +43,17 @@
{{cTime}}
</h2>
+ <span class="fill-remaining-space"
+ *ngIf="moderationEnabled && deviceType === 'desktop' && router.url.includes('comments')"></span>
+ <span
+ *ngIf="moderationEnabled && router.url.includes('comments')"
+ class="moderation-enabled"
+ fxLayoutAlign="center center">
+ <mat-icon matTooltip="{{ 'header.moderation-enabled' | translate }}">
+ gavel
+ </mat-icon>
+ </span>
+
<span class="fill-remaining-space"
*ngIf="room && room.questionsBlocked"></span>
@@ -219,7 +230,8 @@
</ng-container>
<!-- Session -->
- <ng-container *ngIf="!router.url.endsWith('/comments') && !router.url.includes('/comment/') && !router.url.endsWith('tagcloud')">
+ <ng-container
+ *ngIf="!router.url.endsWith('/comments') && !router.url.includes('/comment/') && !router.url.endsWith('tagcloud')">
<!-- app-room-creator-page -->
diff --git a/src/app/components/shared/header/header.component.ts b/src/app/components/shared/header/header.component.ts
index a36a8d095ee4ca371bec83aa5ceed0abf9cd96b3..a8d0271cdca2525269378cc2e0eb4b6fc8db7050 100644
--- a/src/app/components/shared/header/header.component.ts
+++ b/src/app/components/shared/header/header.component.ts
@@ -149,7 +149,7 @@ export class HeaderComponent implements OnInit,AfterViewInit {
const message = JSON.parse(msg.body);
if (message.type === 'RoomPatched') {
this.room.questionsBlocked = message.payload.changes.questionsBlocked;
- this.moderationEnabled = message.payload.changes.moderated;
+ this.moderationEnabled = !message.payload.changes.directSend;
}
});
});