aboutsummaryrefslogtreecommitdiffhomepage
path: root/client
diff options
context:
space:
mode:
authorChocobozzz <me@florianbigard.com>2019-07-29 16:41:25 +0200
committerChocobozzz <me@florianbigard.com>2019-07-29 16:41:25 +0200
commit8e8eb2614b4e6be90ea5cf2f7347f1eb40f28932 (patch)
tree1c65b3a1385a9d2e732a66af380578b7f40caf58 /client
parent34dd7cb4ca4807e61a8c1d584b047c2cb383fe5a (diff)
downloadPeerTube-8e8eb2614b4e6be90ea5cf2f7347f1eb40f28932.tar.gz
PeerTube-8e8eb2614b4e6be90ea5cf2f7347f1eb40f28932.tar.zst
PeerTube-8e8eb2614b4e6be90ea5cf2f7347f1eb40f28932.zip
Fix help transcoding placement
Diffstat (limited to 'client')
-rw-r--r--client/src/app/shared/forms/peertube-checkbox.component.html2
-rw-r--r--client/src/app/shared/forms/peertube-checkbox.component.ts1
-rw-r--r--client/src/app/videos/+video-edit/shared/video-edit.component.html2
3 files changed, 4 insertions, 1 deletions
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 @@
6 <span *ngIf="labelHtml" [innerHTML]="labelHtml"></span> 6 <span *ngIf="labelHtml" [innerHTML]="labelHtml"></span>
7 </label> 7 </label>
8 8
9 <my-help *ngIf="helpHtml" tooltipPlacement="top" helpType="custom" i18n-customHtml [customHtml]="helpHtml"></my-help> 9 <my-help *ngIf="helpHtml" [tooltipPlacement]="helpPlacement" helpType="custom" i18n-customHtml [customHtml]="helpHtml"></my-help>
10</div> 10</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 {
19 @Input() labelText: string 19 @Input() labelText: string
20 @Input() labelHtml: string 20 @Input() labelHtml: string
21 @Input() helpHtml: string 21 @Input() helpHtml: string
22 @Input() helpPlacement = 'top'
22 @Input() disabled = false 23 @Input() disabled = false
23 24
24 // FIXME: https://github.com/angular/angular/issues/10816#issuecomment-307567836 25 // 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 @@
118 inputName="nsfw" formControlName="nsfw" 118 inputName="nsfw" formControlName="nsfw"
119 i18n-labelText labelText="This video contains mature or explicit content" 119 i18n-labelText labelText="This video contains mature or explicit content"
120 i18n-helpHtml helpHtml="Some instances do not list videos containing mature or explicit content by default." 120 i18n-helpHtml helpHtml="Some instances do not list videos containing mature or explicit content by default."
121 helpPlacement="bottom-right"
121 ></my-peertube-checkbox> 122 ></my-peertube-checkbox>
122 123
123 <my-peertube-checkbox 124 <my-peertube-checkbox
@@ -125,6 +126,7 @@
125 inputName="waitTranscoding" formControlName="waitTranscoding" 126 inputName="waitTranscoding" formControlName="waitTranscoding"
126 i18n-labelText labelText="Wait transcoding before publishing the video" 127 i18n-labelText labelText="Wait transcoding before publishing the video"
127 i18n-helpHtml helpHtml="If you decide not to wait for transcoding before publishing the video, it could be unplayable until transcoding ends." 128 i18n-helpHtml helpHtml="If you decide not to wait for transcoding before publishing the video, it could be unplayable until transcoding ends."
129 helpPlacement="bottom-right"
128 ></my-peertube-checkbox> 130 ></my-peertube-checkbox>
129 131
130 </div> 132 </div>