From 41f657c570472d0f96aece3234497f83b760dfa0 Mon Sep 17 00:00:00 2001
From: Chocobozzz <me@florianbigard.com>
Date: Thu, 19 Apr 2018 11:47:02 +0200
Subject: [PATCH] Add help concerning NSFW videos in upload

---
 .../account-details/account-details.component.html            | 3 ---
 client/src/app/shared/misc/help.component.html                | 3 ++-
 client/src/app/shared/misc/help.component.ts                  | 1 +
 .../app/videos/+video-edit/shared/video-edit.component.html   | 1 +
 .../app/videos/+video-edit/shared/video-edit.component.scss   | 4 ++++
 server/tests/api/index-fast.ts                                | 1 +
 6 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/client/src/app/account/account-settings/account-details/account-details.component.html b/client/src/app/account/account-settings/account-details/account-details.component.html
index 9dcc66a75..0e8598e9e 100644
--- a/client/src/app/account/account-settings/account-details/account-details.component.html
+++ b/client/src/app/account/account-settings/account-details/account-details.component.html
@@ -10,9 +10,6 @@
         <option value="display">Display</option>
       </select>
     </div>
-    <div *ngIf="formErrors.nsfwPolicy" class="form-error">
-      {{ formErrors.nsfwPolicy }}
-    </div>
   </div>
 
   <div class="form-group">
diff --git a/client/src/app/shared/misc/help.component.html b/client/src/app/shared/misc/help.component.html
index 2019a4988..3da5701a0 100644
--- a/client/src/app/shared/misc/help.component.html
+++ b/client/src/app/shared/misc/help.component.html
@@ -14,7 +14,8 @@
 
 <span
   class="help-tooltip-button"
+  title="Get help"
   [popover]="tooltipTemplate"
-  placement="right"
+  [placement]="tooltipPlacement"
   [outsideClick]="true"
 ></span>
diff --git a/client/src/app/shared/misc/help.component.ts b/client/src/app/shared/misc/help.component.ts
index 9defd9aa4..0373a63de 100644
--- a/client/src/app/shared/misc/help.component.ts
+++ b/client/src/app/shared/misc/help.component.ts
@@ -12,6 +12,7 @@ export class HelpComponent implements OnInit, OnChanges {
   @Input() postHtml = ''
   @Input() customHtml = ''
   @Input() helpType: 'custom' | 'markdownText' | 'markdownEnhanced' = 'custom'
+  @Input() tooltipPlacement = 'right'
 
   mainHtml = ''
 
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 6d0a1600a..9cd3454a0 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
@@ -100,6 +100,7 @@
           <input type="checkbox" id="nsfw" formControlName="nsfw" />
           <label for="nsfw"></label>
           <label for="nsfw">This video contains mature or explicit content</label>
+          <my-help tooltipPlacement="top" helpType="custom" customHtml="Some instances do not list NSFW videos by default."></my-help>
         </div>
 
         <div class="form-group form-group-checkbox">
diff --git a/client/src/app/videos/+video-edit/shared/video-edit.component.scss b/client/src/app/videos/+video-edit/shared/video-edit.component.scss
index 1317f7426..cf64ff589 100644
--- a/client/src/app/videos/+video-edit/shared/video-edit.component.scss
+++ b/client/src/app/videos/+video-edit/shared/video-edit.component.scss
@@ -9,6 +9,10 @@
   @include peertube-select-disabled-container(auto);
 }
 
+.form-group-checkbox {
+  my-help { margin-left: 5px }
+}
+
 .video-edit {
   height: 100%;
 
diff --git a/server/tests/api/index-fast.ts b/server/tests/api/index-fast.ts
index aa063b97a..2454ec2f9 100644
--- a/server/tests/api/index-fast.ts
+++ b/server/tests/api/index-fast.ts
@@ -7,6 +7,7 @@ import './videos/video-abuse'
 import './videos/video-blacklist'
 import './videos/video-blacklist-management'
 import './videos/video-description'
+import './videos/video-nsfw'
 import './videos/video-privacy'
 import './videos/services'
 import './server/email'
-- 
2.25.1