diff --git a/src/app/components/shared/comment/comment.component.scss b/src/app/components/shared/comment/comment.component.scss
index 7af05a1c148a7dba8b7a55c446fec7a28df6509b..a187f763b17b8495c41ade46d74014868eb05fd9 100644
--- a/src/app/components/shared/comment/comment.component.scss
+++ b/src/app/components/shared/comment/comment.component.scss
@@ -127,6 +127,7 @@ mat-card-content > :first-child {
.gavel {
color: var(--primary) !important;
+ margin: 0 10px 0 10px;
transform: scale(1.3) !important;
}
diff --git a/src/app/components/shared/header/header.component.html b/src/app/components/shared/header/header.component.html
index e067a3155f83459344da884de9022ba75f6876f9..ab330e191e6bb5a8c3faa7b0173cca6c579b3b74 100644
--- a/src/app/components/shared/header/header.component.html
+++ b/src/app/components/shared/header/header.component.html
@@ -22,102 +22,108 @@
</span>
</button>
- <ng-container *ngIf="toggleUserActivity">
- <div class="userActivityIcon"
- matTooltip="{{'header.users-online' | translate}}"></div>
- <p class="userActivityTxt">{{userActivity}}</p>
- </ng-container>
-
- <span class="fill-remaining-space"
- *ngIf="router.url.endsWith('/moderator/comments')"></span>
-
- <h2 class="oldtypo-h2"
- *ngIf="router.url.endsWith('/moderator/comments') && deviceType === 'desktop'">
- {{'header.moderation-warning'|translate}}
- </h2>
-
- <span class="fill-remaining-space"></span>
-
- <h2 class="oldtypo-h2"
- *ngIf="deviceType === 'desktop' && router.url !== '/home'">
- {{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 style="color: red" matTooltip="{{ 'header.moderation-enabled' | translate }}">
- gavel
- </mat-icon>
- </span>
-
- <span class="fill-remaining-space"
- *ngIf="room && room.questionsBlocked"></span>
-
- <h1
- *ngIf="room && room.questionsBlocked">
- {{'header.questions-blocked'|translate}}
- </h1>
-
- <!--Topic Cloud-->
- <div class="topic-cloud-btns"
- [ngClass]="{'noOfQuestions': deviceType === 'desktop'}"
- *ngIf="router.url.includes('tagcloud')"
- ars-flex-box>
- <ars-col
- [xp]="16"
- [extra]="true">
- <button mat-icon-button
- disableRipple="true"
- *ngIf="isAdminConfigEnabled"
- class="pseudo-button"
- matTooltip="{{'header.overview-admin-config-enabled' | translate}}">
- <mat-icon class="oldtypo-h2 comment_tag-icon"
- style="color: red !important;">warning
- </mat-icon>
- </button>
- <button mat-icon-button
- disableRipple="true"
- class="pseudo-button"
- matTooltip="{{'header.overview-question-tooltip' | translate}}">
- <mat-icon class="oldtypo-h2 comment_tag-icon">comment</mat-icon>
- <span style="margin-left: 0.25em;">{{commentsCountQuestions}}</span>
- </button>
- <button mat-icon-button
- disableRipple="true"
- class="pseudo-button"
- matTooltip="{{'header.overview-questioners-tooltip' | translate}}">
- <mat-icon class="oldtypo-h2 comment_tag-icon">person</mat-icon>
- <span style="margin-left: 0.25em;">{{commentsCountUsers}}</span>
- </button>
- <button mat-icon-button
- disableRipple="true"
- class="pseudo-button"
- matTooltip="{{'header.overview-keywords-tooltip' | translate}}">
- <mat-icon svgIcon="hashtag"
- class="oldtypo-h2 comment_tag-icon"></mat-icon>
- <span style="margin-left: 0.25em;">{{commentsCountKeywords}}</span>
- </button>
- </ars-col>
- </div>
+ <div class="header-content-container" [ngClass]="{'darken': themeService.currentTheme.isDark}">
+ <div *ngIf="toggleUserActivity">
+ <div class="userActivityIcon"
+ matTooltip="{{'header.users-online' | translate}}"></div>
+ <p class="userActivityTxt">{{userActivity}}</p>
+ </div>
- <!--Feedback im Hörsaal-->
- <h2 class="header-slogan-mobile"
- *ngIf="router.url.includes('home') && deviceType === 'mobile'"
- fxLayoutAlign="center center">
- {{ 'header.home-header-mobile' | translate }}
- </h2>
+ <h2 class="oldtypo-h2"
+ *ngIf="router.url.endsWith('/moderator/comments') && deviceType === 'desktop'">
+ {{'header.moderation-warning'|translate}}
+ </h2>
- <h2 class="header-slogan-desktop"
- *ngIf="router.url.includes('home') && deviceType === 'desktop'"
+ <span
+ *ngIf="moderationEnabled && router.url.includes('comments')"
+ class="moderation-enabled"
fxLayoutAlign="center center">
- {{ 'header.home-header' | translate }}
- </h2>
+ <mat-icon style="color: red" matTooltip="{{ 'header.moderation-enabled' | translate }}">
+ gavel
+ </mat-icon>
+ </span>
- <span class="fill-remaining-space"></span>
+ <button mat-flat-button
+ tabindex="0"
+ *ngIf="!router.url.endsWith('moderator/comments') && router.url.endsWith('/comments') &&
+ deviceType === 'desktop'"
+ (click)="navigateTopicCloud()">
+ <mat-icon>cloud</mat-icon>
+ <span>{{'header.tag-cloud' | translate}}</span>
+ </button>
+
+ <h2 class="oldtypo-h2"
+ *ngIf="deviceType === 'desktop' && router.url !== '/home'">
+ {{cTime}}
+ </h2>
+
+ <button mat-flat-button
+ tabindex="0"
+ *ngIf="deviceType === 'desktop' && !router.url.endsWith('moderator/comments') &&
+ isSafari === 'false'"
+ routerLink="participant/room/{{shortId}}/comments/questionwall">
+ <mat-icon class="beamer-icon" svgIcon="beamer"></mat-icon>
+ <span>{{'header.questionwall' | translate}}</span>
+ </button>
+
+ <!--Feedback im Hörsaal-->
+ <h2 class="header-slogan-mobile"
+ *ngIf="router.url.includes('home') && deviceType === 'mobile'"
+ fxLayoutAlign="center center">
+ {{ 'header.home-header-mobile' | translate }}
+ </h2>
+
+ <h2 class="header-slogan-desktop"
+ *ngIf="router.url.includes('home') && deviceType === 'desktop'"
+ fxLayoutAlign="center center">
+ {{ 'header.home-header' | translate }}
+ </h2>
+
+ <span *ngIf="room && room.questionsBlocked">
+ <mat-icon style="color: red;" [matTooltip]="'header.questions-blocked' | translate">
+ block
+ </mat-icon>
+ </span>
+
+ <!--Topic Cloud-->
+ <div class="topic-cloud-btns"
+ *ngIf="router.url.includes('tagcloud')"
+ ars-flex-box>
+ <ars-col>
+ <button mat-icon-button
+ disableRipple="true"
+ *ngIf="isAdminConfigEnabled"
+ class="pseudo-button"
+ matTooltip="{{'header.overview-admin-config-enabled' | translate}}">
+ <mat-icon class="oldtypo-h2 comment_tag-icon"
+ style="color: red !important;">warning
+ </mat-icon>
+ </button>
+ <button mat-icon-button
+ disableRipple="true"
+ class="pseudo-button"
+ matTooltip="{{'header.overview-question-tooltip' | translate}}">
+ <mat-icon class="oldtypo-h2 comment_tag-icon">comment</mat-icon>
+ <span style="margin-left: 0.25em;">{{commentsCountQuestions}}</span>
+ </button>
+ <button mat-icon-button
+ disableRipple="true"
+ class="pseudo-button"
+ matTooltip="{{'header.overview-questioners-tooltip' | translate}}">
+ <mat-icon class="oldtypo-h2 comment_tag-icon">person</mat-icon>
+ <span style="margin-left: 0.25em;">{{commentsCountUsers}}</span>
+ </button>
+ <button mat-icon-button
+ disableRipple="true"
+ class="pseudo-button"
+ matTooltip="{{'header.overview-keywords-tooltip' | translate}}">
+ <mat-icon svgIcon="hashtag"
+ class="oldtypo-h2 comment_tag-icon"></mat-icon>
+ <span style="margin-left: 0.25em;">{{commentsCountKeywords}}</span>
+ </button>
+ </ars-col>
+ </div>
+ </div>
<mat-menu #userMenu="matMenu"
[overlapTrigger]="false">
@@ -175,57 +181,40 @@
<!-- Question board -->
<ng-container *ngIf="router.url.endsWith('/comments')">
- <ng-container>
-
- <button mat-menu-item
- *ngIf="user && user.role > 0 && !router.url.includes('/comment/') && !router.url.endsWith('/tagcloud') && !router.url.endsWith('moderator/comments')"
- tabindex="0"
- (click)="showQRDialog();">
- <mat-icon svgIcon="qrcode"
- class="header-icons qrcode">
- </mat-icon>
- <span>{{'header.room-qr' | translate}}</span>
- </button>
-
- <button mat-menu-item
- tabindex="0"
- *ngIf="user && user.role > 0 && !router.url.includes('/participant/') && !router.url.endsWith('moderator/comments')"
- routerLink="moderator/room/{{shortId}}/moderator/comments">
- <mat-icon>
- visibility_off
- </mat-icon>
- <span>{{'header.moderationboard' | translate}}</span>
- </button>
-
- <button mat-menu-item
- tabindex="0"
- *ngIf="deviceType !== 'mobile' && !router.url.endsWith('moderator/comments') && isSafari === 'false'"
- routerLink="participant/room/{{shortId}}/comments/questionwall">
- <mat-icon class="beamer-icon"
- svgIcon="beamer">
- </mat-icon>
- <span>{{'header.questionwall' | translate}}</span>
- </button>
-
- <button mat-menu-item
- tabindex="0"
- *ngIf="!router.url.endsWith('moderator/comments')"
- (click)="navigateTopicCloud()">
- <mat-icon>cloud
- </mat-icon>
- <span>{{'header.tag-cloud' | translate}}</span>
- </button>
-
- <button mat-menu-item
- tabindex="0"
- *ngIf="!router.url.endsWith('moderator/comments')"
- routerLink="quiz">
- <mat-icon>timer
- </mat-icon>
- <span>{{'header.quiz-now' | translate}}</span>
- </button>
-
- </ng-container>
+ <button mat-menu-item
+ *ngIf="user && user.role > 0 && !router.url.includes('/comment/') && !router.url.endsWith('/tagcloud') && !router.url.endsWith('moderator/comments')"
+ tabindex="0"
+ (click)="showQRDialog();">
+ <mat-icon svgIcon="qrcode"
+ class="header-icons qrcode">
+ </mat-icon>
+ <span>{{'header.room-qr' | translate}}</span>
+ </button>
+
+ <button mat-menu-item
+ tabindex="0"
+ *ngIf="user && user.role > 0 && !router.url.includes('/participant/') &&
+ !router.url.endsWith('moderator/comments')"
+ routerLink="moderator/room/{{shortId}}/moderator/comments">
+ <mat-icon>visibility_off</mat-icon>
+ <span>{{'header.moderationboard' | translate}}</span>
+ </button>
+
+ <button mat-menu-item
+ tabindex="0"
+ *ngIf="!router.url.endsWith('moderator/comments') && deviceType === 'mobile'"
+ (click)="navigateTopicCloud()">
+ <mat-icon>cloud</mat-icon>
+ <span>{{'header.tag-cloud' | translate}}</span>
+ </button>
+
+ <button mat-menu-item
+ tabindex="0"
+ *ngIf="!router.url.endsWith('moderator/comments')"
+ routerLink="quiz">
+ <mat-icon>timer</mat-icon>
+ <span>{{'header.quiz-now' | translate}}</span>
+ </button>
</ng-container>
diff --git a/src/app/components/shared/header/header.component.scss b/src/app/components/shared/header/header.component.scss
index 7b638a9afade3fc5d80d824edeaa258d928079ff..c494f368fec1b1276c53f89f2c7a76969906bd86 100644
--- a/src/app/components/shared/header/header.component.scss
+++ b/src/app/components/shared/header/header.component.scss
@@ -35,11 +35,33 @@ mat-toolbar-row {
font-weight: bold;
}
-.noOfQuestions {
- position: absolute !important;
- right: 130px !important;
- padding: 10px !important;
- margin: 0 !important;
+.header-content-container {
+ display: flex;
+ flex-direction: row;
+ flex: 1;
+ justify-content: space-evenly;
+ align-items: center;
+ overflow: hidden;
+
+ > button {
+ background-color: var(--primary-variant);
+ border-radius: 5px;
+
+ &:hover {
+ color: var(--on-secondary) !important;
+ background-color: var(--secondary) !important;
+
+ mat-icon {
+ color: var(--on-secondary) !important;
+ background-color: var(--secondary) !important;
+ }
+ }
+ }
+
+ &.darken > button {
+ background-color: var(--dialog);
+ color: var(--on-dialog)
+ }
}
.topic-cloud-btns {
@@ -127,6 +149,7 @@ svg {
.beamer-icon {
transform: scale(1.4);
+ margin-right: 5px;
}
.mat-menu-inner-title {
@@ -174,10 +197,10 @@ h1 {
}
.userActivityIcon {
+ display: inline-block;
width: 25px;
height: 25px;
- margin-left: 25px;
- margin-bottom: 5px;
+ margin-bottom: -5px;
background-color: var(--primary);
-webkit-mask-image: url("../../../../assets/icons/activity.svg");
mask-image: url("../../../../assets/icons/activity.svg");
@@ -187,6 +210,7 @@ h1 {
}
.userActivityTxt {
+ display: inline-block;
color: var(--primary);
margin-left: 5px;
font-size: 14px;
diff --git a/src/app/components/shared/header/header.component.ts b/src/app/components/shared/header/header.component.ts
index 2e64ca1d4f4d8723cc9111939fc94da4b59a51bb..55aa4aceea5b564e01bfbf8d02ab8e92e4afdc78 100644
--- a/src/app/components/shared/header/header.component.ts
+++ b/src/app/components/shared/header/header.component.ts
@@ -30,13 +30,15 @@ import { HeaderService } from '../../../services/util/header.service';
import { OnboardingService } from '../../../services/util/onboarding.service';
import { WorkerConfigDialogComponent } from '../_dialogs/worker-config-dialog/worker-config-dialog.component';
import { ArsComposeHostDirective } from '../../../../../projects/ars/src/lib/compose/ars-compose-host.directive';
+import { ThemeService } from '../../../../theme/theme.service';
@Component({
selector: 'app-header',
templateUrl: './header.component.html',
styleUrls: ['./header.component.scss']
})
-export class HeaderComponent implements OnInit,AfterViewInit {
+export class HeaderComponent implements OnInit, AfterViewInit {
+ @ViewChild(ArsComposeHostDirective) host: ArsComposeHostDirective;
user: User;
cTime: string;
shortId: string;
@@ -52,7 +54,6 @@ export class HeaderComponent implements OnInit,AfterViewInit {
userActivity = 0;
deviceType = localStorage.getItem('deviceType');
private _subscriptionRoomService = null;
- @ViewChild(ArsComposeHostDirective)host:ArsComposeHostDirective;
constructor(public location: Location,
private authenticationService: AuthenticationService,
@@ -70,12 +71,13 @@ export class HeaderComponent implements OnInit,AfterViewInit {
private wsRoomService: WsRoomService,
private topicCloudAdminService: TopicCloudAdminService,
private headerService: HeaderService,
- private onboardingService: OnboardingService
+ private onboardingService: OnboardingService,
+ public themeService: ThemeService
) {
}
- ngAfterViewInit(){
- this.headerService.initHeader(()=>this);
+ ngAfterViewInit() {
+ this.headerService.initHeader(() => this);
}
ngOnInit() {
diff --git a/src/app/components/shared/tag-cloud/tag-cloud.component.ts b/src/app/components/shared/tag-cloud/tag-cloud.component.ts
index 7f8955384f86be47ec8db65168e78532b49e2c44..510f32dfc8b0bfa273e46e599a27ff65d7429c2d 100644
--- a/src/app/components/shared/tag-cloud/tag-cloud.component.ts
+++ b/src/app/components/shared/tag-cloud/tag-cloud.component.ts
@@ -400,7 +400,7 @@ export class TagCloudComponent implements OnInit, OnDestroy, AfterContentInit {
this.topicCloudAdmin.setAdminData(admin, false, this.userRole);
if (this.deviceInfo.isCurrentlyMobile) {
const defaultParams = new CloudParameters();
- defaultParams.resetToDefault(this.themeService.getThemeByKey(this.themeService.themeName).isDark);
+ defaultParams.resetToDefault(this.themeService.currentTheme.isDark);
data.fontSizeMin = defaultParams.fontSizeMin;
data.fontSizeMax = defaultParams.fontSizeMax;
}
diff --git a/src/app/components/shared/write-comment/write-comment.component.html b/src/app/components/shared/write-comment/write-comment.component.html
index af8aca65b9f03ddf0f180a8b870eb5572beee464..92434bbb358568ebff891c679679353928853051 100644
--- a/src/app/components/shared/write-comment/write-comment.component.html
+++ b/src/app/components/shared/write-comment/write-comment.component.html
@@ -23,26 +23,22 @@
</mat-select>
</button>
</div>
- <div class="anchor-wrp" *ngIf="enabled">
- <div class="anchor-right">
- <mat-form-field *ngIf="tags"
- class="tag-form-field">
- <mat-label>
- <mat-icon class="icon-svg"
- svgIcon="comment_tag"></mat-icon>
- {{'comment-page.tag' | translate}}
- </mat-label>
- <label for="tagSelect">{{selectedTag}}</label>
- <mat-select [(ngModel)]="selectedTag"
- class="tag-select"
- id="tagSelect">
- <mat-option>{{'comment-page.tag-reset' | translate}}</mat-option>
- <mat-option *ngFor="let tag of tags"
- value="{{tag}}">{{tag}}</mat-option>
- </mat-select>
- </mat-form-field>
- </div>
- </div>
+ <mat-form-field *ngIf="tags"
+ class="tag-form-field">
+ <mat-label>
+ <mat-icon class="icon-svg"
+ svgIcon="comment_tag"></mat-icon>
+ {{'comment-page.tag' | translate}}
+ </mat-label>
+ <label for="tagSelect">{{selectedTag}}</label>
+ <mat-select [(ngModel)]="selectedTag"
+ class="tag-select"
+ id="tagSelect">
+ <mat-option>{{'comment-page.tag-reset' | translate}}</mat-option>
+ <mat-option *ngFor="let tag of tags"
+ value="{{tag}}">{{tag}}</mat-option>
+ </mat-select>
+ </mat-form-field>
</ars-row>
<ars-row [height]="12"></ars-row>
<app-view-comment-data *ngIf="enabled"
diff --git a/src/app/components/shared/write-comment/write-comment.component.scss b/src/app/components/shared/write-comment/write-comment.component.scss
index 7e2551a7987801000340d16a86e675063070663e..a173fcd09fa46ce7b9dd24c2db38547c864d5e94 100644
--- a/src/app/components/shared/write-comment/write-comment.component.scss
+++ b/src/app/components/shared/write-comment/write-comment.component.scss
@@ -118,22 +118,14 @@ Styling for tag selection
}
.tag-form-field {
- @media screen and (max-width: 500px) {
- width: 70px;
- }
z-index: 10000;
-}
+ float: right;
-.anchor-right {
- @media screen and (max-width: 500px) {
- width: 70px;
- left: calc(100% - 70px);
+ @media screen and (max-width: 480px) {
+ float: unset;
+ width: max-content;
+ margin: 5px 16px;
}
- width: 200px;
- height: 50px;
- position: relative;
- left: calc(100% - 200px);
- top: 0;
}
.anchor-wrp {
@@ -163,6 +155,11 @@ Styling for language select
margin-right: 0;
width: 200px;
display: inline-block;
+
+ > button {
+ padding: 0 0 0 2px;
+ margin-left: 16px;
+ }
}
/*
diff --git a/src/app/services/util/onboarding.service.ts b/src/app/services/util/onboarding.service.ts
index 924a7c7466e3e7ef3e9fe85af089f591a971e106..07a434ba8e976d2f2669e3f237286bd74b0010d9 100644
--- a/src/app/services/util/onboarding.service.ts
+++ b/src/app/services/util/onboarding.service.ts
@@ -60,7 +60,7 @@ export class OnboardingService {
startDefaultTour(ignoreDone = false): boolean {
return this.startOnboardingTour(
- initDefaultTour(this.authenticationService, this.dataStoreService, this.router, this.roomService), ignoreDone);
+ initDefaultTour(this.authenticationService, this.dataStoreService, this.roomService), ignoreDone);
}
doStep(stepDirection: number): boolean {
@@ -109,6 +109,9 @@ export class OnboardingService {
if (tourInfo && tourInfo.state !== 'running') {
return false;
}
+ if (!this.dataStoreService.has('onboarding_' + tour.name + '_redirect')) {
+ this.dataStoreService.set('onboarding_' + tour.name + '_redirect', this.router.url);
+ }
AppComponent.rescale.setDefaultScale(1);
this._currentStep = tourInfo && tourInfo.step ? tourInfo.step : 1;
const firstStepRoute = tour.tour[this._currentStep - 1].split('@');
@@ -212,11 +215,15 @@ export class OnboardingService {
}
private cleanup(finished = false) {
+ const redirectKey = 'onboarding_' + this._activeTour.name + '_redirect';
+ const redirect = this.dataStoreService.get(redirectKey);
this._eventServiceSubscription.unsubscribe();
this._activeTour = null;
if (finished) {
this._tourSubscription.unsubscribe();
window.removeEventListener('keyup', this._keyUpWrapper);
+ this.dataStoreService.remove(redirectKey);
+ this.router.navigate([redirect]);
}
}
diff --git a/src/app/services/util/onboarding.tours.ts b/src/app/services/util/onboarding.tours.ts
index a7eb6c49ba2569bee810b2c9994250605d98c23e..e129d1724efb23499b4fb270a56d918f1a286e9d 100644
--- a/src/app/services/util/onboarding.tours.ts
+++ b/src/app/services/util/onboarding.tours.ts
@@ -1,7 +1,6 @@
import { AuthenticationService } from '../http/authentication.service';
import { UserRole } from '../../models/user-roles.enum';
import { DataStoreService } from './data-store.service';
-import { Router } from '@angular/router';
import { RoomService } from '../http/room.service';
import { Observable, of, Subject } from 'rxjs';
@@ -36,7 +35,6 @@ const roomChecker = (roomService: RoomService, roomUrl: string): Observable<bool
export const initDefaultTour = (authenticationService: AuthenticationService,
dataStoreService: DataStoreService,
- router: Router,
roomService: RoomService): OnboardingTour => ({
name: 'default',
tour: [
@@ -76,7 +74,6 @@ export const initDefaultTour = (authenticationService: AuthenticationService,
authenticationService.logout();
}
dataStoreService.remove('onboarding-default-meta');
- router.navigate(['/home']);
},
startupAction: () => {
dataStoreService.set('onboarding-default-meta', String(authenticationService.isLoggedIn()));
diff --git a/src/assets/i18n/creator/de.json b/src/assets/i18n/creator/de.json
index 42991fd1b2476470cd4d63c31a20d0ec5f84b19b..118ed512e077f38b90eb3fb7eb5f5cf18656d060 100644
--- a/src/assets/i18n/creator/de.json
+++ b/src/assets/i18n/creator/de.json
@@ -191,7 +191,7 @@
"edit-favorite-reset": "Markierung zurücksetzen",
"edit-bookmark": "Lesezeichen setzen",
"edit-bookmark-reset": "Markierung zurücksetzen",
- "grammar-check": "Text prüfen",
+ "grammar-check": "Text optimieren",
"show-comment-with-filter": "Vulgäre Wörter ausixen",
"show-comment-without-filter": "Vulgäre Wörter anzeigen",
"upvote": "positiv:",
@@ -251,7 +251,7 @@
"more": "Formell"
},
"explanation": {
- "label": "Erklärung",
+ "label": "Erklären",
"close": "Schließen",
"deepl": "## Text optimieren \n\nUm deine Frage optimal lesbar und verständlich zu präsentieren, lassen wir sie mit dem KI-Übersetzungsprogramm [DeepL](https://www.deepl.com/translator) ins Englische und zurück ins Deutsche übersetzen. \n\nDie Rückübersetzung ist in fast allen Fällen besser als das Original in Bezug auf Rechtschreibung, Grammatik, Interpunktion und Sprachstil.",
"spacy": "## Stichwörter \n\nMittels NLP (Natural Language Processing) wird deine Frage grammatikalisch analysiert. Die erkannten Substantive werden in ihre Grundform gebracht, d. h. lemmatisiert, und dir als Stichwörter vorgeschlagen. Für die Textanalyse verwenden wir die freie NLP-Software [spaCy](https://spacy.io/). \n\nDie Stichwörter können verwendet werden, um die Liste der Fragen zu filtern oder um eine Wortwolke zu erstellen.",
diff --git a/src/assets/i18n/creator/en.json b/src/assets/i18n/creator/en.json
index 1d80c99102f3e480b93ed52d62cadfe6df35d632..84d9e345710f2301055421958da36d59256eefa6 100644
--- a/src/assets/i18n/creator/en.json
+++ b/src/assets/i18n/creator/en.json
@@ -192,7 +192,7 @@
"edit-favorite-reset": "Remove marker",
"edit-bookmark": "Bookmark",
"edit-bookmark-reset": "Remove marker",
- "grammar-check": "Check text",
+ "grammar-check": "Optimize text",
"show-comment-with-filter": "Hide vulgar words",
"show-comment-without-filter": "Show vulgar words",
"upvote": "upvotes:",
@@ -252,7 +252,7 @@
"more": "Formal"
},
"explanation": {
- "label": "Explanation",
+ "label": "Explain",
"close": "Close",
"deepl": "## Text optimization\n\nTo make your question as readable and understandable as possible, we have it translated into German and back into English using the translation program [DeepL](https://www.deepl.com/translator).\n\nThe back translation is in almost all cases better than the original in terms of spelling, grammar, punctuation and language style.",
"spacy": "## Text analysis\n\nUsing NLP (Natural Language Processing) your question will be analyzed grammatically. The recognized nouns are put into their basic form, i.e. lemmatized, and suggested to you as keywords. For the text analysis we use the free NLP software [spaCy](https://spacy.io/). \n\nThe keywords can be used to filter the list of questions or to create a word cloud.",
diff --git a/src/assets/i18n/home/de.json b/src/assets/i18n/home/de.json
index 418c32c985d267b9f984c7c638ada31c87c0373c..58455fc857e217d3840652e17b6399769e0b77f9 100644
--- a/src/assets/i18n/home/de.json
+++ b/src/assets/i18n/home/de.json
@@ -54,13 +54,13 @@
"tag-cloud-questions-title": "Welche Fragen soll die Themenwolke umfassen?",
"tag-cloud-questions-all": "Alle Fragen",
"tag-cloud-questions-all-short": "Alle",
- "tag-cloud-questions-current-filtered": "Fragenliste",
+ "tag-cloud-questions-current-filtered": "Liste",
"tag-cloud-questions-brainstorming": "Fragen, die ab jetzt gestellt werden (Brainstorming)",
"tag-cloud-questions-brainstorming-short": "Brainstorming",
"tag-cloud-create": "Weiter"
},
"explanation": {
- "label": "Erklärung",
+ "label": "Erklären",
"close": "Schließen",
"deepl": "## Text optimieren \n\nUm deine Frage optimal lesbar und verständlich zu präsentieren, lassen wir sie mit dem KI-Übersetzungsprogramm [DeepL](https://www.deepl.com/translator) ins Englische und zurück ins Deutsche übersetzen. \n\nDie Rückübersetzung ist in fast allen Fällen besser als das Original in Bezug auf Rechtschreibung, Grammatik, Interpunktion und Sprachstil.",
"spacy": "## Stichwörter \n\nMittels NLP (Natural Language Processing) wird deine Frage grammatikalisch analysiert. Die erkannten Substantive werden in ihre Grundform gebracht, d. h. lemmatisiert, und dir als Stichwörter vorgeschlagen. Für die Textanalyse verwenden wir die freie NLP-Software [spaCy](https://spacy.io/). \n\nDie Stichwörter können verwendet werden, um die Liste der Fragen zu filtern oder um eine Wortwolke zu erstellen.",
diff --git a/src/assets/i18n/home/en.json b/src/assets/i18n/home/en.json
index 71d8b52de92ac2d6d21c1d7dbfdd8478df9c7e70..dfb90e29487138271e9839366d8931d75e5ff058 100644
--- a/src/assets/i18n/home/en.json
+++ b/src/assets/i18n/home/en.json
@@ -47,7 +47,7 @@
"motd-mark-read": "Mark as read"
},
"explanation": {
- "label": "Explanation",
+ "label": "Explain",
"close": "Close",
"deepl": "## Text optimization\n\nTo make your question as readable and understandable as possible, we have it translated into English and back into German using the translation program [DeepL] (https://www.deepl.com/translator). \n\nThe back translation is in almost all cases better than the original in terms of spelling, grammar, punctuation and language style.",
"spacy": "## Text analysis\n\nUsing NLP (Natural Language Processing) your question will be analyzed grammatically. The recognized nouns are put into their basic form, i.e. lemmatized, and suggested to you as keywords. For the text analysis we use the free NLP software [spaCy] (https://spacy.io/). \n\nThe keywords can be used to filter the list of questions or to create a word cloud.",
@@ -159,7 +159,7 @@
"tag-cloud-questions-title": "Which questions should the topic cloud include?",
"tag-cloud-questions-all": "All questions",
"tag-cloud-questions-all-short": "All",
- "tag-cloud-questions-current-filtered": "Question list",
+ "tag-cloud-questions-current-filtered": "List",
"tag-cloud-questions-brainstorming": "Brain storming session: questions from now on",
"tag-cloud-questions-brainstorming-short": "Brain storming session",
"tag-cloud-create": "Create"
diff --git a/src/assets/i18n/participant/de.json b/src/assets/i18n/participant/de.json
index 77b687cb526ad48ad343d3f6073335e931d02916..20025f7f8451fdb4434c7a6ea6fc7e71fd3a4c28 100644
--- a/src/assets/i18n/participant/de.json
+++ b/src/assets/i18n/participant/de.json
@@ -160,7 +160,7 @@
"show-more": "Mehr anzeigen ↓",
"show-less": "Weniger anzeigen ↑",
"sure": "Bist du sicher?",
- "grammar-check": "Text prüfen",
+ "grammar-check": "Text optimieren",
"upvote": "positiv:",
"downvote": "negativ:",
"questioner-name": "Selbst vergebener Name"
@@ -179,7 +179,7 @@
"more": "Formell"
},
"explanation": {
- "label": "Erklärung",
+ "label": "Erklären",
"close": "Schließen",
"deepl": "## Text optimieren \n\nUm deine Frage optimal lesbar und verständlich zu präsentieren, lassen wir sie mit dem KI-Übersetzungsprogramm [DeepL](https://www.deepl.com/translator) ins Englische und zurück ins Deutsche übersetzen. \n\nDie Rückübersetzung ist in fast allen Fällen besser als das Original in Bezug auf Rechtschreibung, Grammatik, Interpunktion und Sprachstil.",
"spacy": "## Stichwörter \n\nMittels NLP (Natural Language Processing) wird deine Frage grammatikalisch analysiert. Die erkannten Substantive werden in ihre Grundform gebracht, d. h. lemmatisiert, und dir als Stichwörter vorgeschlagen. Für die Textanalyse verwenden wir die freie NLP-Software [spaCy](https://spacy.io/). \n\nDie Stichwörter können verwendet werden, um die Liste der Fragen zu filtern oder um eine Wortwolke zu erstellen.",
diff --git a/src/assets/i18n/participant/en.json b/src/assets/i18n/participant/en.json
index e6e856110575d24dfa7ccb9154462a2338767567..b3f06157a234415d9187c3999dab53672d962a7c 100644
--- a/src/assets/i18n/participant/en.json
+++ b/src/assets/i18n/participant/en.json
@@ -169,7 +169,7 @@
"show-more": "Show more ↓",
"show-less": "Show less ↑",
"delete": "Delete question",
- "grammar-check": "Check text",
+ "grammar-check": "Optimize text",
"upvote": "upvotes:",
"downvote": "downvotes:",
"questioner-name": "Self assigned name"
@@ -188,7 +188,7 @@
"more": "Formal"
},
"explanation": {
- "label": "Explanation",
+ "label": "Explain",
"close": "Close",
"deepl": "## Text optimization\n\nTo make your question as readable and understandable as possible, we have it translated into German and back into English using the translation program [DeepL](https://www.deepl.com/translator).\n\nThe back translation is in almost all cases better than the original in terms of spelling, grammar, punctuation and language style.",
"spacy": "## Text analysis\n\nUsing NLP (Natural Language Processing) your question will be analyzed grammatically. The recognized nouns are put into their basic form, i.e. lemmatized, and suggested to you as keywords. For the text analysis we use the free NLP software [spaCy](https://spacy.io/). \n\nThe keywords can be used to filter the list of questions or to create a word cloud.",
diff --git a/src/theme/light-theme/light-theme.ts b/src/theme/light-theme/light-theme.ts
index f2b14a77d573b5c84b4fb38876861380e45cee31..f185113099330e3e00da0702e0a52b84a89c3f5c 100644
--- a/src/theme/light-theme/light-theme.ts
+++ b/src/theme/light-theme/light-theme.ts
@@ -1,6 +1,6 @@
export const arsnova = {
- '--primary': 'green',
+ '--primary': '#073a52',
'--primary-variant': 'LightGoldenrodYellow',
'--secondary': 'maroon',
diff --git a/src/theme/theme.service.ts b/src/theme/theme.service.ts
index d35a3129029a019c03c74e54035999b5f7827cd2..2a1b2f23093f6d673a3f2edc5565723e02bc4b52 100644
--- a/src/theme/theme.service.ts
+++ b/src/theme/theme.service.ts
@@ -7,8 +7,7 @@ import { Theme } from './Theme';
providedIn: 'root'
})
export class ThemeService {
- themeName = localStorage.getItem('theme');
- private activeThem = new BehaviorSubject(this.themeName);
+ private activeThem = new BehaviorSubject(localStorage.getItem('theme'));
private themes: Theme[] = [];
constructor() {
@@ -33,19 +32,28 @@ export class ThemeService {
return 0;
});
const isDark = window.matchMedia ? window.matchMedia('(prefers-color-scheme: dark)').matches : true;
- const selectedTheme = this.themes.find(elem => elem.key === this.themeName);
- if (!this.themeName || !selectedTheme || selectedTheme.isDark !== isDark) {
+ let currentTheme = this.currentThemeName;
+ const selectedTheme = this.themes.find(elem => elem.key === currentTheme);
+ if (!currentTheme || !selectedTheme || selectedTheme.isDark !== isDark) {
for (let i = this.themes.length - 1; i > 0; i--) {
const theme = this.themes[i];
if (theme.isDark === isDark) {
- this.themeName = theme.key;
+ currentTheme = theme.key;
break;
}
}
- this.activate(this.themeName);
+ this.activate(currentTheme);
}
}
+ get currentThemeName(): string {
+ return this.activeThem.value;
+ }
+
+ get currentTheme(): Theme {
+ return this.getThemeByKey(this.currentThemeName);
+ }
+
public getTheme() {
return this.activeThem.asObservable();
}