diff options
| author | Chocobozzz <me@florianbigard.com> | 2019-02-11 11:52:34 +0100 |
|---|---|---|
| committer | Chocobozzz <me@florianbigard.com> | 2019-02-11 11:52:34 +0100 |
| commit | 88108880bbdba473cfe36ecbebc1c3c4f972e102 (patch) | |
| tree | b242efb3b4f0d7e49d88f2d1f2063b5b3b0489c0 /client/src/app/+my-account/my-account-settings/my-account-settings.component.html | |
| parent | 53a94c7cfa8368da4cd248d65df8346905938f0c (diff) | |
| parent | 9b712a2017e4ab3cf12cd6bd58278905520159d0 (diff) | |
| download | PeerTube-88108880bbdba473cfe36ecbebc1c3c4f972e102.tar.gz PeerTube-88108880bbdba473cfe36ecbebc1c3c4f972e102.tar.zst PeerTube-88108880bbdba473cfe36ecbebc1c3c4f972e102.zip | |
Merge branch 'develop' into pr/1217
Diffstat (limited to 'client/src/app/+my-account/my-account-settings/my-account-settings.component.html')
| -rw-r--r-- | client/src/app/+my-account/my-account-settings/my-account-settings.component.html | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/client/src/app/+my-account/my-account-settings/my-account-settings.component.html b/client/src/app/+my-account/my-account-settings/my-account-settings.component.html index c7e23cd1f..ad64f28fe 100644 --- a/client/src/app/+my-account/my-account-settings/my-account-settings.component.html +++ b/client/src/app/+my-account/my-account-settings/my-account-settings.component.html | |||
| @@ -4,10 +4,11 @@ | |||
| 4 | <span i18n class="user-quota-label">Video quota:</span> {{ userVideoQuotaUsed | bytes: 0 }} / {{ userVideoQuota }} | 4 | <span i18n class="user-quota-label">Video quota:</span> {{ userVideoQuotaUsed | bytes: 0 }} / {{ userVideoQuota }} |
| 5 | </div> | 5 | </div> |
| 6 | 6 | ||
| 7 | <ng-template [ngIf]="user && user.account"> | 7 | <div i18n class="account-title">Profile</div> |
| 8 | <div i18n class="account-title">Profile</div> | 8 | <my-account-profile [user]="user" [userInformationLoaded]="userInformationLoaded"></my-account-profile> |
| 9 | <my-account-profile [user]="user" [userInformationLoaded]="userInformationLoaded"></my-account-profile> | 9 | |
| 10 | </ng-template> | 10 | <div i18n class="account-title" id="notifications">Notifications</div> |
| 11 | <my-account-notification-preferences [user]="user" [userInformationLoaded]="userInformationLoaded"></my-account-notification-preferences> | ||
| 11 | 12 | ||
| 12 | <div i18n class="account-title">Password</div> | 13 | <div i18n class="account-title">Password</div> |
| 13 | <my-account-change-password></my-account-change-password> | 14 | <my-account-change-password></my-account-change-password> |
| @@ -16,4 +17,4 @@ | |||
| 16 | <my-account-video-settings [user]="user" [userInformationLoaded]="userInformationLoaded"></my-account-video-settings> | 17 | <my-account-video-settings [user]="user" [userInformationLoaded]="userInformationLoaded"></my-account-video-settings> |
| 17 | 18 | ||
| 18 | <div i18n class="account-title">Danger zone</div> | 19 | <div i18n class="account-title">Danger zone</div> |
| 19 | <my-account-danger-zone [user]="user"></my-account-danger-zone> \ No newline at end of file | 20 | <my-account-danger-zone [user]="user"></my-account-danger-zone> |