Login
</div>
- <div *ngIf="error" class="alert alert-danger">{{ error }}</div>
+ <div *ngIf="error" class="alert alert-danger">{{ error }}
+ <span *ngIf="error === 'User email is not verified.'"> <a i18n routerLink="/verify-account/ask-send-email">Request new verification email.</a></span>
+ </div>
<form role="form" (ngSubmit)="login()" [formGroup]="form">
<div class="form-group">
<label i18n for="username">User</label>
<input
type="text" id="username" i18n-placeholder placeholder="Username or email address" required tabindex="1"
- formControlName="username" [ngClass]="{ 'input-error': formErrors['username'] }"
+ formControlName="username" [ngClass]="{ 'input-error': formErrors['username'] }" #emailInput
>
<a i18n *ngIf="signupAllowed === true" routerLink="/signup" class="create-an-account">
or create an account
</a>
- <a i18n *ngIf="signupAllowed === false" href="https://joinpeertube.org/en/#getting-started" target="_blank" title="Click here to see how to get started!" class="create-an-account">
+ <a i18n *ngIf="signupAllowed === false" href="https://joinpeertube.org/en/#instances-list" target="_blank" title="Click here to see a list of instances where to register" class="create-an-account">
or create an account on another instance
</a>
- <my-help
- *ngIf="signupAllowed === false" helpType="custom" i18n-customHtml
- customHtml="User registration is not allowed on this instance, but you can register on many others!"
- ></my-help>
+ <my-help *ngIf="signupAllowed === false">
+ <ng-template ptTemplate="customHtml">
+ <ng-container i18n>User registration is not allowed on this instance, but you can register on many others!</ng-container>
+ </ng-template>
+ </my-help>
</div>
<div *ngIf="formErrors.username" class="form-error">
</div>
</div>
- <input type="submit" value="Login" [disabled]="!form.valid">
+ <input type="submit" i18n-value value="Login" [disabled]="!form.valid">
</form>
</div>
<ng-template #forgotPasswordModal>
<div class="modal-header">
<h4 i18n class="modal-title">Forgot your password</h4>
- <span class="close" aria-hidden="true" (click)="hideForgotPasswordModal()"></span>
+
+ <my-global-icon iconName="cross" aria-label="Close" role="button" (click)="hideForgotPasswordModal()"></my-global-icon>
</div>
<div class="modal-body">
- <div class="form-group">
+
+ <div *ngIf="isEmailDisabled()" class="alert alert-danger" i18n>
+ We are sorry, you cannot recover your password because your instance administrator did not configure the PeerTube email system.
+ </div>
+
+ <div class="form-group" [hidden]="isEmailDisabled()">
<label i18n for="forgot-password-email">Email</label>
<input
type="email" id="forgot-password-email" i18n-placeholder placeholder="Email address" required