From 6254725f53f9108c4b373763a9b835dbbc68a57b Mon Sep 17 00:00:00 2001 From: Klaus Quibeldey-Cirkel <klaus-dieter.quibeldey-cirkel@mni.thm.de> Date: Mon, 2 Aug 2021 09:18:09 +0200 Subject: [PATCH] wording & styling --- .../topic-cloud-filter.component.html | 72 +++++++++++-------- .../topic-cloud-filter.component.scss | 1 + src/assets/i18n/home/de.json | 7 +- src/assets/i18n/home/en.json | 29 ++++---- 4 files changed, 60 insertions(+), 49 deletions(-) diff --git a/src/app/components/shared/_dialogs/topic-cloud-filter/topic-cloud-filter.component.html b/src/app/components/shared/_dialogs/topic-cloud-filter/topic-cloud-filter.component.html index bcc044046..eb28beabb 100644 --- a/src/app/components/shared/_dialogs/topic-cloud-filter/topic-cloud-filter.component.html +++ b/src/app/components/shared/_dialogs/topic-cloud-filter/topic-cloud-filter.component.html @@ -18,16 +18,22 @@ <h3>{{'content.tag-cloud-questions-title' | translate}}</h3> <span *ngIf="isTopicRequirementActive"> - <mat-icon [inline]="true" style="color: var(--red) !important;">warning</mat-icon> + <mat-icon [inline]="true" + style="color: var(--red) !important;">warning</mat-icon> {{'header.overview-admin-config-enabled' | translate}} </span> - <mat-radio-group [(ngModel)]="continueFilter" aria-label="Select an option"> - <mat-radio-button checked="true" value="continueWithAll"> + <mat-radio-group [(ngModel)]="continueFilter" + aria-label="Select an option"> + <mat-radio-button checked="true" + value="continueWithAll"> <div class="elementRow"> - <div class="elementText" *ngIf="isMobile()">{{'content.tag-cloud-questions-all-short' | translate}}</div> - <div class="elementText" *ngIf="!isMobile()">{{'content.tag-cloud-questions-all' | translate}}</div> - <div class="elementIcons" *ngIf="allComments"> + <div class="elementText" + *ngIf="isMobile()">{{'content.tag-cloud-questions-all-short' | translate}}</div> + <div class="elementText" + *ngIf="!isMobile()">{{'content.tag-cloud-questions-all' | translate}}</div> + <div class="elementIcons" + *ngIf="allComments"> <mat-icon [inline]="true" matTooltip="{{'header.overview-question-tooltip' | translate}}">comment </mat-icon> @@ -36,16 +42,19 @@ matTooltip="{{'header.overview-questioners-tooltip' | translate}}">person </mat-icon> {{allComments.users}} - <mat-icon svgIcon="hashtag" class="comment_tag-icon" + <mat-icon svgIcon="hashtag" + class="comment_tag-icon" matTooltip="{{'header.overview-keywords-tooltip' | translate}}"></mat-icon> {{allComments.keywords}} </div> </div> </mat-radio-button> - <mat-radio-button value="continueWithCurr" *ngIf="!disableCurrentFiltersOptions"> + <mat-radio-button value="continueWithCurr" + *ngIf="!disableCurrentFiltersOptions"> <div class="elementRow"> <div class="elementText">{{'content.tag-cloud-questions-current-filtered' | translate}}</div> - <div class="elementIcons" *ngIf="filteredComments"> + <div class="elementIcons" + *ngIf="filteredComments"> <mat-icon [inline]="true" matTooltip="{{'header.overview-question-tooltip' | translate}}">comment </mat-icon> @@ -54,30 +63,38 @@ matTooltip="{{'header.overview-questioners-tooltip' | translate}}">person </mat-icon> {{filteredComments.users}} - <mat-icon svgIcon="hashtag" class="comment_tag-icon" + <mat-icon svgIcon="hashtag" + class="comment_tag-icon" matTooltip="{{'header.overview-keywords-tooltip' | translate}}"></mat-icon> {{filteredComments.keywords}} </div> </div> </mat-radio-button> - <mat-radio-button #radioButton value="continueWithAllFromNow"> + <mat-radio-button #radioButton + value="continueWithAllFromNow"> <span *ngIf="isMobile()">{{'content.tag-cloud-questions-brainstorming-short' | translate}}</span> <span *ngIf="!isMobile()">{{'content.tag-cloud-questions-brainstorming' | translate}}</span> </mat-radio-button> - <mat-form-field *ngIf="user && user.role > 0 && radioButton.checked" appearance="fill"> + <mat-form-field *ngIf="user && user.role > 0 && radioButton.checked" + appearance="fill"> <mat-label>{{'content.brainstorming-question' | translate}}</mat-label> - <input matInput autocomplete="off" type="text" [(ngModel)]="question"> - <button *ngIf="question" matSuffix mat-icon-button aria-label="Clear" (click)="question=''"> + <input matInput + autocomplete="off" + type="text" + [(ngModel)]="question"> + <button *ngIf="question" + matSuffix + mat-icon-button + aria-label="Clear" + (click)="question=''"> <mat-icon>close</mat-icon> </button> </mat-form-field> </mat-radio-group> - <mat-divider *ngIf="user && user.role > 0 && hasNoKeywords"></mat-divider> - - <mat-card *ngIf="user && user.role > 0 && hasNoKeywords" class="noKeywords"> + <mat-card *ngIf="user && user.role > 0 && hasNoKeywords" + class="noKeywords"> <p>{{'topic-cloud-filter.info-no-keywords' | translate}}</p> - <span>{{'topic-cloud-filter.label-refresh-keywords' | translate}}</span> <button mat-flat-button type="button" class="mat-flat-button secondary-confirm-button" @@ -86,16 +103,15 @@ </button> </mat-card> - <mat-divider *ngIf="user && user.role > 0"></mat-divider> - - <app-worker-dialog [inlined]="true" *ngIf="user && user.role > 0"></app-worker-dialog> + <app-worker-dialog [inlined]="true" + *ngIf="user && user.role > 0"></app-worker-dialog> -<app-dialog-action-buttons - buttonsLabelSection="content" - confirmButtonLabel="tag-cloud-create" - buttonIcon="cloud" + <app-dialog-action-buttons + buttonsLabelSection="content" + confirmButtonLabel="tag-cloud-create" + buttonIcon="cloud" - [cancelButtonClickAction]="cancelButtonActionCallback()" - [confirmButtonClickAction]="confirmButtonActionCallback()"> -</app-dialog-action-buttons> + [cancelButtonClickAction]="cancelButtonActionCallback()" + [confirmButtonClickAction]="confirmButtonActionCallback()"> + </app-dialog-action-buttons> diff --git a/src/app/components/shared/_dialogs/topic-cloud-filter/topic-cloud-filter.component.scss b/src/app/components/shared/_dialogs/topic-cloud-filter/topic-cloud-filter.component.scss index 7960858b5..f6328d663 100644 --- a/src/app/components/shared/_dialogs/topic-cloud-filter/topic-cloud-filter.component.scss +++ b/src/app/components/shared/_dialogs/topic-cloud-filter/topic-cloud-filter.component.scss @@ -46,6 +46,7 @@ mat-divider { .noKeywords { background: var(--surface); color: var(--on-surface); + margin-top: 20px; } .secondary-confirm-button { diff --git a/src/assets/i18n/home/de.json b/src/assets/i18n/home/de.json index bef0d5999..ead43916c 100644 --- a/src/assets/i18n/home/de.json +++ b/src/assets/i18n/home/de.json @@ -49,8 +49,7 @@ "cancel": "Abbrechen", "continue": "Weiter", "reset": "Zurücksetzen", - "brainstorming-question": "Brainstorming-Frage", - "tag-cloud-title": "Themenwolke", + "brainstorming-question": "Überschrift der Wortwolke", "tag-cloud-info": "Je größer die Schrift, desto häufiger wurde das Wort in den Fragen verwendet oder als Stichwort vergeben. Auch die Bewertungen der Fragen beeinflussen die Schriftgröße.", "tag-cloud-source-title": "Welche Stichwörter sollen angezeigt werden?", "tag-cloud-source-verified-by-user": "Stichwörter der Fragensteller*innen", @@ -64,7 +63,6 @@ "tag-cloud-questions-current-filtered": "Fragenliste", "tag-cloud-questions-brainstorming": "Fragen, die ab jetzt gestellt werden (Brainstorming)", "tag-cloud-questions-brainstorming-short": "Brainstorming", - "tag-cloud-description": "Sobald die Wolke erscheint, fahre mit der Maus über ein Wort, um die Anzahl involvierter Fragen, Fragensteller*innen und Bewertungen zu sehen. Klicke auf das Wort, um die zugehörigen Fragen anzuzeigen.", "tag-cloud-create": "Anzeigen" }, "header": { @@ -354,8 +352,7 @@ "inline-header": "Laufende Stichwort-Aktualisierungen" }, "topic-cloud-filter": { - "info-no-keywords": "Es sind derzeit keine Stichwörter vorhanden. Die Wortwolke wird leer sein. Eine Fragen-Analyse kann Stichwörter in alten Sessions automatisch erstellen.", - "label-refresh-keywords": "Fragen-Analyse starten?", + "info-no-keywords": "Es sind keine Stichwörter vorhanden. Die Wortwolke wird leer sein. Eine grammatikalische Fragen-Analyse kann Stichwörter automatisch erstellen. Fragen-Analyse starten?", "label-refresh-keywords-start": "Starten" } } diff --git a/src/assets/i18n/home/en.json b/src/assets/i18n/home/en.json index 1496a7294..6e1ced2e7 100644 --- a/src/assets/i18n/home/en.json +++ b/src/assets/i18n/home/en.json @@ -141,22 +141,20 @@ "cancel": "Cancel", "continue": "Continue", "reset": "Reset", - "brainstorming-question": "Brainstorming question", - "tag-cloud-title": "Topic cloud", + "brainstorming-question": "Word cloud heading", "tag-cloud-info": "The word cloud in »frag.jetzt« serves as a semantic filter: the larger the font, the more often the word was used grammatically in the questions or assigned as a keyword. The ratings of the questions also influence the font size.", - "tag-cloud-source-title": "Choose which questions to display:", - "tag-cloud-source-verified-by-user": "only questions that have been tagged with keywords", - "tag-cloud-source-verified-by-user-short": "only tagged questions", - "tag-cloud-source-analyzed": "only questions that have been analyzed grammatically", - "tag-cloud-source-analyzed-short": "only analyzed questions", - "tag-cloud-source-all": "all questions", - "tag-cloud-questions-title": "Choose which set of questions to include:", - "tag-cloud-questions-all": "all questions of the session", - "tag-cloud-questions-all-short": "all questions", - "tag-cloud-questions-current-filtered": "current questions", + "tag-cloud-source-title": "Which keywords should be displayed?", + "tag-cloud-source-verified-by-user": "Keywords from the questioners", + "tag-cloud-source-verified-by-user-short": "Assigned keywords", + "tag-cloud-source-analyzed": "Keywords from grammar analysis", + "tag-cloud-source-analyzed-short": "Keywords analysed", + "tag-cloud-source-all": "All keywords", + "tag-cloud-questions-title": "Which questions should be included?", + "tag-cloud-questions-all": "All questions", + "tag-cloud-questions-all-short": "All questions", + "tag-cloud-questions-current-filtered": "Question list", "tag-cloud-questions-brainstorming": "Brain storming session: questions that will be asked from now on", "tag-cloud-questions-brainstorming-short": "Brain storming session", - "tag-cloud-description": "Once the cloud appears, hover over a word to see the number of questions, questioners, and ratings involved. Click on the word to see all associated questions.", "tag-cloud-create": "Create word cloud" }, "imprint": { @@ -352,12 +350,11 @@ "room-name": "Session name", "comments": "Questions", "bad-spelled": "Spelling too bad", - "failed": "Error occured", + "failed": "Error occurred", "inline-header": "Ongoing keyword updates" }, "topic-cloud-filter": { - "info-no-keywords": "There are currently no keywords. The topic cloud will be empty. A question analysis can automatically create keywords in old sessions.", - "label-refresh-keywords": "Start question analysis?", + "info-no-keywords": "TThere are no keywords. The word cloud will be empty. A grammatical question analysis can create keywords automatically. Start question analysis?", "label-refresh-keywords-start": "Start" } } -- GitLab