8 files changed, 23 insertions, 65 deletions

diff --git a/client/src/app/+admin/config/edit-custom-config/edit-custom-config.component.html b/client/src/app/+admin/config/edit-custom-config/edit-custom-config.component.html
index f61593677..e5340234b 100644
--- a/client/src/app/+admin/config/edit-custom-config/edit-custom-config.component.html
+++ b/client/src/app/+admin/config/edit-custom-config/edit-custom-config.component.html
@@ -30,7 +30,7 @@
           <div class="form-group">
             <label i18n for="instanceDescription">Description</label><my-help helpType="markdownText"></my-help>
             <my-markdown-textarea
-              id="instanceDescription" formControlName="description" textareaWidth="500px" [previewColumn]="true"
+              name="instanceDescription" formControlName="description" textareaWidth="500px" [previewColumn]="true"
               [classes]="{ 'input-error': formErrors['instance.description'] }"
             ></my-markdown-textarea>
             <div *ngIf="formErrors.instance.description" class="form-error">{{ formErrors.instance.description }}</div>
@@ -101,7 +101,7 @@
           <div class="form-group">
             <label i18n for="instanceTerms">Terms</label><my-help helpType="markdownText"></my-help>
             <my-markdown-textarea
-              id="instanceTerms" formControlName="terms" textareaWidth="500px" [previewColumn]="true"
+              name="instanceTerms" formControlName="terms" textareaWidth="500px" [previewColumn]="true"
               [ngClass]="{ 'input-error': formErrors['instance.terms'] }"
             ></my-markdown-textarea>
             <div *ngIf="formErrors.instance.terms" class="form-error">{{ formErrors.instance.terms }}</div>
@@ -110,7 +110,7 @@
           <div class="form-group">
             <label i18n for="instanceCodeOfConduct">Code of conduct</label><my-help helpType="markdownText"></my-help>
             <my-markdown-textarea
-              id="instanceCodeOfConduct" formControlName="codeOfConduct" textareaWidth="500px" [previewColumn]="true"
+              name="instanceCodeOfConduct" formControlName="codeOfConduct" textareaWidth="500px" [previewColumn]="true"
               [ngClass]="{ 'input-error': formErrors['instance.codeOfConduct'] }"
             ></my-markdown-textarea>
             <div *ngIf="formErrors.instance.codeOfConduct" class="form-error">{{ formErrors.instance.codeOfConduct }}</div>
@@ -121,7 +121,7 @@
             <div class="label-small-info">Who moderates the instance? What is the policy regarding NSFW videos? Political videos? etc</div>
 
             <my-markdown-textarea
-              id="instanceModerationInformation" formControlName="moderationInformation" textareaWidth="500px" [previewColumn]="true"
+              name="instanceModerationInformation" formControlName="moderationInformation" textareaWidth="500px" [previewColumn]="true"
               [ngClass]="{ 'input-error': formErrors['instance.moderationInformation'] }"
             ></my-markdown-textarea>
             <div *ngIf="formErrors.instance.moderationInformation" class="form-error">{{ formErrors.instance.moderationInformation }}</div>
@@ -134,7 +134,7 @@
             <div class="label-small-info">A single person? A non-profit? A company?</div>
 
             <my-markdown-textarea
-              id="instanceAdministrator" formControlName="administrator" textareaWidth="500px" textareaHeight="75px" [previewColumn]="true"
+              name="instanceAdministrator" formControlName="administrator" textareaWidth="500px" textareaHeight="75px" [previewColumn]="true"
               [classes]="{ 'input-error': formErrors['instance.administrator'] }"
             ></my-markdown-textarea>
 
@@ -181,7 +181,7 @@
             <div class="label-small-info">2vCore 2GB RAM/or directly the link to the server you rent etc</div>
 
             <my-markdown-textarea
-              id="instanceHardwareInformation" formControlName="hardwareInformation" textareaWidth="500px" textareaHeight="75px" [previewColumn]="true"
+              name="instanceHardwareInformation" formControlName="hardwareInformation" textareaWidth="500px" textareaHeight="75px" [previewColumn]="true"
               [classes]="{ 'input-error': formErrors['instance.hardwareInformation'] }"
             ></my-markdown-textarea>
 
