diff options
Diffstat (limited to 'client/src/app')
4 files changed, 13 insertions, 38 deletions
diff --git a/client/src/app/+about/about-instance/about-instance.component.html b/client/src/app/+about/about-instance/about-instance.component.html index 8c700752e..83376b6f6 100644 --- a/client/src/app/+about/about-instance/about-instance.component.html +++ b/client/src/app/+about/about-instance/about-instance.component.html | |||
@@ -21,26 +21,6 @@ | |||
21 | 21 | ||
22 | <div [innerHTML]="termsHTML"></div> | 22 | <div [innerHTML]="termsHTML"></div> |
23 | </div> | 23 | </div> |
24 | |||
25 | <div class="signup"> | ||
26 | <div i18n class="section-title">Signup</div> | ||
27 | |||
28 | <div *ngIf="isSignupAllowed"> | ||
29 | <ng-container i18n>User registration is allowed and</ng-container> | ||
30 | |||
31 | <ng-container i18n *ngIf="userVideoQuota !== -1"> | ||
32 | this instance provides a baseline quota of {{ userVideoQuota | bytes: 0 }} space for the videos of its users. | ||
33 | </ng-container> | ||
34 | |||
35 | <ng-container i18n *ngIf="userVideoQuota === -1"> | ||
36 | this instance provides unlimited space for the videos of its users. | ||
37 | </ng-container> | ||
38 | </div> | ||
39 | |||
40 | <div i18n *ngIf="isSignupAllowed === false"> | ||
41 | User registration is currently not allowed. | ||
42 | </div> | ||
43 | </div> | ||
44 | </div> | 24 | </div> |
45 | 25 | ||
46 | <div class="col-md-12 col-xl-6"> | 26 | <div class="col-md-12 col-xl-6"> |
diff --git a/client/src/app/+about/about-instance/about-instance.component.ts b/client/src/app/+about/about-instance/about-instance.component.ts index ec572ff80..c9eab44ab 100644 --- a/client/src/app/+about/about-instance/about-instance.component.ts +++ b/client/src/app/+about/about-instance/about-instance.component.ts | |||
@@ -29,14 +29,6 @@ export class AboutInstanceComponent implements OnInit { | |||
29 | return this.serverService.getConfig().instance.name | 29 | return this.serverService.getConfig().instance.name |
30 | } | 30 | } |
31 | 31 | ||
32 | get userVideoQuota () { | ||
33 | return this.serverService.getConfig().user.videoQuota | ||
34 | } | ||
35 | |||
36 | get isSignupAllowed () { | ||
37 | return this.serverService.getConfig().signup.allowed | ||
38 | } | ||
39 | |||
40 | get isContactFormEnabled () { | 32 | get isContactFormEnabled () { |
41 | return this.serverService.getConfig().email.enabled && this.serverService.getConfig().contactForm.enabled | 33 | return this.serverService.getConfig().email.enabled && this.serverService.getConfig().contactForm.enabled |
42 | } | 34 | } |
diff --git a/client/src/app/shared/instance/instance-features-table.component.html b/client/src/app/shared/instance/instance-features-table.component.html index dc8db8cc1..90046f409 100644 --- a/client/src/app/shared/instance/instance-features-table.component.html +++ b/client/src/app/shared/instance/instance-features-table.component.html | |||
@@ -1,6 +1,14 @@ | |||
1 | <div class="feature-table"> | 1 | <div class="feature-table"> |
2 | 2 | ||
3 | <table class="table"> | 3 | <table class="table"> |
4 | <tr *ngFor="let feature of features"> | ||
5 | <td class="label">{{ feature.label }}</td> | ||
6 | <td> | ||
7 | <span *ngIf="feature.value === true" class="glyphicon glyphicon-ok"></span> | ||
8 | <span *ngIf="feature.value === false" class="glyphicon glyphicon-remove"></span> | ||
9 | </td> | ||
10 | </tr> | ||
11 | |||
4 | <tr> | 12 | <tr> |
5 | <td i18n class="label">Video quota</td> | 13 | <td i18n class="label">Video quota</td> |
6 | 14 | ||
@@ -16,13 +24,5 @@ | |||
16 | </ng-container> | 24 | </ng-container> |
17 | </td> | 25 | </td> |
18 | </tr> | 26 | </tr> |
19 | |||
20 | <tr *ngFor="let feature of features"> | ||
21 | <td class="label">{{ feature.label }}</td> | ||
22 | <td> | ||
23 | <span *ngIf="feature.value === true" class="glyphicon glyphicon-ok"></span> | ||
24 | <span *ngIf="feature.value === false" class="glyphicon glyphicon-remove"></span> | ||
25 | </td> | ||
26 | </tr> | ||
27 | </table> | 27 | </table> |
28 | </div> \ No newline at end of file | 28 | </div> |
diff --git a/client/src/app/shared/instance/instance-features-table.component.ts b/client/src/app/shared/instance/instance-features-table.component.ts index da8da0702..aaf0a6960 100644 --- a/client/src/app/shared/instance/instance-features-table.component.ts +++ b/client/src/app/shared/instance/instance-features-table.component.ts | |||
@@ -38,6 +38,10 @@ export class InstanceFeaturesTableComponent implements OnInit { | |||
38 | 38 | ||
39 | this.features = [ | 39 | this.features = [ |
40 | { | 40 | { |
41 | label: this.i18n('User registration allowed'), | ||
42 | value: config.signup.allowed | ||
43 | }, | ||
44 | { | ||
41 | label: this.i18n('Transcode your videos in multiple resolutions'), | 45 | label: this.i18n('Transcode your videos in multiple resolutions'), |
42 | value: config.transcoding.enabledResolutions.length !== 0 | 46 | value: config.transcoding.enabledResolutions.length !== 0 |
43 | }, | 47 | }, |
@@ -50,7 +54,6 @@ export class InstanceFeaturesTableComponent implements OnInit { | |||
50 | value: config.import.videos.torrent.enabled | 54 | value: config.import.videos.torrent.enabled |
51 | } | 55 | } |
52 | ] | 56 | ] |
53 | |||
54 | } | 57 | } |
55 | 58 | ||
56 | private getApproximateTime (seconds: number) { | 59 | private getApproximateTime (seconds: number) { |