From 1053480b2561a35613551ea543d4d77bf8937b8c Mon Sep 17 00:00:00 2001
From: Rigel Kent <sendmemail@rigelk.eu>
Date: Fri, 27 Dec 2019 17:03:48 +0100
Subject: [PATCH] Slightly more personal support modal
---
.../videos/+video-watch/modal/video-support.component.html | 4 ++--
.../app/videos/+video-watch/modal/video-support.component.ts | 2 ++
client/src/app/videos/+video-watch/video-watch.component.html | 2 +-
3 files changed, 5 insertions(+), 3 deletions(-)
diff --git a/client/src/app/videos/+video-watch/modal/video-support.component.html b/client/src/app/videos/+video-watch/modal/video-support.component.html
index 2a05224a85..90ca8897f5 100644
--- a/client/src/app/videos/+video-watch/modal/video-support.component.html
+++ b/client/src/app/videos/+video-watch/modal/video-support.component.html
@@ -1,12 +1,12 @@
<ng-template #modal let-hide="close">
<div class="modal-header">
- <h4 i18n class="modal-title">Support</h4>
+ <h4 i18n class="modal-title">Support {{ user?.account?.displayName }}</h4>
<my-global-icon iconName="cross" aria-label="Close" role="button" (click)="hide()"></my-global-icon>
</div>
<div class="modal-body" [innerHTML]="videoHTMLSupport"></div>
<div class="modal-footer inputs">
- <span i18n class="action-button action-button-cancel" (click)="hide()">Cancel</span>
+ <span i18n class="action-button action-button-cancel" (click)="hide()">Maybe later</span>
</div>
</ng-template>
diff --git a/client/src/app/videos/+video-watch/modal/video-support.component.ts b/client/src/app/videos/+video-watch/modal/video-support.component.ts
index b56a51fbf7..027b54efb0 100644
--- a/client/src/app/videos/+video-watch/modal/video-support.component.ts
+++ b/client/src/app/videos/+video-watch/modal/video-support.component.ts
@@ -2,6 +2,7 @@ import { Component, Input, ViewChild } from '@angular/core'
import { VideoDetails } from '../../../shared/video/video-details.model'
import { NgbModal } from '@ng-bootstrap/ng-bootstrap'
import { MarkdownService } from '@app/shared/renderer'
+import { User } from '@app/shared'
@Component({
selector: 'my-video-support',
@@ -10,6 +11,7 @@ import { MarkdownService } from '@app/shared/renderer'
})
export class VideoSupportComponent {
@Input() video: VideoDetails = null
+ @Input() user: User = null
@ViewChild('modal', { static: true }) modal: NgbModal
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 74ac64a63d..ea258711ef 100644
--- a/client/src/app/videos/+video-watch/video-watch.component.html
+++ b/client/src/app/videos/+video-watch/video-watch.component.html
@@ -260,6 +260,6 @@
</div>
<ng-container *ngIf="video !== null">
- <my-video-support #videoSupportModal [video]="video"></my-video-support>
+ <my-video-support #videoSupportModal [video]="video" [user]="user"></my-video-support>
<my-video-share #videoShareModal [video]="video" [videoCaptions]="videoCaptions" [playlist]="playlist"></my-video-share>
</ng-container>
--
GitLab