diff options
Diffstat (limited to 'client/src/app/shared/video')
3 files changed, 28 insertions, 19 deletions
diff --git a/client/src/app/shared/video/abstract-video-list.ts b/client/src/app/shared/video/abstract-video-list.ts index b146d7014..69d5c0010 100644 --- a/client/src/app/shared/video/abstract-video-list.ts +++ b/client/src/app/shared/video/abstract-video-list.ts | |||
@@ -56,6 +56,7 @@ export abstract class AbstractVideoList implements OnInit, OnDestroy, DisableFor | |||
56 | date: true, | 56 | date: true, |
57 | views: true, | 57 | views: true, |
58 | by: true, | 58 | by: true, |
59 | avatar: true, | ||
59 | privacyLabel: true, | 60 | privacyLabel: true, |
60 | privacyText: false, | 61 | privacyText: false, |
61 | state: false, | 62 | state: false, |
diff --git a/client/src/app/shared/video/video-miniature.component.html b/client/src/app/shared/video/video-miniature.component.html index 8e948ce42..c9ac97762 100644 --- a/client/src/app/shared/video/video-miniature.component.html +++ b/client/src/app/shared/video/video-miniature.component.html | |||
@@ -15,26 +15,32 @@ | |||
15 | [routerLink]="[ '/videos/watch', video.uuid ]" [attr.title]="video.name" [ngClass]="{ 'blur-filter': isVideoBlur }" | 15 | [routerLink]="[ '/videos/watch', video.uuid ]" [attr.title]="video.name" [ngClass]="{ 'blur-filter': isVideoBlur }" |
16 | >{{ video.name }}</a> | 16 | >{{ video.name }}</a> |
17 | 17 | ||
18 | <span class="video-miniature-created-at-views"> | 18 | <div class="d-inline-flex"> |
19 | <my-date-toggle *ngIf="displayOptions.date" [date]="video.publishedAt"></my-date-toggle> | 19 | <avatar-channel *ngIf="displayOptions.avatar" class="mr-1 pt-1" [video]="video" size="sm"></avatar-channel> |
20 | 20 | ||
21 | <span class="views"> | 21 | <div class="d-flex flex-column"> |
22 | <ng-container *ngIf="displayOptions.date && displayOptions.views"> • </ng-container> | 22 | <span class="video-miniature-created-at-views"> |
23 | <ng-container i18n *ngIf="displayOptions.views">{video.views, plural, =1 {1 view} other {{{ video.views | myNumberFormatter }} views}}</ng-container> | 23 | <my-date-toggle *ngIf="displayOptions.date" [date]="video.publishedAt"></my-date-toggle> |
24 | </span> | 24 | |
25 | </span> | 25 | <span class="views"> |
26 | 26 | <ng-container *ngIf="displayOptions.date && displayOptions.views"> • </ng-container> | |
27 | <a tabindex="-1" *ngIf="displayOptions.by && displayOwnerAccount()" class="video-miniature-account" [routerLink]="[ '/accounts', video.byAccount ]"> | 27 | <ng-container i18n *ngIf="displayOptions.views">{video.views, plural, =1 {1 view} other {{{ video.views | myNumberFormatter }} views}}</ng-container> |
28 | {{ video.byAccount }} | 28 | </span> |
29 | </a> | 29 | </span> |
30 | <a tabindex="-1" *ngIf="displayOptions.by && displayOwnerVideoChannel()" class="video-miniature-channel" [routerLink]="[ '/video-channels', video.byVideoChannel ]"> | 30 | |
31 | {{ video.byVideoChannel }} | 31 | <a tabindex="-1" *ngIf="displayOptions.by && displayOwnerAccount()" class="video-miniature-account" [routerLink]="[ '/accounts', video.byAccount ]"> |
32 | </a> | 32 | {{ video.byAccount }} |
33 | 33 | </a> | |
34 | <div class="video-info-privacy"> | 34 | <a tabindex="-1" *ngIf="displayOptions.by && displayOwnerVideoChannel()" class="video-miniature-channel" [routerLink]="[ '/video-channels', video.byVideoChannel ]"> |
35 | <ng-container *ngIf="displayOptions.privacyText">{{ video.privacy.label }}</ng-container> | 35 | {{ video.byVideoChannel }} |
36 | <ng-container *ngIf="displayOptions.privacyText && displayOptions.state && getStateLabel(video)"> - </ng-container> | 36 | </a> |
37 | <ng-container *ngIf="displayOptions.state">{{ getStateLabel(video) }}</ng-container> | 37 | |
38 | <div class="video-info-privacy"> | ||
39 | <ng-container *ngIf="displayOptions.privacyText">{{ video.privacy.label }}</ng-container> | ||
40 | <ng-container *ngIf="displayOptions.privacyText && displayOptions.state && getStateLabel(video)"> - </ng-container> | ||
41 | <ng-container *ngIf="displayOptions.state">{{ getStateLabel(video) }}</ng-container> | ||
42 | </div> | ||
43 | </div> | ||
38 | </div> | 44 | </div> |
39 | 45 | ||
40 | <div *ngIf="displayOptions.blacklistInfo && video.blacklisted" class="video-info-blacklisted"> | 46 | <div *ngIf="displayOptions.blacklistInfo && video.blacklisted" class="video-info-blacklisted"> |
diff --git a/client/src/app/shared/video/video-miniature.component.ts b/client/src/app/shared/video/video-miniature.component.ts index 72b652448..88b21b3a5 100644 --- a/client/src/app/shared/video/video-miniature.component.ts +++ b/client/src/app/shared/video/video-miniature.component.ts | |||
@@ -24,6 +24,7 @@ export type MiniatureDisplayOptions = { | |||
24 | date?: boolean | 24 | date?: boolean |
25 | views?: boolean | 25 | views?: boolean |
26 | by?: boolean | 26 | by?: boolean |
27 | avatar?: boolean | ||
27 | privacyLabel?: boolean | 28 | privacyLabel?: boolean |
28 | privacyText?: boolean | 29 | privacyText?: boolean |
29 | state?: boolean | 30 | state?: boolean |
@@ -46,6 +47,7 @@ export class VideoMiniatureComponent implements OnInit { | |||
46 | date: true, | 47 | date: true, |
47 | views: true, | 48 | views: true, |
48 | by: true, | 49 | by: true, |
50 | avatar: false, | ||
49 | privacyLabel: false, | 51 | privacyLabel: false, |
50 | privacyText: false, | 52 | privacyText: false, |
51 | state: false, | 53 | state: false, |