Commit f364f50f authored by Klaus-Dieter Quibeldey-Cirkel's avatar Klaus-Dieter Quibeldey-Cirkel
Browse files

Merge branch 'staging' into 'master'

Staging

See merge request arsnova/frag.jetzt!549
parents 13bfc1ce fc7cd9af
......@@ -16,8 +16,8 @@
<app-footer></app-footer>
</footer>
<div class="rescale_overlay" id="overlay_rescale" aria-hidden="true">
<button mat-icon-button (click)="getRescale().toggleState()" title="toggle">
<mat-icon>fullscreen_exit</mat-icon>
<button mat-icon-button (click)="getRescale().toggleState()" title="Exit">
<mat-icon>close</mat-icon>
</button>
<button mat-icon-button (click)="getRescale().scaleUp()" title="Zoom +">
<mat-icon>zoom_in</mat-icon>
......
<form (ngSubmit)="login(userActivationKey.value)" fxLayout="column" fxLayoutAlign="space-around"
<form (ngSubmit)="login(userActivationKey.value)"
fxLayout="column"
fxLayoutAlign="space-around"
fxLayoutGap="10px">
<mat-form-field class="input-block">
<input (focus)="eventService.makeFocusOnInputTrue()" (blur)="eventService.makeFocusOnInputFalse()"
matInput #userActivationKey type="text"
[formControl]="activationKeyFormControl" name="activation-key"
<input (focus)="eventService.makeFocusOnInputTrue()"
(blur)="eventService.makeFocusOnInputFalse()"
matInput
#userActivationKey
type="text"
[formControl]="activationKeyFormControl"
name="activation-key"
aria-labelledby="activation-key-input-description"/>
<mat-placeholder class="placeholder">{{ 'login.activation-key' | translate }}</mat-placeholder>
<mat-error *ngIf="activationKeyFormControl.hasError('required')">{{ 'user-activation.activation-key-required' | translate }}</mat-error>
</mat-form-field>
</form><div fxLayout="column" fxLayoutAlign="space-around">
<button (click)="resetActivation()" mat-flat-button type="button"
</form>
<div fxLayout="column"
fxLayoutAlign="space-around">
<button class="resend"
(click)="resetActivation()"
mat-flat-button
type="button"
matTooltip="{{'login.restart-account-activation-tooltip' | translate}}">
{{ 'login.restart-account-activation-button' | translate }}
</button>
......
......@@ -2,3 +2,8 @@
color: var(--on-primary);
background-color: var(--primary);
}
.resend {
color: var(--on-secondary);
background-color: var(--secondary);
}
......@@ -125,7 +125,7 @@
"title": "Einführung"
},
"login": {
"activation-key": "Aktivierungsschlüssel",
"activation-key": "Aktivierungs-Schlüssel",
"cancel": "Abbrechen",
"cancel-description": "Abbrechen",
"email": "E-Mail",
......@@ -148,9 +148,9 @@
"password-required": "Passwort erforderlich",
"password-reset": "Passwort vergessen?",
"register": "Registrieren",
"restart-account-activation-button": "Erneut senden",
"restart-account-activation-correct": "Der Aktivierungsschlüssel wurde erneut gesendet.",
"restart-account-activation-tooltip": "Sendet den Aktivierungsschlüssel erneut an die angegebene Adresse",
"restart-account-activation-button": "Falls ungültig, neuen Schlüssel anfordern.",
"restart-account-activation-correct": "Der Aktivierungs-Schlüssel wurde erneut gesendet.",
"restart-account-activation-tooltip": "Sendet den Aktivierungs-Schlüssel erneut an die angegebene Adresse.",
"welcome": "»Haben Sie Fragen?«",
"welcome-feedback": "➜ Feedback",
"feedback-aria": "Baggs, Features, Lob und Tadel kannst du über diesen Link in unserer Feedback-Säschen äussern."
......@@ -269,7 +269,7 @@
"session-name": "Sitzungsname (Code wird generiert)"
},
"user-activation": {
"activate": "Aktivieren",
"activate": "Konto aktivieren",
"activate-description": "Aktiviert den Account",
"activation-key": "Aktivierungs-Schlüssel",
"activation-key-incorrect": "Aktivierungs-Schlüssel falsch",
......
......@@ -149,7 +149,7 @@
"password-required": "Password required",
"password-reset": "Forgot your password?",
"register": "Register",
"restart-account-activation-button": "Send again",
"restart-account-activation-button": "If invalid, request a new key",
"restart-account-activation-correct": "Activation key sent again",
"restart-account-activation-tooltip": "Sends the activation key again",
"welcome": "»Any questions?«",
......@@ -271,7 +271,7 @@
"session-name": "Session name (key will be generated)"
},
"user-activation": {
"activate": "Activate",
"activate": "Activate account",
"activate-description": "Activates the account",
"activation-key": "Activation key",
"activation-key-incorrect": "Activation key is incorrect.",
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment