diff --git a/commit.txt b/commit.txt
new file mode 100644
index 0000000000000000000000000000000000000000..ce039ff3f98ede4e9981a11da025d92fe8c76f9a
--- /dev/null
+++ b/commit.txt
@@ -0,0 +1 @@
+revision of the tool-tips and the translation
\ No newline at end of file
diff --git a/src/app/components/shared/_dialogs/cloud-configuration/cloud-configuration.component.html b/src/app/components/shared/_dialogs/cloud-configuration/cloud-configuration.component.html
index 793df0cb579797d2969d4c0b1789b8ddc50daff0..433d5e01c39d39bbb7094200d7007d91fbe6aa25 100644
--- a/src/app/components/shared/_dialogs/cloud-configuration/cloud-configuration.component.html
+++ b/src/app/components/shared/_dialogs/cloud-configuration/cloud-configuration.component.html
@@ -18,11 +18,7 @@
<div class="input-row firstElementOfExpansionPanel" fxLayout="row" fxLayoutGap="5px" fxLayout.xs="column">
<mat-slide-toggle matTooltip="{{'tag-cloud-config.random-angle-tooltip' | translate}}" (change)="valueChanged()" fxFlex [(ngModel)]="cloudParameters.randomAngles"
[ngModelOptions]="{standalone: true}">{{'tag-cloud-config.random-angle' | translate}}</mat-slide-toggle>
- </div>
- <div class="input-row special-settings automatic-spelling" fxLayout="row" fxLayoutGap="5px" fxLayout.xs="column">
- <div class="input-row" fxLayout="row" fxLayoutGap="5px" fxLayout.xs="column">
- <mat-slide-toggle matTooltip="{{'tag-cloud-config.automatic-spelling-tooltip' | translate}}" [(ngModel)]="cloudParameters.checkSpelling" [checked]="cloudParameters.checkSpelling" [ngModelOptions]="{standalone: true}" (change)="valueChanged()">{{'tag-cloud-config.automatic-spelling' | translate}}</mat-slide-toggle>
- </div>
+ <mat-icon matTooltip="{{'tag-cloud-config.random-angle-note' | translate}}">help</mat-icon>
</div>
<div class="input-row special-settings automatic-spelling" fxLayout="row" fxLayoutGap="5px" fxLayout.xs="column">
<mat-radio-group matTooltip="{{'tag-cloud-config.notation-tooltip' | translate}}" aria-label="Notation:"> {{'tag-cloud-config.notation' | translate}}
@@ -71,7 +67,7 @@
<div class="input-row" fxLayout="column" fxLayoutGap="5px">
<mat-form-field appearance="fill">
<mat-label>{{'tag-cloud-config.font-family' | translate}}</mat-label>
- <mat-select (selectionChange)="valueChanged()" [(ngModel)]="cloudParameters.fontFamily">
+ <mat-select (selectionChange)="valueChanged()" matTooltip="{{'tag-cloud-config.font-family-tooltip' | translate}}" [(ngModel)]="cloudParameters.fontFamily">
<mat-option value="sans-serif">Normal</mat-option>
<mat-option value="Abril Fatface">Abril Fatface</mat-option>
<mat-option value="Dancing Script">Dancing Script</mat-option>
@@ -81,24 +77,23 @@
</mat-form-field>
</div>
<div class="input-row special-settings automatic-spelling" fxLayout="row" fxLayoutGap="5px" fxLayout.xs="column">
- <mat-radio-group matTooltip="{{'tag-cloud-config.notation-tooltip' | translate}}" aria-label="Notation:">
- <div><mat-slide-toggle [checked]="checkItalic()" (change)="italicChecked($event)"[ngModelOptions]="{standalone: true}">{{'tag-cloud-config.font-style-italic' | translate}}</mat-slide-toggle> </div>
+ <mat-radio-group matTooltip="{{'tag-cloud-config.bold-notation-tooltip' | translate}}" aria-label="Notation:">
<div><mat-slide-toggle [checked]="checkBold()" (change)="boldChecked($event)" [ngModelOptions]="{standalone: true}">{{'tag-cloud-config.font-style-bold' | translate}}</mat-slide-toggle> </div>
</mat-radio-group>
</div>
<div class="input-row" fxLayout="column" fxLayoutGap="5px">
<mat-form-field fxFlex fxLayout.xs="column">
<mat-label>{{'tag-cloud-config.font-size-min' | translate}}</mat-label>
- <input #minFont [value]="cloudParameters.fontSizeMin" matInput type="number"
+ <input #minFont [value]="cloudParameters.fontSizeMin.toString()" matInput type="number"
[(ngModel)]="cloudParameters.fontSizeMin" [ngModelOptions]="{standalone: true}" (change)="valueChanged()"
- min="10" max="300" step="10" matTooltip="{{'tag-cloud-config.font-size-min-tooltip' | translate}}" />
+ min="280" max="300" step="10" matTooltip="{{'tag-cloud-config.font-size-min-tooltip' | translate}}" />
</mat-form-field>
</div>
<div class="input-row" fxLayout="column" fxLayoutGap="5px">
<mat-form-field fxFlex fxLayout.xs="column">
<mat-label>{{'tag-cloud-config.font-size-max' | translate}}</mat-label>
<input #maxFont matInput type="number" [(ngModel)]="cloudParameters.fontSizeMax"
- [ngModelOptions]="{standalone: true}" (change)="valueChanged()" min="10" max="1000" step="10"
+ [ngModelOptions]="{standalone: true}" (change)="valueChanged()" min="280" max="1000" step="10"
matTooltip="{{'tag-cloud-config.font-size-max-tooltip' | translate}}" />
</mat-form-field>
</div>
@@ -176,12 +171,12 @@
<div class="input-row" fxLayout="column" fxLayoutGap="5px" *ngIf="weightClass.actualTagNumber > 0 && !parent.dataManager.demoActive">
<div class="input-row" fxLayout="column" fxLayoutGap="5px">
<mat-label class="label-text" >{{'tag-cloud-config.weight-number' | translate}}</mat-label>
- <mat-slider [value]="weightClass.maxTagNumber" min="0" [max]="weightClass.actualTagNumber" step="1"
+ <mat-slider [value]="weightClass.maxTagNumber" min="1" [max]="weightClass.actualTagNumber" step="1"
[(ngModel)]="weightClass.maxTagNumber" [ngModelOptions]="{standalone: true}" (change)="valueChanged()"
[thumbLabel]="true" matTooltip="{{'tag-cloud-config.weight-number-tooltip' | translate}}"></mat-slider>
</div>
</div>
- <div class="input-row" fxLayout="column" fxLayoutGap="5px">
+ <div class="input-row" fxLayout="column" fxLayoutGap="5px" *ngIf="!cloudParameters.randomAngles">
<mat-label class="label-text">{{'tag-cloud-config.rotate-weight' | translate}}</mat-label>
<mat-slider [value]="weightClass.rotationAngle" min="-180" max="180" step="1"
[(ngModel)]="weightClass.rotationAngle" [ngModelOptions]="{standalone: true}" (change)="valueChanged()"
diff --git a/src/app/components/shared/_dialogs/cloud-configuration/cloud-configuration.component.scss b/src/app/components/shared/_dialogs/cloud-configuration/cloud-configuration.component.scss
index ad76e0495520f53011b6c5e723a1afdae8804824..316554c43c41f8a50bf3dc935d5f750de04c0977 100644
--- a/src/app/components/shared/_dialogs/cloud-configuration/cloud-configuration.component.scss
+++ b/src/app/components/shared/_dialogs/cloud-configuration/cloud-configuration.component.scss
@@ -121,7 +121,7 @@ mat-divider {
::ng-deep .mat-accent .mat-slider-track-fill,
::ng-deep .mat-accent .mat-slider-thumb,
::ng-deep .mat-accent .mat-slider-thumb-label{
- color: var(--on-primary);;
+ color: var(--on-primary);
background-color: var(--primary);
}
@@ -130,12 +130,12 @@ mat-divider {
}
::ng-deep .primary{
- color: var(--on-primary);;
+ color: var(--on-primary);
background-color: var(--primary);
}
::ng-deep .secondary{
- color: var(--on-cancel);;
+ color: var(--on-cancel);
background-color: var(--cancel);
margin-right: 20px;
@@ -143,11 +143,11 @@ mat-divider {
.button-row{
width: 100%;
- margin: auto auto 20px auto ;
+ margin: auto auto 20px auto;
}
.reset {
margin: 25px auto auto auto;
- background-color: var(--white);
+ background-color: var(--secondary);
color: black;
width: 100%;
}
diff --git a/src/app/components/shared/_dialogs/cloud-configuration/cloud-configuration.component.ts b/src/app/components/shared/_dialogs/cloud-configuration/cloud-configuration.component.ts
index 42f29c60284b38c24a9be0929c72ee0242dc1fa1..967d2ec047c2d61c518879936031d481707c72fb 100644
--- a/src/app/components/shared/_dialogs/cloud-configuration/cloud-configuration.component.ts
+++ b/src/app/components/shared/_dialogs/cloud-configuration/cloud-configuration.component.ts
@@ -132,6 +132,7 @@ export class CloudConfigurationComponent implements OnInit {
this.weightClasses[i].tagColor = element.color;
this.weightClasses[i].actualTagNumber = this.countPerWeight[i];
this.weightClasses[i].rotationAngle = element.rotation;
+ this.weightClasses[i].maxTagNumber = element.maxVisibleElements == -1 ? this.weightClasses[i].actualTagNumber : element.maxVisibleElements;
});
}
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 aae15d6d5cb9cbbb8908d221ff74693299647b20..37c401a931362c0a318d7b32b23fb187b34e1a0e 100644
--- a/src/app/components/shared/tag-cloud/tag-cloud.component.ts
+++ b/src/app/components/shared/tag-cloud/tag-cloud.component.ts
@@ -77,16 +77,16 @@ type DefaultColors = [
];
const defaultColors: DefaultColors = [
'var(--secondary, greenyellow)',
- 'var(--moderator, lightblue)',
- 'var(--blue, green)',
- 'var(--grey, yellow)',
- 'var(--red, orange)',
- 'var(--primary, pink)',
- 'var(--yellow, gray)',
- 'var(--on-background, lightgreen)',
- 'var(--purple, tomato)',
- 'var(--magenta, white)',
- 'var(--light-green, brown)',
+ '#f1f1f1',
+ '#d98e49',
+ '#ccca3c',
+ '#83e761',
+ '#3accd4',
+ '#54a1e9',
+ '#3a44ee',
+ '#9725eb',
+ '#e436c7',
+ '#ff0000',
'var(--background, black)'
];
@@ -124,12 +124,12 @@ const getDefaultCloudParameters = (): CloudParameters => {
];
return {
fontFamily: 'Dancing Script',
- fontWeight: 'normal',
+ fontWeight: 'bold',
fontStyle: 'normal',
- fontSize: '10px',
+ fontSize: '280px',
backgroundColor: resDefaultColors[11],
fontColor: resDefaultColors[0],
- fontSizeMin: 100,
+ fontSizeMin: 280,
fontSizeMax: 380,
hoverScale: 1.3,
hoverTime: 0.6,
diff --git a/src/assets/i18n/creator/de.json b/src/assets/i18n/creator/de.json
index cacaf5245a7b687beb18420cee9ff55a0d5b4157..2002c269489ebc3c0230471daf0ce991b499fc13 100644
--- a/src/assets/i18n/creator/de.json
+++ b/src/assets/i18n/creator/de.json
@@ -430,6 +430,7 @@
"font-size-max":"Schriftgröße max",
"select-color": "Farbauswahl",
"random-angle-tooltip": "Anordnung der Winkel zufällig generieren",
+ "random-angle-note": "Wenn Aktiviert, wird die Rotierung der einzelnen Relevanz-Gruppen deaktiviert",
"background-tooltip": "Auswahl der Hintergrundfarbe",
"word-delay-tooltip": "Animationsverzögerung der Wörter",
"font-size-min-tooltip": "Auswahl der minimalen Schriftgrösse",
@@ -438,14 +439,13 @@
"hover-scale-tooltip": "Skallierung der Wörter beim Erscheinen",
"hover-time-tooltip": "Festlegen der Erscheinungszeit der Wörter",
"hover-delay-tooltip": "Hover-Verzögerung der Wörter",
- "weight-class-settings": "Relevanz-Gruppen",
+ "weight-class-settings": "Relevanz",
"weight-class": "Relevanz-Gruppe",
"back-btn": "Zurück",
"weight-color": "Schriftfarbe",
"weight-number": "max. Anzahl Schlüsselwörter",
"weight-color-tooltip": "Auswahl der Schriftfarbe",
"weight-number-tooltip": "maximale Anzahl der Schlüsselwörter festlegen",
- "automatic-spelling": "Rechtschreibüberprüfung",
"notation": "Notation:",
"lowerCase": "Kleinschreibung",
"capitalization": "Kapitälchen",
@@ -455,7 +455,6 @@
"cleanUpView": "Tag-Cleanup Einstellungen",
"rotation": "Drehgrad zufälliger Einträge",
"highestWeight": "Anzahl Tags mit max. Gewichtung",
- "automatic-spelling-tooltip": "automatische Überprüfung der Rechtschreibung",
"notation-tooltip": "Einstellung der Schreibweise: klein, groß, standard",
"alphabetical-sorting-tooltip": "Alphabetische Sortierung",
"highestWeight-tooltip": "x Tags mit der höchsten Gewichtung anzeigen",
@@ -463,8 +462,10 @@
"rotate-weight-tooltip": "einige Einträge dieser Wichtigkeitsklassen zufällig um x Grad drehen",
"font":"Schrift",
"reset-btn": "Zurücksetzten",
+ "font-family-tooltip": "Schriftart auswählen",
+ "bold-notation-tooltip": "Schriftdicke fett auswählen",
"font-style-bold" : "Fett",
"font-style-italic": "Kursiv",
- "font-family":"Schrift Art"
+ "font-family":"Schriftart"
}
}
diff --git a/src/assets/i18n/creator/en.json b/src/assets/i18n/creator/en.json
index 4de6cd20d2860381f605fac43a72942310b5831e..af74d8abae3339883382be940cc9d6ff2943396e 100644
--- a/src/assets/i18n/creator/en.json
+++ b/src/assets/i18n/creator/en.json
@@ -431,6 +431,7 @@
"font-size-max":"Font size max",
"select-color": "Selected color",
"random-angle-tooltip": "Generate angle randomly",
+ "random-angle-note": "If Enabled, the rotation of the individual weight-class is disabled",
"background-tooltip": "Select background-color",
"word-delay-tooltip": "Select word-delay",
"font-size-min-tooltip": "Select minimum font-size",
@@ -446,7 +447,6 @@
"weight-number": "max. number of keywords",
"weight-color-tooltip": "Select font-color",
"weight-number-tooltip": "Select maximal number of keywords",
- "automatic-spelling": "Spell check",
"notation": "Notation:",
"lowerCase": "Lower case",
"capitalization": "Capitalization",
@@ -456,14 +456,15 @@
"cleanUpView": "Tag-Cleanup Settings",
"rotation": "rotation of random entries",
"highestWeight": "Number of tags with highest weight",
- "automatic-spelling-tooltip": "spell check",
"notation-tooltip": "Notation-Settings: small, large, standard",
"alphabetical-sorting-tooltip": "Alphabetical sorting",
"rotate-weight-tooltip": "Rotate some entries randomly by x degrees",
"highestWeight-tooltip": "show x tags with the highest weight",
"rotate-weight": "Rotate some entries of this weight class randomly by x degrees",
"font":"Font",
- "reset-btn": "Reset",
+ "reset-btn": "Reset",
+ "font-family-tooltip": "Select font",
+ "bold-notation-tooltip": "Select font-thickness bold",
"font-style-bold" : "Bold",
"font-style-italic": "Italic",
"font-family":"Font Family"
diff --git a/src/assets/i18n/participant/de.json b/src/assets/i18n/participant/de.json
index 7f99d5b9b55114ba7bb7c9242f0e3a5838d3dad5..1935f49aa27566449e936f8307cf797ac6998bdc 100644
--- a/src/assets/i18n/participant/de.json
+++ b/src/assets/i18n/participant/de.json
@@ -327,6 +327,7 @@
"font-size-max": "Schriftgröße max",
"select-color": "Farbauswahl",
"random-angle-tooltip": "Anordnung der Winkel zufällig generieren",
+ "random-angle-note": "Wenn Aktiviert, wird die Rotierung der einzelnen Relevanz-Gruppen deaktiviert",
"background-tooltip": "Auswahl der Hintergrundfarbe",
"word-delay-tooltip": "Animationsverzögerung der Wörter",
"font-size-min-tooltip": "Auswahl der minimalen Schriftgrösse",
@@ -337,13 +338,12 @@
"hover-delay-tooltip": "Hover-Verzögerung der Wörter",
"extended-btn": "Wichtigkeitsklasse",
"back-btn": "Zurück",
- "weight-class-settings": "Relevanz-Gruppen",
+ "weight-class-settings": "Relevanz",
"weight-class": "Relevanz-Gruppe",
"weight-color": "Schriftfarbe",
"weight-number": "max. Anzahl Schlüsselwörter",
"weight-color-tooltip": "Auswahl der Schriftfarbe",
"weight-number-tooltip": "maximale Anzahl der Schlüsselwörter festlegen",
- "automatic-spelling": "Rechtschreibüberprüfung",
"notation": "Notation:",
"lowerCase": "Kleinschreibung",
"capitalization": "Kapitälchen",
@@ -353,7 +353,6 @@
"cleanUpView": "Tag-Cleanup Einstellungen",
"rotation": "Drehgrad zufälliger Einträge",
"highestWeight": "Anzahl Tags mit max. Gewichtung",
- "automatic-spelling-tooltip": "automatische Überprüfung der Rechtschreibung",
"notation-tooltip": "Einstellung der Schreibweise: klein, groß, standard",
"alphabetical-sorting-tooltip": "Alphabetische Sortierung",
"highestWeight-tooltip": "x Tags mit der höchsten Gewichtung anzeigen",
@@ -361,8 +360,10 @@
"rotate-weight-tooltip": "einige Einträge dieser Wichtigkeitsklasse zufällig um x Grad drehen",
"font":"Schrift",
"reset-btn": "Zurücksetzten",
+ "font-family-tooltip": "Schriftart auswählen",
+ "bold-notation-tooltip": "Schriftdicke fett auswählen",
"font-style-bold" : "Fett",
"font-style-italic": "Kursiv",
- "font-family":"Schrift Art"
+ "font-family":"Schriftart"
}
}
diff --git a/src/assets/i18n/participant/en.json b/src/assets/i18n/participant/en.json
index 9585f436d5cc0a6b66083ac0863865cb88943ca8..5fc4e2b3f87ed4c16cf29bc271dc31073ae14845 100644
--- a/src/assets/i18n/participant/en.json
+++ b/src/assets/i18n/participant/en.json
@@ -333,6 +333,7 @@
"font-size-max":"Font size max",
"select-color": "Selected color",
"random-angle-tooltip": "Generate angle randomly",
+ "random-angle-note": "If Enabled, the rotation of the individual weight-class is disabled",
"background-tooltip": "Select background-color",
"word-delay-tooltip": "Select word-delay",
"font-size-min-tooltip": "Select minimum font-size",
@@ -349,7 +350,6 @@
"weight-number": "max. number of keywords",
"weight-color-tooltip": "Select font-color",
"weight-number-tooltip": "Select maximal number of keywords",
- "automatic-spelling": "Spell check",
"notation": "Notation:",
"lowerCase": "Lower case",
"capitalization": "Capitalization",
@@ -359,7 +359,6 @@
"cleanUpView": "Tag-Cleanup Settings",
"rotation": "rotation of random entries",
"highestWeight": "Number of tags with highest weight",
- "automatic-spelling-tooltip": "automatic spelling check",
"notation-tooltip": "Notation-Settings: small, large, standard",
"alphabetical-sorting-tooltip": "Alphabetical sorting",
"rotate-weight-tooltip": "Rotate some entries randomly by x degrees",
@@ -367,6 +366,8 @@
"rotate-weight": "Rotate some entries of this weight class randomly by x degrees",
"font":"Font",
"reset-btn": "Reset",
+ "font-family-tooltip": "Select font",
+ "bold-notation-tooltip": "Select font-thickness bold",
"font-style-bold" : "Bold",
"font-style-italic": "Italic",
"font-family":"Font Family"