diff options
author | Rigel Kent <sendmemail@rigelk.eu> | 2018-09-02 21:35:52 +0200 |
---|---|---|
committer | Chocobozzz <me@florianbigard.com> | 2018-09-03 08:49:29 +0200 |
commit | 61318dd63fc652383cbe043851ade195f061b5f2 (patch) | |
tree | d07918442445f9a471c34df10ccdd19fe07a2a2d /client/src/app/shared | |
parent | 20d211990425af8d9bb5c8eba204d2b485bcd19a (diff) | |
download | PeerTube-61318dd63fc652383cbe043851ade195f061b5f2.tar.gz PeerTube-61318dd63fc652383cbe043851ade195f061b5f2.tar.zst PeerTube-61318dd63fc652383cbe043851ade195f061b5f2.zip |
add daily quota to the features table information
Diffstat (limited to 'client/src/app/shared')
3 files changed, 6 insertions, 3 deletions
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 ba170f074..dc8db8cc1 100644 --- a/client/src/app/shared/instance/instance-features-table.component.html +++ b/client/src/app/shared/instance/instance-features-table.component.html | |||
@@ -6,13 +6,13 @@ | |||
6 | 6 | ||
7 | <td class="value"> | 7 | <td class="value"> |
8 | <ng-container *ngIf="initialUserVideoQuota !== -1"> | 8 | <ng-container *ngIf="initialUserVideoQuota !== -1"> |
9 | {{ initialUserVideoQuota | bytes: 0 }} | 9 | {{ initialUserVideoQuota | bytes: 0 }} <ng-container *ngIf="dailyUserVideoQuota !== -1">({{ dailyUserVideoQuota | bytes: 0 }} per day)</ng-container> |
10 | 10 | ||
11 | <my-help helpType="custom" [customHtml]="quotaHelpIndication"></my-help> | 11 | <my-help helpType="custom" [customHtml]="quotaHelpIndication"></my-help> |
12 | </ng-container> | 12 | </ng-container> |
13 | 13 | ||
14 | <ng-container i18n *ngIf="initialUserVideoQuota === -1"> | 14 | <ng-container i18n *ngIf="initialUserVideoQuota === -1"> |
15 | Unlimited | 15 | Unlimited <ng-container *ngIf="dailyUserVideoQuota !== -1">({{ dailyUserVideoQuota | bytes: 0 }} per day)</ng-container> |
16 | </ng-container> | 16 | </ng-container> |
17 | </td> | 17 | </td> |
18 | </tr> | 18 | </tr> |
diff --git a/client/src/app/shared/instance/instance-features-table.component.scss b/client/src/app/shared/instance/instance-features-table.component.scss index d597a03ba..90fbb5c94 100644 --- a/client/src/app/shared/instance/instance-features-table.component.scss +++ b/client/src/app/shared/instance/instance-features-table.component.scss | |||
@@ -3,7 +3,6 @@ | |||
3 | 3 | ||
4 | table { | 4 | table { |
5 | font-size: 14px; | 5 | font-size: 14px; |
6 | max-width: 400px; | ||
7 | 6 | ||
8 | .label { | 7 | .label { |
9 | font-weight: $font-semibold; | 8 | font-weight: $font-semibold; |
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 1aad5aa81..da8da0702 100644 --- a/client/src/app/shared/instance/instance-features-table.component.ts +++ b/client/src/app/shared/instance/instance-features-table.component.ts | |||
@@ -21,6 +21,10 @@ export class InstanceFeaturesTableComponent implements OnInit { | |||
21 | return this.serverService.getConfig().user.videoQuota | 21 | return this.serverService.getConfig().user.videoQuota |
22 | } | 22 | } |
23 | 23 | ||
24 | get dailyUserVideoQuota () { | ||
25 | return this.serverService.getConfig().user.videoQuotaDaily | ||
26 | } | ||
27 | |||
24 | ngOnInit () { | 28 | ngOnInit () { |
25 | this.serverService.configLoaded | 29 | this.serverService.configLoaded |
26 | .subscribe(() => { | 30 | .subscribe(() => { |