X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;f=client%2Fsrc%2Fapp%2F%2Blogin%2Flogin.component.html;h=f3a2476f9ad5f59f6e523ebe2b536a405153e51c;hb=6e391224d48e76bb2b26267dc3a8adeb27c99122;hp=10e25a936a6be58b9ff44ee3a4bba5102915e268;hpb=0c9a83546687d2ae80b3f5299a8ee59d741f894f;p=github%2FChocobozzz%2FPeerTube.git

diff --git a/client/src/app/+login/login.component.html b/client/src/app/+login/login.component.html
index 10e25a936..f3a2476f9 100644
--- a/client/src/app/+login/login.component.html
+++ b/client/src/app/+login/login.component.html
@@ -5,18 +5,7 @@
 </h1>
 
 <div class="margin-content">
-  <div class="alert alert-danger" i18n *ngIf="externalAuthError">
-    Sorry but there was an issue with the external login process. Please <a routerLink="/about">contact an administrator</a>.
-  </div>
-
   <ng-container *ngIf="!externalAuthError && !isAuthenticatedWithExternalAuth">
-    <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>
 
     <div class="alert pt-alert-primary" role="alert">
       <h5 class="alert-heading" i18n>
@@ -29,11 +18,23 @@
       </p>
 
       <p *ngIf="!signupAllowed" i18n>
-        Currently this instance doesn't allow for user registration, you may check the <a (click)="onTermsClick($event, instanceInformation)" href='#'>Terms</a> for more details or find an instance that gives you the possibility to sign up for an account and upload your videos there.
+        Currently this instance doesn't allow for user registration, you may check the <a class="link-orange" (click)="onTermsClick($event, instanceInformation)" href='#'>Terms</a> for more details or find an instance that gives you the possibility to sign up for an account and upload your videos there.
         Find yours among multiple instances at: <a class="link-orange" href="https://joinpeertube.org/instances" target="_blank" rel="noopener noreferrer">https://joinpeertube.org/instances</a>.
       </p>
     </div>
 
+    <div class="alert alert-danger" i18n *ngIf="externalAuthError">
+      Sorry but there was an issue with the external login process. Please <a class="link-orange" routerLink="/about">contact an administrator</a>.
+    </div>
+
+    <div *ngIf="error" class="alert alert-danger">
+      {{ error }}
+
+      <a *ngIf="error === 'User email is not verified.'" class="ms-1 link-orange" i18n routerLink="/verify-account/ask-send-email">
+        Request new verification email
+      </a>
+    </div>
+
     <div class="wrapper">
       <div class="login-form-and-externals">
 
@@ -57,12 +58,10 @@
           <div class="form-group">
             <label i18n for="password">Password</label>
 
-            <my-input-text formControlName="password" inputId="password"
-                                    i18n-placeholder placeholder="Password"
-                                    [ngClass]="{ 'input-error': formErrors['password'] }"
-                                    autocomplete="current-password" [tabindex]="2"></my-input-text>
-
-            <div *ngIf="formErrors.password" class="form-error">{{ formErrors.password }}</div>
+            <my-input-text
+              formControlName="password" inputId="password" i18n-placeholder placeholder="Password"
+              [formError]="formErrors['password']" autocomplete="current-password" [tabindex]="2"
+            ></my-input-text>
           </div>
 
           <input type="submit" class="peertube-button orange-button" i18n-value value="Login" [disabled]="!form.valid">