aboutsummaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorChocobozzz <me@florianbigard.com>2018-04-19 11:47:02 +0200
committerChocobozzz <me@florianbigard.com>2018-04-19 11:47:02 +0200
commit41f657c570472d0f96aece3234497f83b760dfa0 (patch)
tree01f1eb2555d23901ebc20bf01faf0242ebde6acb
parent0883b3245bf0deb9106c4041e9afbd3521b79280 (diff)
downloadPeerTube-41f657c570472d0f96aece3234497f83b760dfa0.tar.gz
PeerTube-41f657c570472d0f96aece3234497f83b760dfa0.tar.zst
PeerTube-41f657c570472d0f96aece3234497f83b760dfa0.zip
Add help concerning NSFW videos in upload
-rw-r--r--client/src/app/account/account-settings/account-details/account-details.component.html3
-rw-r--r--client/src/app/shared/misc/help.component.html3
-rw-r--r--client/src/app/shared/misc/help.component.ts1
-rw-r--r--client/src/app/videos/+video-edit/shared/video-edit.component.html1
-rw-r--r--client/src/app/videos/+video-edit/shared/video-edit.component.scss4
-rw-r--r--server/tests/api/index-fast.ts1
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 @@
10 <option value="display">Display</option> 10 <option value="display">Display</option>
11 </select> 11 </select>
12 </div> 12 </div>
13 <div *ngIf="formErrors.nsfwPolicy" class="form-error">
14 {{ formErrors.nsfwPolicy }}
15 </div>
16 </div> 13 </div>
17 14
18 <div class="form-group"> 15 <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 @@
14 14
15<span 15<span
16 class="help-tooltip-button" 16 class="help-tooltip-button"
17 title="Get help"
17 [popover]="tooltipTemplate" 18 [popover]="tooltipTemplate"
18 placement="right" 19 [placement]="tooltipPlacement"
19 [outsideClick]="true" 20 [outsideClick]="true"
20></span> 21></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 {
12 @Input() postHtml = '' 12 @Input() postHtml = ''
13 @Input() customHtml = '' 13 @Input() customHtml = ''
14 @Input() helpType: 'custom' | 'markdownText' | 'markdownEnhanced' = 'custom' 14 @Input() helpType: 'custom' | 'markdownText' | 'markdownEnhanced' = 'custom'
15 @Input() tooltipPlacement = 'right'
15 16
16 mainHtml = '' 17 mainHtml = ''
17 18
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 @@
100 <input type="checkbox" id="nsfw" formControlName="nsfw" /> 100 <input type="checkbox" id="nsfw" formControlName="nsfw" />
101 <label for="nsfw"></label> 101 <label for="nsfw"></label>
102 <label for="nsfw">This video contains mature or explicit content</label> 102 <label for="nsfw">This video contains mature or explicit content</label>
103 <my-help tooltipPlacement="top" helpType="custom" customHtml="Some instances do not list NSFW videos by default."></my-help>
103 </div> 104 </div>
104 105
105 <div class="form-group form-group-checkbox"> 106 <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 @@
9 @include peertube-select-disabled-container(auto); 9 @include peertube-select-disabled-container(auto);
10} 10}
11 11
12.form-group-checkbox {
13 my-help { margin-left: 5px }
14}
15
12.video-edit { 16.video-edit {
13 height: 100%; 17 height: 100%;
14 18
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'
7import './videos/video-blacklist' 7import './videos/video-blacklist'
8import './videos/video-blacklist-management' 8import './videos/video-blacklist-management'
9import './videos/video-description' 9import './videos/video-description'
10import './videos/video-nsfw'
10import './videos/video-privacy' 11import './videos/video-privacy'
11import './videos/services' 12import './videos/services'
12import './server/email' 13import './server/email'