diff options
Diffstat (limited to 'client/src/app')
4 files changed, 9 insertions, 12 deletions
diff --git a/client/src/app/+admin/overview/users/user-list/user-list.component.html b/client/src/app/+admin/overview/users/user-list/user-list.component.html index f6915ae9a..4da46dc7b 100644 --- a/client/src/app/+admin/overview/users/user-list/user-list.component.html +++ b/client/src/app/+admin/overview/users/user-list/user-list.component.html | |||
@@ -139,7 +139,7 @@ | |||
139 | 139 | ||
140 | <td *ngIf="isSelected('quotaDaily')"> | 140 | <td *ngIf="isSelected('quotaDaily')"> |
141 | <div class="progress" i18n-title title="Total daily video quota"> | 141 | <div class="progress" i18n-title title="Total daily video quota"> |
142 | <div class="progress-bar secondary" role="progressbar" [style]="{ width: getUserVideoQuotaDailyPercentage(user) + '%' }" | 142 | <div class="progress-bar" role="progressbar" [style]="{ width: getUserVideoQuotaDailyPercentage(user) + '%' }" |
143 | [attr.aria-valuenow]="user.rawVideoQuotaUsedDaily" aria-valuemin="0" [attr.aria-valuemax]="user.rawVideoQuotaDaily"> | 143 | [attr.aria-valuenow]="user.rawVideoQuotaUsedDaily" aria-valuemin="0" [attr.aria-valuemax]="user.rawVideoQuotaDaily"> |
144 | </div> | 144 | </div> |
145 | <span>{{ user.videoQuotaUsedDaily }}</span> | 145 | <span>{{ user.videoQuotaUsedDaily }}</span> |
diff --git a/client/src/app/+admin/overview/users/user-list/user-list.component.ts b/client/src/app/+admin/overview/users/user-list/user-list.component.ts index f7dc22256..c3a7646cc 100644 --- a/client/src/app/+admin/overview/users/user-list/user-list.component.ts +++ b/client/src/app/+admin/overview/users/user-list/user-list.component.ts | |||
@@ -190,6 +190,7 @@ export class UserListComponent extends RestTable implements OnInit { | |||
190 | } | 190 | } |
191 | 191 | ||
192 | getUserVideoQuotaDailyPercentage (user: UserForList) { | 192 | getUserVideoQuotaDailyPercentage (user: UserForList) { |
193 | console.log(user.rawVideoQuotaUsedDaily * 100 / user.rawVideoQuotaDaily) | ||
193 | return user.rawVideoQuotaUsedDaily * 100 / user.rawVideoQuotaDaily | 194 | return user.rawVideoQuotaUsedDaily * 100 / user.rawVideoQuotaDaily |
194 | } | 195 | } |
195 | 196 | ||
diff --git a/client/src/app/+videos/+video-watch/shared/metadata/video-avatar-channel.component.scss b/client/src/app/+videos/+video-watch/shared/metadata/video-avatar-channel.component.scss index 80711ff32..fd9dd1a6a 100644 --- a/client/src/app/+videos/+video-watch/shared/metadata/video-avatar-channel.component.scss +++ b/client/src/app/+videos/+video-watch/shared/metadata/video-avatar-channel.component.scss | |||
@@ -1,14 +1,5 @@ | |||
1 | @use '_mixins' as *; | 1 | @use '_mixins' as *; |
2 | 2 | ||
3 | @mixin secondary { | ||
4 | height: 60%; | ||
5 | width: 60%; | ||
6 | position: absolute; | ||
7 | bottom: -5px; | ||
8 | right: -5px; | ||
9 | background-color: rgba(0, 0, 0, 0); | ||
10 | } | ||
11 | |||
12 | .wrapper { | 3 | .wrapper { |
13 | @include margin-right(5px); | 4 | @include margin-right(5px); |
14 | 5 | ||
@@ -16,6 +7,11 @@ | |||
16 | margin-bottom: 5px; | 7 | margin-bottom: 5px; |
17 | 8 | ||
18 | .second-avatar { | 9 | .second-avatar { |
19 | @include secondary(); | 10 | height: 60%; |
11 | width: 60%; | ||
12 | position: absolute; | ||
13 | bottom: -5px; | ||
14 | right: -5px; | ||
15 | background-color: rgba(0, 0, 0, 0); | ||
20 | } | 16 | } |
21 | } | 17 | } |
diff --git a/client/src/app/shared/shared-main/users/user-quota.component.html b/client/src/app/shared/shared-main/users/user-quota.component.html index dd1fc20d0..0e0d38c2a 100644 --- a/client/src/app/shared/shared-main/users/user-quota.component.html +++ b/client/src/app/shared/shared-main/users/user-quota.component.html | |||
@@ -12,7 +12,7 @@ | |||
12 | <div *ngIf="hasDailyQuota()" class="mt-3"> | 12 | <div *ngIf="hasDailyQuota()" class="mt-3"> |
13 | <label class="user-quota-title" tabindex="0" i18n>Daily video quota</label> | 13 | <label class="user-quota-title" tabindex="0" i18n>Daily video quota</label> |
14 | <div class="progress" tabindex="0" [ngbTooltip]="titleVideoQuotaDaily()"> | 14 | <div class="progress" tabindex="0" [ngbTooltip]="titleVideoQuotaDaily()"> |
15 | <div class="progress-bar secondary" role="progressbar" [style]="{ width: userVideoQuotaDailyPercentage + '%' }" | 15 | <div class="progress-bar" role="progressbar" [style]="{ width: userVideoQuotaDailyPercentage + '%' }" |
16 | [attr.aria-valuenow]="userVideoQuotaUsedDaily" aria-valuemin="0" [attr.aria-valuemax]="user.videoQuotaDaily"></div> | 16 | [attr.aria-valuenow]="userVideoQuotaUsedDaily" aria-valuemin="0" [attr.aria-valuemax]="user.videoQuotaDaily"></div> |
17 | <span>{{ userVideoQuotaUsedDaily | bytes: 1 }}</span> | 17 | <span>{{ userVideoQuotaUsedDaily | bytes: 1 }}</span> |
18 | <span>{{ userVideoQuotaDaily }}</span> | 18 | <span>{{ userVideoQuotaDaily }}</span> |