Add help concerning NSFW videos in upload

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 9dcc66a7535ec802e7bc65d28b32f7376a89f56d..0e8598e9e8de1107fc8a76e70a50f0e5bf362b83 100644 (file)
--- 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 2019a49885b48d15636953883101ae342dbea2cc..3da5701a0ee686c88e52bec5bbe25a9cdb0e595e 100644 (file)
--- 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 9defd9aa4cc54920d397a2521e1cf96347f0a53e..0373a63de72f4cfdbc1f18b90a482e637bb50f99 100644 (file)
--- 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 6d0a1600a6d98e2d03d905cbddd2d2a0b95202a9..9cd3454a08a3de65a2fdc0d39d922bed8156792c 100644 (file)
--- 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 1317f74264f2992bce3b2adcba3c7e83ddb76aff..cf64ff589cac093ee0fa18605f95e7fd22544749 100644 (file)
--- 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 aa063b97a91711529517df8b76a37fcdc04abdbe..2454ec2f9d11c029f1ed8efd2f199a9b3986cc9f 100644 (file)
--- 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'