Merge branch 'release/2.1.0' into develop

[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..0b0bacff03eb77f93a6ff9880f1db7ed28a73177 100644 (file)
--- a/client/src/app/login/login.component.html
+++ b/client/src/app/login/login.component.html
@@ -3,15 +3,18 @@
     Login
   </div>
 
     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>
     <h6 class="alert-heading" i18n>
       If you are looking for an account…
     </h6>

+

     <div i18n>
     <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.
       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>
 
     </div>
   </div>
 


@@ -30,16 +33,6 @@
         <a i18n *ngIf="signupAllowed === true" routerLink="/signup" class="create-an-account">
           or create an account
         </a>
         <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">
       </div>
 
       <div *ngIf="formErrors.username" class="form-error">