aboutsummaryrefslogtreecommitdiffhomepage
path: root/client/src/app/+videos
diff options
context:
space:
mode:
Diffstat (limited to 'client/src/app/+videos')
-rw-r--r--client/src/app/+videos/+video-watch/video-watch.component.html22
-rw-r--r--client/src/app/+videos/+video-watch/video-watch.component.scss4
-rw-r--r--client/src/app/+videos/+video-watch/video-watch.component.ts9
3 files changed, 28 insertions, 7 deletions
diff --git a/client/src/app/+videos/+video-watch/video-watch.component.html b/client/src/app/+videos/+video-watch/video-watch.component.html
index 0447268f0..fb6d08167 100644
--- a/client/src/app/+videos/+video-watch/video-watch.component.html
+++ b/client/src/app/+videos/+video-watch/video-watch.component.html
@@ -144,15 +144,23 @@
144 144
145 <div class="pt-3 border-top video-info-channel d-flex"> 145 <div class="pt-3 border-top video-info-channel d-flex">
146 <div class="video-info-channel-left d-flex"> 146 <div class="video-info-channel-left d-flex">
147 <avatar-channel [video]="video"></avatar-channel> 147 <avatar-channel [video]="video" [genericChannel]="isChannelDisplayNameGeneric()"></avatar-channel>
148 148
149 <div class="video-info-channel-left-links ml-1"> 149 <div class="video-info-channel-left-links ml-1">
150 <a [routerLink]="[ '/video-channels', video.byVideoChannel ]" i18n-title title="Channel page"> 150 <ng-container *ngIf="!isChannelDisplayNameGeneric()">
151 {{ video.channel.displayName }} 151 <a [routerLink]="[ '/video-channels', video.byVideoChannel ]" i18n-title title="Channel page">
152 </a> 152 {{ video.channel.displayName }}
153 <a [routerLink]="[ '/accounts', video.byAccount ]" i18n-title title="Account page"> 153 </a>
154 <span i18n>By {{ video.byAccount }}</span> 154 <a [routerLink]="[ '/accounts', video.byAccount ]" i18n-title title="Account page">
155 </a> 155 <span i18n>By {{ video.byAccount }}</span>
156 </a>
157 </ng-container>
158
159 <ng-container *ngIf="isChannelDisplayNameGeneric()">
160 <a [routerLink]="[ '/accounts', video.byAccount ]" class="single-link" i18n-title title="Account page">
161 <span i18n>{{ video.byAccount }}</span>
162 </a>
163 </ng-container>
156 </div> 164 </div>
157 </div> 165 </div>
158 166
diff --git a/client/src/app/+videos/+video-watch/video-watch.component.scss b/client/src/app/+videos/+video-watch/video-watch.component.scss
index c7f91f4a0..00a4b0dee 100644
--- a/client/src/app/+videos/+video-watch/video-watch.component.scss
+++ b/client/src/app/+videos/+video-watch/video-watch.component.scss
@@ -192,6 +192,10 @@ $video-info-margin-left: 44px;
192 font-weight: 500; 192 font-weight: 500;
193 font-size: 90%; 193 font-size: 90%;
194 } 194 }
195
196 a.single-link {
197 margin-top: 7px;
198 }
195 } 199 }
196 } 200 }
197 201
diff --git a/client/src/app/+videos/+video-watch/video-watch.component.ts b/client/src/app/+videos/+video-watch/video-watch.component.ts
index 933e6c51f..4341514cd 100644
--- a/client/src/app/+videos/+video-watch/video-watch.component.ts
+++ b/client/src/app/+videos/+video-watch/video-watch.component.ts
@@ -307,6 +307,15 @@ export class VideoWatchComponent implements OnInit, OnDestroy {
307 ) 307 )
308 } 308 }
309 309
310 isChannelDisplayNameGeneric () {
311 const genericChannelDisplayName = [
312 `Main ${this.video.channel.ownerAccount.name} channel`,
313 `Default ${this.video.channel.ownerAccount.name} channel`
314 ]
315
316 return genericChannelDisplayName.includes(this.video.channel.displayName)
317 }
318
310 private loadVideo (videoId: string) { 319 private loadVideo (videoId: string) {
311 // Video did not change 320 // Video did not change
312 if (this.video && this.video.uuid === videoId) return 321 if (this.video && this.video.uuid === videoId) return