X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;f=client%2Fsrc%2Fapp%2F%2Bsignup%2F%2Bregister%2Fregister.component.html;h=442c65e2d88a673638bbf8be97fd33fb36171a87;hb=1105696623c4b691bf2d44489ad25a752cbd8cc7;hp=de72065d3d0467de5d1804c4c10381ce0791dc3b;hpb=cf21b2cbef61929177b9c09b5e017c3b7eb8535d;p=github%2FChocobozzz%2FPeerTube.git

diff --git a/client/src/app/+signup/+register/register.component.html b/client/src/app/+signup/+register/register.component.html
index de72065d3..442c65e2d 100644
--- a/client/src/app/+signup/+register/register.component.html
+++ b/client/src/app/+signup/+register/register.component.html
@@ -1,19 +1,47 @@
-<div class="margin-content">
+<div>
 
-  <div i18n class="title-page title-page-single">
-    Create an account
+  <div class="margin-content signup-disabled" *ngIf="signupDisabled">
+    <div class="alert alert-warning" i18n>Signup is not enabled on this instance.</div>
   </div>
 
-  <my-signup-success *ngIf="signupDone" [message]="success"></my-signup-success>
-  <div *ngIf="info" class="alert alert-info">{{ info }}</div>
+  <ng-container *ngIf="!signupDisabled">
+    <h1 i18n class="title-page-v2">
+      <strong class="underline-orange">{{ instanceName }}</strong>
+      >
+      Create an account
+    </h1>
 
-  <div class="wrapper" [hidden]="signupDone">
-    <div class="register-form">
-      <my-custom-stepper linear *ngIf="!signupDone">
-        <cdk-step [stepControl]="formStepTerms" i18n-label="Stepper label for the registration page describing terms of service" label="Terms">
-          <div class="instance-information">
-            <my-instance-about-accordion (init)="onInstanceAboutAccordionInit($event)" [panels]="instanceInformationPanels"></my-instance-about-accordion>
+    <div class="register-content">
+      <my-custom-stepper linear>
+
+        <cdk-step i18n-label label="About" [editable]="!signupSuccess">
+          <my-signup-step-title mascotImageName="about" i18n>
+            <strong>Create an account</strong>
+            <div>on {{ instanceName }}</div>
+          </my-signup-step-title>
+
+          <my-register-step-about [videoUploadDisabled]="videoUploadDisabled"></my-register-step-about>
+
+          <div class="step-buttons">
+            <a i18n class="skip-step underline-orange" routerLink="/login">
+              <strong>I already have an account</strong>, I log in
+            </a>
+
+            <button i18n cdkStepperNext>I create an account</button>
           </div>
+        </cdk-step>
+
+        <cdk-step [stepControl]="formStepTerms" i18n-label label="Terms" [editable]="!signupSuccess">
+          <my-signup-step-title mascotImageName="terms" i18n>
+            <strong>Terms</strong>
+            <div>of {{ instanceName }}</div>
+          </my-signup-step-title>
+
+          <my-instance-about-accordion
+            [displayInstanceName]="false"
+            (init)="onInstanceAboutAccordionInit($event)" [panels]="instanceInformationPanels"
+            pluginScope="signup" pluginHook="filter:signup.instance-about-plugin-panels.create.result"
+          ></my-instance-about-accordion>
 
           <my-register-step-terms
             [hasCodeOfConduct]="!!aboutHtml.codeOfConduct"
@@ -21,36 +49,74 @@
             (formBuilt)="onTermsFormBuilt($event)" (termsClick)="onTermsClick()" (codeOfConductClick)="onCodeOfConductClick()"
           ></my-register-step-terms>
 
-          <button cdkStepperNext [disabled]="!formStepTerms || !formStepTerms.valid">{{ defaultNextStepButtonLabel }}</button>
+          <div class="step-buttons">
+            <button cdkStepperPrevious>{{ defaultPreviousStepButtonLabel }}</button>
+            <button cdkStepperNext [disabled]="!formStepTerms || !formStepTerms.valid">{{ defaultNextStepButtonLabel }}</button>
+          </div>
         </cdk-step>
 