@@ -239,7 +239,7 @@
                   inputName="signupRequiresEmailVerification" formControlName="requiresEmailVerification"
                   i18n-labelText labelText="Signup requires email verification"
                 ></my-peertube-checkbox>
-      
+
                 <div [ngClass]="{ 'disabled-checkbox-extra': !isSignupEnabled() }" class="mt-3">
                   <label i18n for="signupLimit">Signup limit</label>
                   <input
@@ -372,14 +372,13 @@
                 <my-peertube-checkbox
                   inputName="followingsInstanceAutoFollowIndexEnabled" formControlName="enabled"
                   i18n-labelText labelText="Automatically follow instances of the public index"
-                  [(ngModel)]="isAutoFollowIndexEnabled"
                 >
                   <ng-container ngProjectAs="description">
                     <span i18n>⚠️ This functionality requires a lot of attention and extra moderation.</span>
                   </ng-container>
 
                   <ng-container ngProjectAs="extra">
-                    <div [ngClass]="{ 'disabled-checkbox-extra': !isAutoFollowIndexEnabled }">
+                    <div [ngClass]="{ 'disabled-checkbox-extra': !isAutoFollowIndexEnabled() }">
                       <label i18n for="followingsInstanceAutoFollowIndexUrl">Index URL</label>
                       <input
                         type="text" id="followingsInstanceAutoFollowIndexUrl"
