diff --git a/src/app/components/shared/header/header.component.html b/src/app/components/shared/header/header.component.html
index dcb9f52a7f1356de115bb84c6ddffd9f6035257e..247a77ba9a50eec8c7da9a90941665f2257694bf 100644
--- a/src/app/components/shared/header/header.component.html
+++ b/src/app/components/shared/header/header.component.html
@@ -142,6 +142,36 @@
<span>{{'header.create-question' | translate}}</span>
</button>
+ <button mat-menu-item
+ *ngIf="user && user.role == 0"
+ tabindex="0"
+ routerLink="participant/room/{{shortId}}">
+ <mat-icon>
+ flag
+ </mat-icon>
+ <span>{{'header.back-to-room' | translate}}</span>
+ </button>
+
+ <button mat-menu-item
+ *ngIf="user && user.role == 3"
+ tabindex="0"
+ routerLink="creator/room/{{shortId}}">
+ <mat-icon>
+ flag
+ </mat-icon>
+ <span>{{'header.back-to-room' | translate}}</span>
+ </button>
+
+ <button mat-menu-item
+ *ngIf="user && user.role == 2"
+ tabindex="0"
+ routerLink="moderator/room/{{shortId}}">
+ <mat-icon>
+ flag
+ </mat-icon>
+ <span>{{'header.back-to-room' | translate}}</span>
+ </button>
+
<ng-container>
<button mat-menu-item
@@ -220,22 +250,6 @@
<span>{{'header.bonustoken' | translate}}</span>
</button>
- <button mat-menu-item
- *ngIf="user"
- (click)="navigateExportQuestions()"
- tabindex="0">
- <mat-icon>file_download</mat-icon>
- <span>{{'header.export-questions' | translate}}</span>
- </button>
-
- <button mat-menu-item
- *ngIf="user"
- (click)="navigateDeleteQuestions()"
- tabindex="0">
- <mat-icon class="color-warn">delete_forever</mat-icon>
- <span>{{'header.delete-questions' | translate}}</span>
- </button>
-
</ng-container>
</ng-container>
@@ -243,7 +257,7 @@
<!-- Room General Options - bot -->
<ng-container
- *ngIf="user && user.role == 3 && !router.url.includes('/participant') && !router.url.includes('/comment/') && !router.url.endsWith('tagcloud')">
+ *ngIf="user && user.role == 3 && !router.url.includes('/participant') && !router.url.endsWith('/comments') && !router.url.includes('/comment/') && !router.url.endsWith('tagcloud')">
<button mat-menu-item
*ngIf="user"
@@ -274,7 +288,7 @@
</button>
<button mat-menu-item
- *ngIf="router.url.endsWith('/tagcloud')"
+ *ngIf="user && user.role >0 && router.url.endsWith('/tagcloud')"
tabindex="0"
(click)="navigateTopicCloudConfig()">
<mat-icon aria-label="Configuration Icon">cloud</mat-icon>
@@ -282,7 +296,7 @@
</button>
<button mat-menu-item
- *ngIf="router.url.endsWith('/tagcloud')"
+ *ngIf="user && user.role >0 && router.url.endsWith('/tagcloud')"
tabindex="0"
(click)="navigateTopicCloudAdministration()">
<mat-icon aria-hidden="false"
@@ -302,7 +316,7 @@
</button>
<button mat-menu-item
- *ngIf="user"
+ *ngIf="!router.url.includes('/comment/') && !router.url.endsWith('tagcloud')"
(click)="navigateExportQuestions()"
tabindex="0">
<mat-icon>file_download</mat-icon>
@@ -311,7 +325,7 @@
<button mat-menu-item
tabindex="0"
- *ngIf="room && user && user.role > 0"
+ *ngIf="user && user.role == 3 && !router.url.includes('/participant') && !router.url.endsWith('/comments') && !router.url.includes('/comment/') && !router.url.endsWith('tagcloud')"
(click)="blockQuestions()"
[ngClass]="{'color-warn': room && room.questionsBlocked}"
>
@@ -321,7 +335,7 @@
</button>
<button mat-menu-item
- *ngIf="user && user.role > 0 && !router.url.includes('/participant/')"
+ *ngIf="user && user.role == 3 && !router.url.includes('/participant') && !router.url.endsWith('/comments') && !router.url.includes('/comment/') && !router.url.endsWith('tagcloud')"
(click)="navigateDeleteQuestions()"
tabindex="0">
<mat-icon class="color-warn">delete_forever</mat-icon>
@@ -334,6 +348,14 @@
<!-- General Options -->
+ <button mat-menu-item
+ *ngIf="user && user.role == 0"
+ (click)="openUserBonusTokenDialog()"
+ tabindex="0">
+ <mat-icon class="star">grade</mat-icon>
+ <span>{{'header.user-bonus-token' | translate}}</span>
+ </button>
+
<button mat-menu-item
*ngIf="user && !router.url.endsWith('/user')"
routerLink="/user"
@@ -345,14 +367,6 @@
svgIcon="meeting_room">{{'header.visited-sessions' | translate}}</span>
</button>
- <button mat-menu-item
- *ngIf="user"
- (click)="openUserBonusTokenDialog()"
- tabindex="0">
- <mat-icon class="star">grade</mat-icon>
- <span>{{'header.user-bonus-token' | translate}}</span>
- </button>
-
<button mat-menu-item
aria-hidden="true"
*ngIf="isSafari === 'false' && !router.url.includes('home')"
diff --git a/src/assets/i18n/creator/de.json b/src/assets/i18n/creator/de.json
index 374c12fe0487d47e6e966cca9e1b91f66620628d..114d441db4106d678b020914057a02bf72cab7fe 100644
--- a/src/assets/i18n/creator/de.json
+++ b/src/assets/i18n/creator/de.json
@@ -259,8 +259,8 @@
"abort": "Abbrechen",
"answer": "Antwort",
"answer-statistics": "Statistiken",
- "bonus-token": "Vergebene Sterne",
- "bonus-token-header": "Vergebene Sterne",
+ "bonus-token": "Bonus-Archiv",
+ "bonus-token-header": "Bonus-Archiv",
"no-bonus": "Du hast bisher keine Frage mit einem Stern ausgezeichnet.",
"cancel": "Abbrechen",
"cancel-description": "Abbrechen",
diff --git a/src/assets/i18n/home/de.json b/src/assets/i18n/home/de.json
index 503c6cd669d04baf6e4ff8e9b62b998ad6f0ca71..2129a30d82a5867749d43bcb5f2a104c8a97241a 100644
--- a/src/assets/i18n/home/de.json
+++ b/src/assets/i18n/home/de.json
@@ -85,18 +85,19 @@
"user-got-tokens": "Du hast noch Sterne für Bonuspunkte, die verloren gehen!",
"visited-sessions": "Sitzungen",
"question-wall": "Fragen präsentieren",
- "room-qr": "Raum-Code anzeigen",
+ "room-qr": "Raum-Code",
"question-board": "Fragenliste",
- "bonustoken": "Vergebene Sterne",
+ "bonustoken": "Bonus-Archiv",
"edit-moderator": "Moderatoren",
"edit-tags": "Kategorien",
"export-questions": "Fragen speichern",
"delete-questions": "Fragen löschen",
- "back-to-questionboard": "Zur Fragenliste",
- "moderationboard": "Zur Moderation",
+ "back-to-questionboard": "Öffentliche Fragenliste",
+ "back-to-room": "Eingang",
+ "moderationboard": "Moderation",
"create-question": "Frage stellen",
- "questionwall": "Präsentationsmodus",
- "tag-cloud": "Zur Themenwolke",
+ "questionwall": "Präsentation",
+ "tag-cloud": "Themenwolke",
"fullscreen": "Vollbild & Text",
"motd": "News & FAQ",
"tag-cloud-config": "Aussehen & Animation",
diff --git a/src/assets/i18n/home/en.json b/src/assets/i18n/home/en.json
index a11adb40cdcbe4b62c5a91a4737ce78e82235a3a..77c63f74e7cdb004583ae496d0b2df243171994f 100644
--- a/src/assets/i18n/home/en.json
+++ b/src/assets/i18n/home/en.json
@@ -74,19 +74,20 @@
"user-got-tokens": "You haven't received a star for a good question yet.",
"visited-sessions": "Sessions",
"question-wall": "Present questions",
- "room-qr": "Present key code",
+ "room-qr": "Key code",
"question-board": "Question list",
- "bonustoken": "Assigned Stars",
+ "bonustoken": "Assigned bonus stars",
"edit-moderator": "Moderators",
"edit-tags": "Tags",
"export-questions": "Save questions",
"delete-questions": "Delete questions",
- "back-to-questionboard": "Question list",
- "moderationboard": "Moderation board",
+ "back-to-questionboard": "Public question list",
+ "back-to-room": "Entrance",
+ "moderationboard": "Moderation",
"create-question": "Ask a question",
- "questionwall": "Presentation mode",
+ "questionwall": "Presentation",
"tag-cloud": "Topic cloud",
- "fullscreen": "Text scaling",
+ "fullscreen": "Fullscreen & Text",
"motd": "News & FAQ",
"tag-cloud-config": "Modify cloud view",
"tag-cloud-administration": "Edit cloud topics",