diff options
Diffstat (limited to 'client/src/app/+videos/+video-watch/shared')
3 files changed, 20 insertions, 22 deletions
diff --git a/client/src/app/+videos/+video-watch/shared/metadata/video-avatar-channel.component.html b/client/src/app/+videos/+video-watch/shared/metadata/video-avatar-channel.component.html index 5a7221858..d433c7aba 100644 --- a/client/src/app/+videos/+video-watch/shared/metadata/video-avatar-channel.component.html +++ b/client/src/app/+videos/+video-watch/shared/metadata/video-avatar-channel.component.html | |||
@@ -1,11 +1,20 @@ | |||
1 | <div class="wrapper" [ngClass]="{ 'generic-channel': genericChannel }"> | 1 | <div class="wrapper"> |
2 | <my-actor-avatar | 2 | <my-actor-avatar |
3 | class="channel" [channel]="video.channel" | 3 | *ngIf="showChannel" |
4 | [internalHref]="[ '/c', video.byVideoChannel ]" [title]="channelLinkTitle" | 4 | class="channel" |
5 | [class.main-avatar]="showChannel" | ||
6 | [channel]="video.channel" | ||
7 | [internalHref]="[ '/c', video.byVideoChannel ]" | ||
8 | [title]="channelLinkTitle" | ||
5 | ></my-actor-avatar> | 9 | ></my-actor-avatar> |
6 | 10 | ||
7 | <my-actor-avatar | 11 | <my-actor-avatar |
8 | class="account" [account]="video.account" | 12 | *ngIf="showAccount" |
9 | [internalHref]="[ '/a', video.byAccount ]" [title]="accountLinkTitle"> | 13 | class="account" |
14 | [class.main-avatar]="!showChannel" | ||
15 | [class.second-avatar]="showChannel" | ||
16 | [account]="video.account" | ||
17 | [internalHref]="[ '/a', video.byAccount ]" | ||
18 | [title]="accountLinkTitle"> | ||
10 | </my-actor-avatar> | 19 | </my-actor-avatar> |
11 | </div> | 20 | </div> |
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 1ff8fb96e..71c5e4b5a 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 | |||
@@ -20,23 +20,11 @@ | |||
20 | position: relative; | 20 | position: relative; |
21 | margin-bottom: 5px; | 21 | margin-bottom: 5px; |
22 | 22 | ||
23 | &.generic-channel { | 23 | .main-avatar { |
24 | .account { | 24 | @include main(); |
25 | @include main(); | ||
26 | } | ||
27 | |||
28 | .channel { | ||
29 | display: none !important; | ||
30 | } | ||
31 | } | 25 | } |
32 | 26 | ||
33 | &:not(.generic-channel) { | 27 | .second-avatar { |
34 | .account { | 28 | @include secondary(); |
35 | @include secondary(); | ||
36 | } | ||
37 | |||
38 | .channel { | ||
39 | @include main(); | ||
40 | } | ||
41 | } | 29 | } |
42 | } | 30 | } |
diff --git a/client/src/app/+videos/+video-watch/shared/metadata/video-avatar-channel.component.ts b/client/src/app/+videos/+video-watch/shared/metadata/video-avatar-channel.component.ts index 63edd7bad..146c440b3 100644 --- a/client/src/app/+videos/+video-watch/shared/metadata/video-avatar-channel.component.ts +++ b/client/src/app/+videos/+video-watch/shared/metadata/video-avatar-channel.component.ts | |||
@@ -10,7 +10,8 @@ export class VideoAvatarChannelComponent implements OnInit { | |||
10 | @Input() video: Video | 10 | @Input() video: Video |
11 | @Input() byAccount: string | 11 | @Input() byAccount: string |
12 | 12 | ||
13 | @Input() genericChannel: boolean | 13 | @Input() showAccount: boolean |
14 | @Input() showChannel: boolean | ||
14 | 15 | ||
15 | channelLinkTitle = '' | 16 | channelLinkTitle = '' |
16 | accountLinkTitle = '' | 17 | accountLinkTitle = '' |