From: Chocobozzz <me@florianbigard.com>
Date: Mon, 29 Jul 2019 14:41:25 +0000 (+0200)
Subject: Fix help transcoding placement
X-Git-Tag: v1.4.0-rc.1~47
X-Git-Url: https://git.immae.eu/?a=commitdiff_plain;h=8e8eb2614b4e6be90ea5cf2f7347f1eb40f28932;p=github%2FChocobozzz%2FPeerTube.git

Fix help transcoding placement
---

diff --git a/client/src/app/shared/forms/peertube-checkbox.component.html b/client/src/app/shared/forms/peertube-checkbox.component.html
index 7b8bcf601..571a1a673 100644
--- a/client/src/app/shared/forms/peertube-checkbox.component.html
+++ b/client/src/app/shared/forms/peertube-checkbox.component.html
@@ -6,5 +6,5 @@
     <span *ngIf="labelHtml" [innerHTML]="labelHtml"></span>
   </label>
 
-  <my-help *ngIf="helpHtml" tooltipPlacement="top" helpType="custom" i18n-customHtml [customHtml]="helpHtml"></my-help>
+  <my-help *ngIf="helpHtml" [tooltipPlacement]="helpPlacement" helpType="custom" i18n-customHtml [customHtml]="helpHtml"></my-help>
 </div>
diff --git a/client/src/app/shared/forms/peertube-checkbox.component.ts b/client/src/app/shared/forms/peertube-checkbox.component.ts
index 9578f5618..a4b72aa37 100644
--- a/client/src/app/shared/forms/peertube-checkbox.component.ts
+++ b/client/src/app/shared/forms/peertube-checkbox.component.ts
@@ -19,6 +19,7 @@ export class PeertubeCheckboxComponent implements ControlValueAccessor {
   @Input() labelText: string
   @Input() labelHtml: string
   @Input() helpHtml: string
+  @Input() helpPlacement = 'top'
   @Input() disabled = false
 
   // FIXME: https://github.com/angular/angular/issues/10816#issuecomment-307567836
diff --git a/client/src/app/videos/+video-edit/shared/video-edit.component.html b/client/src/app/videos/+video-edit/shared/video-edit.component.html
index 28572d611..217cadc66 100644
--- a/client/src/app/videos/+video-edit/shared/video-edit.component.html
+++ b/client/src/app/videos/+video-edit/shared/video-edit.component.html
@@ -118,6 +118,7 @@
               inputName="nsfw" formControlName="nsfw"
               i18n-labelText labelText="This video contains mature or explicit content"
               i18n-helpHtml helpHtml="Some instances do not list videos containing mature or explicit content by default."
+              helpPlacement="bottom-right"
             ></my-peertube-checkbox>
 
             <my-peertube-checkbox
@@ -125,6 +126,7 @@
               inputName="waitTranscoding" formControlName="waitTranscoding"
               i18n-labelText labelText="Wait transcoding before publishing the video"
               i18n-helpHtml helpHtml="If you decide not to wait for transcoding before publishing the video, it could be unplayable until transcoding ends."
+              helpPlacement="bottom-right"
             ></my-peertube-checkbox>
 
           </div>