diff --git a/client/src/app/+admin/config/edit-custom-config/edit-custom-config.component.ts b/client/src/app/+admin/config/edit-custom-config/edit-custom-config.component.ts
index 1bc907b73..c88e81c01 100644
--- a/client/src/app/+admin/config/edit-custom-config/edit-custom-config.component.ts
+++ b/client/src/app/+admin/config/edit-custom-config/edit-custom-config.component.ts
@@ -24,8 +24,6 @@ export class EditCustomConfigComponent extends FormReactive implements OnInit {
   languageItems: SelectItem[] = []
   categoryItems: SelectItem[] = []
 
-  isAutoFollowIndexEnabled = false
-
   private serverConfig: ServerConfig
 
   constructor (
@@ -236,6 +234,10 @@ export class EditCustomConfigComponent extends FormReactive implements OnInit {
     return this.form.value['signup']['enabled'] === true
   }
 
+  isAutoFollowIndexEnabled () {
+    return this.form.value['followings']['instance']['autoFollowIndex']['enabled'] === true
+  }
+
   async formValidated () {
     this.configService.updateCustomConfig(this.form.getRawValue())
       .subscribe(
diff --git a/client/src/app/header/header.component.html b/client/src/app/header/header.component.html
index 1bdfe9858..4fd18f9bd 100644
--- a/client/src/app/header/header.component.html
+++ b/client/src/app/header/header.component.html
@@ -4,7 +4,7 @@
 >
 <span (click)="doSearch()" class="icon icon-search"></span>
 
-<a class="upload-button" [routerLink]="routerLink">
+<a class="upload-button" routerLink="/videos/upload">
   <my-global-icon iconName="upload"></my-global-icon>
   <span i18n class="upload-button-label">Upload</span>
 </a>
diff --git a/client/src/app/header/header.component.ts b/client/src/app/header/header.component.ts
index 5fd122930..92a7eded6 100644
--- a/client/src/app/header/header.component.ts
+++ b/client/src/app/header/header.component.ts
@@ -2,9 +2,8 @@ import { filter, first, map, tap } from 'rxjs/operators'
 import { Component, OnInit } from '@angular/core'
 import { ActivatedRoute, NavigationEnd, Params, Router } from '@angular/router'
 import { getParameterByName } from '../shared/misc/utils'
-import { AuthService, ServerService, Notifier } from '@app/core'
+import { AuthService, Notifier, ServerService } from '@app/core'
 import { of } from 'rxjs'
-import { ServerConfig } from '@shared/models'
 import { I18n } from '@ngx-translate/i18n-polyfill'
 
 @Component({
@@ -17,8 +16,6 @@ export class HeaderComponent implements OnInit {
   searchValue = ''
   ariaLabelTextForSearch = ''
 
-  private serverConfig: ServerConfig
-
   constructor (
     private router: Router,
     private route: ActivatedRoute,
@@ -38,23 +35,6 @@ export class HeaderComponent implements OnInit {
           map(() => getParameterByName('search', window.location.href))
         )
         .subscribe(searchQuery => this.searchValue = searchQuery || '')
-
-    this.serverConfig = this.serverService.getTmpConfig()
-    this.serverService.getConfig().subscribe(
-      config => this.serverConfig = config,
-
-      err => this.notifier.error(err.message)
-    )
-  }
-
-  get routerLink () {
-    if (this.isUserLoggedIn()) {
-      return [ '/videos/upload' ]
-    } else if (this.isRegistrationAllowed()) {
-      return [ '/signup' ]
-    } else {
-      return [ '/login', { fromUpload: true } ]
-    }
   }
 
   doSearch () {
@@ -73,15 +53,6 @@ export class HeaderComponent implements OnInit {
     o.subscribe(() => this.router.navigate([ '/search' ], { queryParams }))
   }
 
-  isUserLoggedIn () {
-    return this.authService.isLoggedIn()
-  }
-
-  isRegistrationAllowed () {
-    return this.serverConfig.signup.allowed &&
-           this.serverConfig.signup.allowedForCurrentIP
-  }
-
   private loadUserLanguagesIfNeeded (queryParams: any) {
     if (queryParams && queryParams.languageOneOf) return of(queryParams)
 
diff --git a/client/src/app/login/login.component.html b/client/src/app/login/login.component.html
index 6c6a41c4a..0b0bacff0 100644
--- 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>
 
@@ -30,16 +33,6 @@
         <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">
diff --git a/client/src/app/login/login.component.ts b/client/src/app/login/login.component.ts
index 1394d6b58..580f28822 100644
--- a/client/src/app/login/login.component.ts
+++ b/client/src/app/login/login.component.ts
@@ -22,9 +22,6 @@ export class LoginComponent extends FormReactive implements OnInit {
 
   error: string = null
   forgotPasswordEmail = ''
-  from = {
-    upload: false
-  }
 
   private openedForgotPasswordModal: NgbModalRef
   private serverConfig: ServerConfig
@@ -47,17 +44,12 @@ export class LoginComponent extends FormReactive implements OnInit {
     return this.serverConfig.signup.allowed === true
   }
 
-  get instancesIndexUrl () {
-    return this.serverConfig.followings.instance.autoFollowIndex.indexUrl || 'https://instances.joinpeertube.org'
-  }
-
   isEmailDisabled () {
     return this.serverConfig.email.enabled === false
   }
 
   ngOnInit () {
     this.serverConfig = this.route.snapshot.data.serverConfig
-    this.from.upload = Boolean(this.route.snapshot.paramMap.get('fromUpload'))
 
     this.buildForm({
       username: this.loginValidatorsService.LOGIN_USERNAME,
diff --git a/client/src/app/shared/forms/markdown-textarea.component.html b/client/src/app/shared/forms/markdown-textarea.component.html
index 3de3b6fcd..0925b9ad5 100644
--- a/client/src/app/shared/forms/markdown-textarea.component.html
+++ b/client/src/app/shared/forms/markdown-textarea.component.html
@@ -2,7 +2,7 @@
   <textarea
     [(ngModel)]="content" (ngModelChange)="onModelChange()"
     [ngClass]="classes" [ngStyle]="{ width: textareaWidth, height: textareaHeight, 'margin-right': textareaMarginRight }"
-    id="description" name="description">
+    [id]="name" [name]="name">
   </textarea>
 
   <ngb-tabset *ngIf="arePreviewsDisplayed()" class="previews" type="pills">
diff --git a/client/src/app/shared/forms/markdown-textarea.component.ts b/client/src/app/shared/forms/markdown-textarea.component.ts
index 0c5788899..19cd37573 100644
--- a/client/src/app/shared/forms/markdown-textarea.component.ts
+++ b/client/src/app/shared/forms/markdown-textarea.component.ts
@@ -28,6 +28,7 @@ export class MarkdownTextareaComponent implements ControlValueAccessor, OnInit {
   @Input() truncate: number
   @Input() markdownType: 'text' | 'enhanced' = 'text'
   @Input() markdownVideo = false
+  @Input() name = 'description'
 
   textareaMarginRight = '0'
   flexDirection = 'column'