diff options
author | Chocobozzz <florian.bigard@gmail.com> | 2017-04-21 18:26:09 +0200 |
---|---|---|
committer | Chocobozzz <florian.bigard@gmail.com> | 2017-04-26 21:23:19 +0200 |
commit | 897ec54d766902878d78abe04aa5b749f6b627f3 (patch) | |
tree | 821062ecb881286d45931c32c6b67b078ba47823 /client/src/app/+admin | |
parent | ea9f487b40c7f1d7348d9f88703cb9d52c7e8603 (diff) | |
download | PeerTube-897ec54d766902878d78abe04aa5b749f6b627f3.tar.gz PeerTube-897ec54d766902878d78abe04aa5b749f6b627f3.tar.zst PeerTube-897ec54d766902878d78abe04aa5b749f6b627f3.zip |
Client: beautiful watch page
Diffstat (limited to 'client/src/app/+admin')
6 files changed, 137 insertions, 107 deletions
diff --git a/client/src/app/+admin/friends/friend-add/friend-add.component.html b/client/src/app/+admin/friends/friend-add/friend-add.component.html index eebe033f9..29c045414 100644 --- a/client/src/app/+admin/friends/friend-add/friend-add.component.html +++ b/client/src/app/+admin/friends/friend-add/friend-add.component.html | |||
@@ -1,30 +1,35 @@ | |||
1 | <h3>Make friends</h3> | 1 | <div class="row"> |
2 | <div class="content-padding"> | ||
2 | 3 | ||
3 | <div *ngIf="error" class="alert alert-danger">{{ error }}</div> | 4 | <h3>Make friends</h3> |
4 | 5 | ||
5 | <form (ngSubmit)="makeFriends()" [formGroup]="form"> | 6 | <div *ngIf="error" class="alert alert-danger">{{ error }}</div> |
6 | <div class="form-group" *ngFor="let host of hosts; let id = index; trackBy:customTrackBy"> | ||
7 | <label for="username">Host</label> | ||
8 | 7 | ||
9 | <div class="input-group"> | 8 | <form (ngSubmit)="makeFriends()" [formGroup]="form"> |
10 | <input | 9 | <div class="form-group" *ngFor="let host of hosts; let id = index; trackBy:customTrackBy"> |
11 | type="text" class="form-control" placeholder="domain.tld" | 10 | <label for="username">Host</label> |
12 | [id]="'host-' + id" [formControlName]="'host-' + id" | ||
13 | /> | ||
14 | <span class="input-group-btn"> | ||
15 | <button *ngIf="displayAddField(id)" (click)="addField()" class="btn btn-default" type="button">+</button> | ||
16 | <button *ngIf="displayRemoveField(id)" (click)="removeField(id)" class="btn btn-default" type="button">-</button> | ||
17 | </span> | ||
18 | </div> | ||
19 | 11 | ||
20 | <div [hidden]="form.controls['host-' + id].valid || form.controls['host-' + id].pristine" class="alert alert-warning"> | 12 | <div class="input-group"> |
21 | It should be a valid host. | 13 | <input |
22 | </div> | 14 | type="text" class="form-control" placeholder="domain.tld" |
23 | </div> | 15 | [id]="'host-' + id" [formControlName]="'host-' + id" |
16 | /> | ||
17 | <span class="input-group-btn"> | ||
18 | <button *ngIf="displayAddField(id)" (click)="addField()" class="btn btn-default" type="button">+</button> | ||
19 | <button *ngIf="displayRemoveField(id)" (click)="removeField(id)" class="btn btn-default" type="button">-</button> | ||
20 | </span> | ||
21 | </div> | ||
24 | 22 | ||
25 | <div *ngIf="canMakeFriends() === false" class="alert alert-warning"> | 23 | <div [hidden]="form.controls['host-' + id].valid || form.controls['host-' + id].pristine" class="alert alert-warning"> |
26 | It seems that you are not on a HTTPS pod. Your webserver need to have TLS activated in order to make friends. | 24 | It should be a valid host. |
27 | </div> | 25 | </div> |
26 | </div> | ||
28 | 27 | ||
29 | <input type="submit" value="Make friends" class="btn btn-default" [disabled]="!isFormValid()"> | 28 | <div *ngIf="canMakeFriends() === false" class="alert alert-warning"> |
30 | </form> | 29 | It seems that you are not on a HTTPS pod. Your webserver need to have TLS activated in order to make friends. |
30 | </div> | ||
31 | |||
32 | <input type="submit" value="Make friends" class="btn btn-default" [disabled]="!isFormValid()"> | ||
33 | </form> | ||
34 | </div> | ||
35 | </div> | ||
diff --git a/client/src/app/+admin/friends/friend-list/friend-list.component.html b/client/src/app/+admin/friends/friend-list/friend-list.component.html index e15ecde14..45695f7c8 100644 --- a/client/src/app/+admin/friends/friend-list/friend-list.component.html +++ b/client/src/app/+admin/friends/friend-list/friend-list.component.html | |||
@@ -1,11 +1,15 @@ | |||
1 | <h3>Friends list</h3> | 1 | <div class="row"> |
2 | <div class="content-padding"> | ||
3 | <h3>Friends list</h3> | ||
2 | 4 | ||
3 | <ng2-smart-table [settings]="tableSettings" [source]="friendsSource"></ng2-smart-table> | 5 | <ng2-smart-table [settings]="tableSettings" [source]="friendsSource"></ng2-smart-table> |
4 | 6 | ||
5 | <a *ngIf="hasFriends()" class="btn btn-danger pull-left" (click)="quitFriends()"> | 7 | <a *ngIf="hasFriends()" class="btn btn-danger pull-left" (click)="quitFriends()"> |
6 | Quit friends | 8 | Quit friends |
7 | </a> | 9 | </a> |
8 | 10 | ||
9 | <a *ngIf="!hasFriends()" class="btn btn-success pull-right" [routerLink]="['/admin/friends/add']"> | 11 | <a *ngIf="!hasFriends()" class="btn btn-success pull-right" [routerLink]="['/admin/friends/add']"> |
10 | Make friends | 12 | Make friends |
11 | </a> | 13 | </a> |
14 | </div> | ||
15 | </div> | ||
diff --git a/client/src/app/+admin/requests/request-stats/request-stats.component.html b/client/src/app/+admin/requests/request-stats/request-stats.component.html index f35da6535..29e7f7052 100644 --- a/client/src/app/+admin/requests/request-stats/request-stats.component.html +++ b/client/src/app/+admin/requests/request-stats/request-stats.component.html | |||
@@ -1,36 +1,41 @@ | |||
1 | <h3>Requests stats</h3> | 1 | <div class="row"> |
2 | <div class="content-padding"> | ||
2 | 3 | ||
3 | <div *ngFor="let requestSchedulerName of statsTitles | keys" class="col-lg-4 col-md-12"> | 4 | <h3>Requests stats</h3> |
4 | <div class="panel panel-default" *ngIf="stats[requestSchedulerName] !== null"> | ||
5 | <div class="panel-heading">{{ statsTitles[requestSchedulerName] }}</div> | ||
6 | 5 | ||
7 | <div class="panel-body"> | 6 | <div *ngFor="let requestSchedulerName of statsTitles | keys" class="col-lg-4 col-md-12"> |
8 | <div class="requests-general"> | 7 | <div class="panel panel-default" *ngIf="stats[requestSchedulerName] !== null"> |
9 | <div> | 8 | <div class="panel-heading">{{ statsTitles[requestSchedulerName] }}</div> |
10 | <span class="label-description">Remaining requests:</span> | ||
11 | {{ stats[requestSchedulerName].totalRequests }} | ||
12 | </div> | ||
13 | 9 | ||
14 | <div> | 10 | <div class="panel-body"> |
15 | <span class="label-description">Interval seconds between requests:</span> | 11 | <div class="requests-general"> |
16 | {{ stats[requestSchedulerName].secondsInterval }} | 12 | <div> |
17 | </div> | 13 | <span class="label-description">Remaining requests:</span> |
14 | {{ stats[requestSchedulerName].totalRequests }} | ||
15 | </div> | ||
18 | 16 | ||
19 | <div> | 17 | <div> |
20 | <span class="label-description">Remaining time before the scheduled request:</span> | 18 | <span class="label-description">Interval seconds between requests:</span> |
21 | {{ stats[requestSchedulerName].remainingSeconds }} | 19 | {{ stats[requestSchedulerName].secondsInterval }} |
22 | </div> | 20 | </div> |
23 | </div> | ||
24 | 21 | ||
25 | <div class="requests-limit"> | 22 | <div> |
26 | <div> | 23 | <span class="label-description">Remaining time before the scheduled request:</span> |
27 | <span class="label-description">Maximum number of different pods for a scheduled request:</span> | 24 | {{ stats[requestSchedulerName].remainingSeconds }} |
28 | {{ stats[requestSchedulerName].requestsLimitPods }} | 25 | </div> |
29 | </div> | 26 | </div> |
27 | |||
28 | <div class="requests-limit"> | ||
29 | <div> | ||
30 | <span class="label-description">Maximum number of different pods for a scheduled request:</span> | ||
31 | {{ stats[requestSchedulerName].requestsLimitPods }} | ||
32 | </div> | ||
30 | 33 | ||
31 | <div> | 34 | <div> |
32 | <span class="label-description">Maximum number of requests per pod for a scheduled request:</span> | 35 | <span class="label-description">Maximum number of requests per pod for a scheduled request:</span> |
33 | {{ stats[requestSchedulerName].requestsLimitPerPod }} | 36 | {{ stats[requestSchedulerName].requestsLimitPerPod }} |
37 | </div> | ||
38 | </div> | ||
34 | </div> | 39 | </div> |
35 | </div> | 40 | </div> |
36 | </div> | 41 | </div> |
diff --git a/client/src/app/+admin/users/user-add/user-add.component.html b/client/src/app/+admin/users/user-add/user-add.component.html index 105760f48..9b487aa75 100644 --- a/client/src/app/+admin/users/user-add/user-add.component.html +++ b/client/src/app/+admin/users/user-add/user-add.component.html | |||
@@ -1,40 +1,45 @@ | |||
1 | <h3>Add user</h3> | 1 | <div class="row"> |
2 | <div class="content-padding"> | ||
2 | 3 | ||
3 | <div *ngIf="error" class="alert alert-danger">{{ error }}</div> | 4 | <h3>Add user</h3> |
4 | 5 | ||
5 | <form role="form" (ngSubmit)="addUser()" [formGroup]="form"> | 6 | <div *ngIf="error" class="alert alert-danger">{{ error }}</div> |
6 | <div class="form-group"> | ||
7 | <label for="username">Username</label> | ||
8 | <input | ||
9 | type="text" class="form-control" id="username" placeholder="Username" | ||
10 | formControlName="username" | ||
11 | > | ||
12 | <div *ngIf="formErrors.username" class="alert alert-danger"> | ||
13 | {{ formErrors.username }} | ||
14 | </div> | ||
15 | </div> | ||
16 | 7 | ||
17 | <div class="form-group"> | 8 | <form role="form" (ngSubmit)="addUser()" [formGroup]="form"> |
18 | <label for="email">Email</label> | 9 | <div class="form-group"> |
19 | <input | 10 | <label for="username">Username</label> |
20 | type="text" class="form-control" id="email" placeholder="Email" | 11 | <input |
21 | formControlName="email" | 12 | type="text" class="form-control" id="username" placeholder="Username" |
22 | > | 13 | formControlName="username" |
23 | <div *ngIf="formErrors.email" class="alert alert-danger"> | 14 | > |
24 | {{ formErrors.email }} | 15 | <div *ngIf="formErrors.username" class="alert alert-danger"> |
25 | </div> | 16 | {{ formErrors.username }} |
26 | </div> | 17 | </div> |
18 | </div> | ||
27 | 19 | ||
28 | <div class="form-group"> | 20 | <div class="form-group"> |
29 | <label for="password">Password</label> | 21 | <label for="email">Email</label> |
30 | <input | 22 | <input |
31 | type="password" class="form-control" id="password" placeholder="Password" | 23 | type="text" class="form-control" id="email" placeholder="Email" |
32 | formControlName="password" | 24 | formControlName="email" |
33 | > | 25 | > |
34 | <div *ngIf="formErrors.password" class="alert alert-danger"> | 26 | <div *ngIf="formErrors.email" class="alert alert-danger"> |
35 | {{ formErrors.password }} | 27 | {{ formErrors.email }} |
36 | </div> | 28 | </div> |
37 | </div> | 29 | </div> |
38 | 30 | ||
39 | <input type="submit" value="Add user" class="btn btn-default" [disabled]="!form.valid"> | 31 | <div class="form-group"> |
40 | </form> | 32 | <label for="password">Password</label> |
33 | <input | ||
34 | type="password" class="form-control" id="password" placeholder="Password" | ||
35 | formControlName="password" | ||
36 | > | ||
37 | <div *ngIf="formErrors.password" class="alert alert-danger"> | ||
38 | {{ formErrors.password }} | ||
39 | </div> | ||
40 | </div> | ||
41 | |||
42 | <input type="submit" value="Add user" class="btn btn-default" [disabled]="!form.valid"> | ||
43 | </form> | ||
44 | </div> | ||
45 | </div> | ||
diff --git a/client/src/app/+admin/users/user-list/user-list.component.html b/client/src/app/+admin/users/user-list/user-list.component.html index 3d3d7e054..bb4c99a3f 100644 --- a/client/src/app/+admin/users/user-list/user-list.component.html +++ b/client/src/app/+admin/users/user-list/user-list.component.html | |||
@@ -1,11 +1,16 @@ | |||
1 | <h3>Users list</h3> | 1 | <div class="row"> |
2 | <div class="content-padding"> | ||
2 | 3 | ||
3 | <ng2-smart-table | 4 | <h3>Users list</h3> |
4 | [settings]="tableSettings" [source]="usersSource" | ||
5 | (delete)="removeUser($event)" | ||
6 | ></ng2-smart-table> | ||
7 | 5 | ||
8 | <a class="add-user btn btn-success pull-right" [routerLink]="['/admin/users/add']"> | 6 | <ng2-smart-table |
9 | <span class="glyphicon glyphicon-plus"></span> | 7 | [settings]="tableSettings" [source]="usersSource" |
10 | Add user | 8 | (delete)="removeUser($event)" |
11 | </a> | 9 | ></ng2-smart-table> |
10 | |||
11 | <a class="add-user btn btn-success pull-right" [routerLink]="['/admin/users/add']"> | ||
12 | <span class="glyphicon glyphicon-plus"></span> | ||
13 | Add user | ||
14 | </a> | ||
15 | </div> | ||
16 | </div> | ||
diff --git a/client/src/app/+admin/video-abuses/video-abuse-list/video-abuse-list.component.html b/client/src/app/+admin/video-abuses/video-abuse-list/video-abuse-list.component.html index b2fd17bf0..c6723a734 100644 --- a/client/src/app/+admin/video-abuses/video-abuse-list/video-abuse-list.component.html +++ b/client/src/app/+admin/video-abuses/video-abuse-list/video-abuse-list.component.html | |||
@@ -1,5 +1,11 @@ | |||
1 | <h3>Video abuses list</h3> | 1 | <div class="row"> |
2 | <div class="content-padding"> | ||
2 | 3 | ||
3 | <ng2-smart-table | 4 | <h3>Video abuses list</h3> |
4 | [settings]="tableSettings" [source]="videoAbusesSource" | 5 | |
5 | ></ng2-smart-table> | 6 | <ng2-smart-table |
7 | [settings]="tableSettings" [source]="videoAbusesSource" | ||
8 | ></ng2-smart-table> | ||
9 | |||
10 | </div> | ||
11 | </div> | ||