-        <cdk-step [stepControl]="formStepUser" i18n-label="Stepper label for the registration page asking user informations" label="User">
-          <my-register-step-user (formBuilt)="onUserFormBuilt($event)" [videoUploadDisabled]="videoUploadDisabled"></my-register-step-user>
+        <cdk-step [stepControl]="formStepUser" label="My account" [editable]="!signupSuccess">
+          <my-signup-step-title mascotImageName="account" i18n>
+            <strong>Setup</strong>
+            <div>your account</div>
+          </my-signup-step-title>
 
-          <button cdkStepperPrevious>{{ defaultPreviousStepButtonLabel }}</button>
-          <button cdkStepperNext [disabled]="!formStepUser || !formStepUser.valid" (click)="videoUploadDisabled && signup()">{{ stepUserButtonLabel }}</button>
+          <my-register-step-user
+            (formBuilt)="onUserFormBuilt($event)"
+            [videoUploadDisabled]="videoUploadDisabled" [requiresEmailVerification]="requiresEmailVerification"
+          ></my-register-step-user>
+
+          <div class="step-buttons">
+            <button cdkStepperPrevious>{{ defaultPreviousStepButtonLabel }}</button>
+            <button cdkStepperNext [disabled]="!formStepUser || !formStepUser.valid" (click)="videoUploadDisabled && signup()">{{ stepUserButtonLabel }}</button>
+          </div>
         </cdk-step>
 
-        <cdk-step [stepControl]="formStepChannel" i18n-label="Stepper label for the registration page asking information about the default channel" label="Channel" *ngIf="!videoUploadDisabled">
-          <my-register-step-channel (formBuilt)="onChannelFormBuilt($event)" [username]="getUsername()"></my-register-step-channel>
+        <cdk-step *ngIf="!videoUploadDisabled" [optional]="true" [stepControl]="formStepChannel" i18n-label label="My channel" [editable]="!signupSuccess">
+          <my-signup-step-title mascotImageName="channel" i18n>
+            <div>Create</div>
+            <strong>your first channel</strong>
+          </my-signup-step-title>
 
-          <button cdkStepperPrevious>{{ defaultPreviousStepButtonLabel }}</button>
-          <button cdkStepperNext [disabled]="!formStepChannel || !formStepChannel.valid || hasSameChannelAndAccountNames()" (click)="signup()" i18n>
-            Create my account
-          </button>
+          <my-register-step-channel
+            (formBuilt)="onChannelFormBuilt($event)"
+            [videoQuota]="videoQuota" [instanceName]="instanceName" [username]="getUsername()"
+          ></my-register-step-channel>
+
+          <div class="step-buttons">
+            <button cdkStepperPrevious>{{ defaultPreviousStepButtonLabel }}</button>
+
+            <div class="skip-step">
+              <span class="underline-orange" role="button" (click)="skipChannelCreation()">
+                <strong i18n>I don't want to create a channel</strong>
+              </span>
+
+              <div class="skip-step-description" i18n>You will be able to create a channel later</div>
+            </div>
+
+            <button cdkStepperNext [disabled]="!formStepChannel || !formStepChannel.valid || hasSameChannelAndAccountNames()" (click)="signup()" i18n>
+              Create my account
+            </button>
+          </div>
         </cdk-step>
 
-        <cdk-step i18n-label label="Done" editable="false">
-          <div *ngIf="!signupDone && !error" class="done-loader">
+        <cdk-step #lastStep i18n-label label="Done!" [editable]="false">
+          <div *ngIf="!signupSuccess && !signupError" class="done-loader">
             <my-loader [loading]="true"></my-loader>
 
             <div i18n>PeerTube is creating your account...</div>
           </div>
 
-          <div *ngIf="error" class="alert alert-danger">{{ error }}</div>
+          <div *ngIf="signupError" class="alert alert-danger">{{ signupError }}</div>
+
+          <my-signup-success *ngIf="signupSuccess" [requiresEmailVerification]="requiresEmailVerification"></my-signup-success>
+
+          <div *ngIf="signupError" class="steps-button">
+            <button cdkStepperPrevious>{{ defaultPreviousStepButtonLabel }}</button>
+          </div>
         </cdk-step>
       </my-custom-stepper>
     </div>
-  </div>
+  </ng-container>
 
 </div>