Use form-control to display box-shadow on form inputs/selects upon focus

[github/Chocobozzz/PeerTube.git] / client / src / app / login / login.component.html

diff --git a/client/src/app/login/login.component.html b/client/src/app/login/login.component.html
index 6c6a41c4a040a529950e54645fe708482fb2ae43..3a2d4b8768803867e76f45387dff9af72d6aa884 100644 (file)
--- a/client/src/app/login/login.component.html
+++ b/client/src/app/login/login.component.html
@@ -3,15 +3,18 @@
     Login
   </div>
 
-  <div class="alert alert-warning" *ngIf="from.upload" role="alert">
+  <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 
+      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.
-      Find yours among multiple instances at <a class="alert-link" [href]="instancesIndexUrl" target="_blank" rel="noopener noreferrer">{{ instancesIndexUrl }}</a>
-      , a directory of instances recommended by this instance.
+
+      <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>
 
@@ -25,21 +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'] }" #emailInput
+          formControlName="username" class="form-control" [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/instances#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">
-          <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">
@@ -52,9 +45,9 @@
       <div>
         <input
           type="password" name="password" id="password" i18n-placeholder placeholder="Password" required tabindex="2" autocomplete="current-password"
-          formControlName="password" [ngClass]="{ 'input-error': formErrors['password'] }"
+          formControlName="password" class="form-control" [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>
+        <a i18n-title class="forgot-password-button" (click)="openForgotPasswordModal()" title="Click here to reset your password">I forgot my password</a>
       </div>
       <div *ngIf="formErrors.password" class="form-error">
         {{ formErrors.password }}
@@ -88,7 +81,10 @@
   </div>
 
   <div class="modal-footer inputs">
-    <span i18n class="action-button action-button-cancel" (click)="hideForgotPasswordModal()">Cancel</span>
+    <input
+      type="button" role="button" i18n-value value="Cancel" class="action-button action-button-cancel"
+      (click)="hideForgotPasswordModal()" (key.enter)="hideForgotPasswordModal()"
+    >
 
     <input
       type="submit" i18n-value value="Send me an email to reset my password" class="action-button-submit"