From 4975528d16c7c0e584b2fea45b5a24afcb55cb9b Mon Sep 17 00:00:00 2001
From: Klaus Quibeldey-Cirkel <klaus-dieter.quibeldey-cirkel@mni.thm.de>
Date: Wed, 21 Jul 2021 09:01:05 +0200
Subject: [PATCH] miscellaneous
---
.../qr-code-dialog/qr-code-dialog.component.html | 2 +-
.../shared/header/header.component.html | 15 ++++++---------
src/assets/i18n/home/de.json | 2 ++
src/assets/i18n/home/en.json | 2 ++
src/theme/dark-theme/darkTheme.const.ts | 2 +-
5 files changed, 12 insertions(+), 11 deletions(-)
diff --git a/src/app/components/shared/_dialogs/qr-code-dialog/qr-code-dialog.component.html b/src/app/components/shared/_dialogs/qr-code-dialog/qr-code-dialog.component.html
index 1c20c59c8..74424cc34 100644
--- a/src/app/components/shared/_dialogs/qr-code-dialog/qr-code-dialog.component.html
+++ b/src/app/components/shared/_dialogs/qr-code-dialog/qr-code-dialog.component.html
@@ -4,7 +4,7 @@
<mat-icon>close</mat-icon>
</button>
<div>
- <h2>frag.jetzt</h2>
+ <h2>URL: frag.jetzt</h2>
<h2>{{'qr-dialog.session' | translate}}: {{key}}</h2>
</div>
<qrcode [qrdata]="data" [width]="qrWidth" [errorCorrectionLevel]="'M'"></qrcode>
diff --git a/src/app/components/shared/header/header.component.html b/src/app/components/shared/header/header.component.html
index 7147043fe..b1f558e1f 100644
--- a/src/app/components/shared/header/header.component.html
+++ b/src/app/components/shared/header/header.component.html
@@ -166,7 +166,6 @@
<button mat-menu-item
tabindex="0"
- *ngIf="!router.url.endsWith('moderator/comments')"
(click)="navigateTopicCloud()">
<mat-icon>cloud
</mat-icon>
@@ -220,7 +219,6 @@
*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"
(click)="navigateModerator()"
tabindex="0">
<mat-icon>gavel</mat-icon>
@@ -228,7 +226,6 @@
</button>
<button mat-menu-item
- *ngIf="user"
(click)="navigateTags()"
tabindex="0">
<mat-icon svgIcon="comment_tag"></mat-icon>
@@ -276,7 +273,7 @@
</button>
<button mat-menu-item
- *ngIf="!router.url.includes('/comment/') && !router.url.endsWith('tagcloud')"
+ *ngIf="!router.url.endsWith('/comments') && !router.url.includes('/comment/') && !router.url.endsWith('tagcloud')"
(click)="navigateExportQuestions()"
tabindex="0">
<mat-icon>file_download</mat-icon>
@@ -316,7 +313,7 @@
<span>{{'header.user-bonus-token' | translate}}</span>
</button>
- <ng-container *ngIf="router.url.endsWith('/comments')">
+ <ng-container *ngIf="router.url.endsWith('/comments') || router.url.endsWith('/tagcloud')">
<button mat-menu-item
*ngIf="user && user.role == 0"
@@ -333,9 +330,9 @@
tabindex="0"
routerLink="creator/room/{{shortId}}">
<mat-icon>
- flag
+ settings
</mat-icon>
- <span>{{'header.back-to-room' | translate}}</span>
+ <span>{{'header.back-to-room-creator' | translate}}</span>
</button>
<button mat-menu-item
@@ -345,7 +342,7 @@
<mat-icon>
flag
</mat-icon>
- <span>{{'header.back-to-room' | translate}}</span>
+ <span>{{'header.back-to-room-moderator' | translate}}</span>
</button>
</ng-container>
@@ -383,7 +380,7 @@
</button>
<button mat-menu-item
- *ngIf="user && !user.isGuest && user.loginId"
+ *ngIf="user && !user.isGuest && user.loginId && router.url.endsWith('/user')"
(click)="openDeleteUserDialog()"
tabindex="0">
<mat-icon class="color-warn">delete_forever</mat-icon>
diff --git a/src/assets/i18n/home/de.json b/src/assets/i18n/home/de.json
index 905f86604..f1cfd3aac 100644
--- a/src/assets/i18n/home/de.json
+++ b/src/assets/i18n/home/de.json
@@ -94,6 +94,8 @@
"delete-questions": "Fragen löschen",
"back-to-questionboard": "Fragenliste",
"back-to-room": "Eingang",
+ "back-to-room-creator": "Raumverwaltung",
+ "back-to-room-moderator": "Entrance",
"moderationboard": "Moderation",
"create-question": "Frage stellen",
"questionwall": "Präsentation",
diff --git a/src/assets/i18n/home/en.json b/src/assets/i18n/home/en.json
index 56511f2cd..29b9e64e4 100644
--- a/src/assets/i18n/home/en.json
+++ b/src/assets/i18n/home/en.json
@@ -83,6 +83,8 @@
"delete-questions": "Delete questions",
"back-to-questionboard": "Question list",
"back-to-room": "Entrance",
+ "back-to-room-creator": "Room management",
+ "back-to-room-moderator": "Entrance",
"moderationboard": "Moderation",
"create-question": "Ask a question",
"questionwall": "Presentation",
diff --git a/src/theme/dark-theme/darkTheme.const.ts b/src/theme/dark-theme/darkTheme.const.ts
index 51ab726c4..0092823f1 100644
--- a/src/theme/dark-theme/darkTheme.const.ts
+++ b/src/theme/dark-theme/darkTheme.const.ts
@@ -18,7 +18,7 @@ export const dark = {
'--on-background': '#eadabf',
'--on-surface': '#eadabf',
'--on-dialog': '#eadabf',
- '--on-cancel': '#ffffff',
+ '--on-cancel': '#000000',
'--green': 'lightgreen',
'--red': 'red',
--
GitLab