X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;f=client%2Fsrc%2Fapp%2Flogin%2Flogin.component.html;h=0b0bacff03eb77f93a6ff9880f1db7ed28a73177;hb=338eb9d33af690db716805fd2277bf68f473b58f;hp=1846fd19ed65efabce810e8eaf6d75b221994150;hpb=696fa4c06b2351983740eb617ad46eb8eeb2c4e8;p=github%2FChocobozzz%2FPeerTube.git

diff --git a/client/src/app/login/login.component.html b/client/src/app/login/login.component.html
index 1846fd19e..0b0bacff0 100644
--- a/client/src/app/login/login.component.html
+++ b/client/src/app/login/login.component.html
@@ -3,7 +3,24 @@
     Login
   </div>
 
-  <div *ngIf="error" class="alert alert-danger">{{ error }}</div>
+  <div class="alert alert-info" *ngIf="signupAllowed === false" role="alert">
+    <h6 class="alert-heading" i18n>
+      If you are looking for an account…
+    </h6>
+
+    <div i18n>
+      Currently this instance doesn't allow for user registration, but you can find an instance
+      that gives you the possibility to sign up for an account and upload your videos there.
+
+      <br />
+
+      Find yours among multiple instances at <a class="alert-link" href="https://joinpeertube.org/instances" target="_blank" rel="noopener noreferrer">https://joinpeertube.org/instances</a>.
+    </div>
+  </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">
@@ -11,20 +28,11 @@
         <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">
-          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>
       </div>
 
       <div *ngIf="formErrors.username" class="form-error">
@@ -36,7 +44,7 @@
       <label i18n for="password">Password</label>
       <div>
         <input
-          type="password" name="password" id="password" i18n-placeholder placeholder="Password" required tabindex="2"
+          type="password" name="password" id="password" i18n-placeholder placeholder="Password" required tabindex="2" autocomplete="current-password"
           formControlName="password" [ngClass]="{ 'input-error': formErrors['password'] }"
         >
         <a i18n class="forgot-password-button" (click)="openForgotPasswordModal()" title="Click here to reset your password">I forgot my password</a>
@@ -46,39 +54,38 @@
       </div>
     </div>
 
-    <input type="submit" value="Login" [disabled]="!form.valid">
+    <input type="submit" i18n-value value="Login" [disabled]="!form.valid">
   </form>
 </div>
 
-<div bsModal #forgotPasswordModal="bs-modal" (onShown)="onForgotPasswordModalShown()" class="modal" tabindex="-1">
-  <div class="modal-dialog">
-    <div class="modal-content">
+<ng-template #forgotPasswordModal>
+  <div class="modal-header">
+    <h4 i18n class="modal-title">Forgot your password</h4>
 
-      <div class="modal-header">
-        <span class="close" aria-hidden="true" (click)="hideForgotPasswordModal()"></span>
-        <h4 i18n class="modal-title">Forgot your password</h4>
-      </div>
+    <my-global-icon iconName="cross" aria-label="Close" role="button" (click)="hideForgotPasswordModal()"></my-global-icon>
+  </div>
 
-      <div class="modal-body">
-        <div class="form-group">
-          <label i18n for="forgot-password-email">Email</label>
-          <input
-            type="email" id="forgot-password-email" i18n-placeholder placeholder="Email address" required
-            [(ngModel)]="forgotPasswordEmail" #forgotPasswordEmailInput
-          >
-        </div>
-
-        <div class="form-group inputs">
-          <span i18n class="action-button action-button-cancel" (click)="hideForgotPasswordModal()">
-            Cancel
-          </span>
-
-          <input
-            type="submit" i18n-value value="Send me an email to reset my password" class="action-button-submit"
-            (click)="askResetPassword()" [disabled]="!forgotPasswordEmailInput.validity.valid"
-          >
-        </div>
-      </div>
+  <div class="modal-body">
+
+    <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
+        [(ngModel)]="forgotPasswordEmail" #forgotPasswordEmailInput
+      >
     </div>
   </div>
-</div>
+
+  <div class="modal-footer inputs">
+    <span i18n class="action-button action-button-cancel" (click)="hideForgotPasswordModal()">Cancel</span>
+
+    <input
+      type="submit" i18n-value value="Send me an email to reset my password" class="action-button-submit"
+      (click)="askResetPassword()" [disabled]="!forgotPasswordEmailInput.validity.valid"
+    >
+  </div>
+</ng-template>