forks/peertube
1
0
Fork 0
Code Releases Activity

replacing placeholder and feature table display improvement

Browse source
This commit is contained in:
Rigel Kent 2018-08-28 22:58:13 +02:00 committed by Rigel Kent
parent 8b60488020
commit 07872fdf74
3 changed files with 63 additions and 46 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
client/src/app/login/login.component.scss
View file

@ -20,4 +20,8 @@ input[type=submit] {
.create-an-account, .forgot-password-button { .create-an-account, .forgot-password-button {
color: #000; color: #000;
cursor: pointer; cursor: pointer;
&:hover {
text-decoration: underline !important;
}
} }

97
client/src/app/signup/signup.component.html
View file

@ -4,63 +4,68 @@
Create an account Create an account
</div> </div>
<my-instance-features-table></my-instance-features-table>
<div *ngIf="error" class="alert alert-danger">{{ error }}</div> <div *ngIf="error" class="alert alert-danger">{{ error }}</div>
<form role="form" (ngSubmit)="signup()" [formGroup]="form"> <div class="d-flex justify-content-left flex-wrap">
<div class="form-group"> <form role="form" (ngSubmit)="signup()" [formGroup]="form">
<label for="username" i18n>Username</label> <div class="form-group">
<label for="username" i18n>Username</label>
<div class="input-group"> <div class="input-group">
<input <input
type="text" id="username" i18n-placeholder placeholder="Example: neil_amstrong" type="text" id="username" i18n-placeholder placeholder="Example: jane_doe"
formControlName="username" [ngClass]="{ 'input-error': formErrors['username'] }" formControlName="username" [ngClass]="{ 'input-error': formErrors['username'] }"
> >
<div class="input-group-append"> <div class="input-group-append">
<span class="input-group-text">@{{ instanceHost }}</span> <span class="input-group-text">@{{ instanceHost }}</span>
</div>
</div>
<div *ngIf="formErrors.username" class="form-error">
{{ formErrors.username }}
</div> </div>
</div> </div>
<div *ngIf="formErrors.username" class="form-error"> <div class="form-group">
{{ formErrors.username }} <label for="email" i18n>Email</label>
<input
type="text" id="email" i18n-placeholder placeholder="Email"
formControlName="email" [ngClass]="{ 'input-error': formErrors['email'] }"
>
<div *ngIf="formErrors.email" class="form-error">
{{ formErrors.email }}
</div>
</div> </div>
</div>
<div class="form-group"> <div class="form-group">
<label for="email" i18n>Email</label> <label for="password" i18n>Password</label>
<input <input
type="text" id="email" i18n-placeholder placeholder="Email" type="password" id="password" i18n-placeholder placeholder="Password"
formControlName="email" [ngClass]="{ 'input-error': formErrors['email'] }" formControlName="password" [ngClass]="{ 'input-error': formErrors['password'] }"
> >
<div *ngIf="formErrors.email" class="form-error"> <div *ngIf="formErrors.password" class="form-error">
{{ formErrors.email }} {{ formErrors.password }}
</div>
</div> </div>
</div>
<div class="form-group"> <div class="form-group form-group-terms">
<label for="password" i18n>Password</label> <my-peertube-checkbox
<input inputName="terms" formControlName="terms"
type="password" id="password" i18n-placeholder placeholder="Password" i18n-labelHtml labelHtml="I have read and agree to the <a href='/about/instance#terms-section' target='_blank'rel='noopener noreferrer'>Terms</a> of this instance"
formControlName="password" [ngClass]="{ 'input-error': formErrors['password'] }" ></my-peertube-checkbox>
>
<div *ngIf="formErrors.password" class="form-error"> <div *ngIf="formErrors.terms" class="form-error">
{{ formErrors.password }} {{ formErrors.terms }}
</div>
</div> </div>
<input type="submit" i18n-value value="Signup" [disabled]="!form.valid">
</form>
<div>
<label for="email" i18n>Features found on this instance</label>
<my-instance-features-table></my-instance-features-table>
</div> </div>
</div>
<div class="form-group form-group-terms">
<my-peertube-checkbox
inputName="terms" formControlName="terms"
i18n-labelHtml labelHtml="I have read and agree to the <a href='/about/instance#terms-section' target='_blank'rel='noopener noreferrer'>Terms</a> of this instance"
></my-peertube-checkbox>
<div *ngIf="formErrors.terms" class="form-error">
{{ formErrors.terms }}
</div>
</div>
<input type="submit" i18n-value value="Signup" [disabled]="!form.valid">
</form>
</div> </div>

8
client/src/app/signup/signup.component.scss
View file

@ -7,6 +7,10 @@ my-instance-features-table {
margin-bottom: 40px; margin-bottom: 40px;
} }
form {
margin: 0 60px 40px 0;
}
.form-group-terms { .form-group-terms {
margin: 30px 0; margin: 30px 0;
} }
@ -15,6 +19,10 @@ my-instance-features-table {
@include peertube-input-group(400px); @include peertube-input-group(400px);
} }
.input-group-append {
height: 30px;
}
input:not([type=submit]) { input:not([type=submit]) {
@include peertube-input-text(400px); @include peertube-input-text(400px);
display: block; display: block;