diff options
author | Rigel Kent <par@rigelk.eu> | 2018-03-27 13:42:57 +0200 |
---|---|---|
committer | Chocobozzz <me@florianbigard.com> | 2018-03-27 13:42:57 +0200 |
commit | 1869c87535d31a73a26c5d07718cdf94300cc332 (patch) | |
tree | 0fa1823002f7a1e76e8ee138da6f5e2088f65981 /client/src/app/about | |
parent | fc27b17c6b4ddaef2db8e7086d3f74c081026bd9 (diff) | |
download | PeerTube-1869c87535d31a73a26c5d07718cdf94300cc332.tar.gz PeerTube-1869c87535d31a73a26c5d07718cdf94300cc332.tar.zst PeerTube-1869c87535d31a73a26c5d07718cdf94300cc332.zip |
show quota in stats, display quota on the about page, fixes #405 (#421)
move videoQuota under a user object, use byte PipeTransform
Diffstat (limited to 'client/src/app/about')
-rw-r--r-- | client/src/app/about/about.component.html | 8 | ||||
-rw-r--r-- | client/src/app/about/about.component.ts | 6 |
2 files changed, 13 insertions, 1 deletions
diff --git a/client/src/app/about/about.component.html b/client/src/app/about/about.component.html index 3bb86208c..bcb4ed2be 100644 --- a/client/src/app/about/about.component.html +++ b/client/src/app/about/about.component.html | |||
@@ -13,6 +13,14 @@ | |||
13 | <div class="section-title">Terms</div> | 13 | <div class="section-title">Terms</div> |
14 | 14 | ||
15 | <div [innerHTML]="termsHTML"></div> | 15 | <div [innerHTML]="termsHTML"></div> |
16 | |||
17 | <div *ngIf="userVideoQuota !== -1;else noQuota"> | ||
18 | This instance provides a baseline quota of {{ userVideoQuota | bytes: 0 }} space for the videos of its users. | ||
19 | </div> | ||
20 | |||
21 | <ng-template #noQuota> | ||
22 | This instance provides unlimited space for the videos of its users. | ||
23 | </ng-template> | ||
16 | </div> | 24 | </div> |
17 | 25 | ||
18 | <div id="p2p-privacy"> | 26 | <div id="p2p-privacy"> |
diff --git a/client/src/app/about/about.component.ts b/client/src/app/about/about.component.ts index adad32b26..7edc013e1 100644 --- a/client/src/app/about/about.component.ts +++ b/client/src/app/about/about.component.ts | |||
@@ -23,6 +23,10 @@ export class AboutComponent implements OnInit { | |||
23 | return this.serverService.getConfig().instance.name | 23 | return this.serverService.getConfig().instance.name |
24 | } | 24 | } |
25 | 25 | ||
26 | get userVideoQuota () { | ||
27 | return this.serverService.getConfig().user.videoQuota | ||
28 | } | ||
29 | |||
26 | ngOnInit () { | 30 | ngOnInit () { |
27 | this.serverService.getAbout() | 31 | this.serverService.getAbout() |
28 | .subscribe( | 32 | .subscribe( |
@@ -31,7 +35,7 @@ export class AboutComponent implements OnInit { | |||
31 | this.termsHTML = this.markdownService.textMarkdownToHTML(res.instance.terms) | 35 | this.termsHTML = this.markdownService.textMarkdownToHTML(res.instance.terms) |
32 | }, | 36 | }, |
33 | 37 | ||
34 | err => this.notificationsService.error('Error', err) | 38 | err => this.notificationsService.error('Error getting about from server', err) |
35 | ) | 39 | ) |
36 | } | 40 | } |
37 | 41 | ||