ActivityPub-federated video streaming platform using P2P directly in your web browser
Better explanation of NSFW flags
Chocobozzzf739c4172229
diff --git a/client/src/app/+videos-publish-manage/shared-manage/moderation/video-moderation.component.html b/client/src/app/+videos-publish-manage/shared-manage/moderation/video-moderation.component.htmlindex 864f69adcd..215cae4e64 100644--- a/client/src/app/+videos-publish-manage/shared-manage/moderation/video-moderation.component.html+++ b/client/src/app/+videos-publish-manage/shared-manage/moderation/video-moderation.component.html@@ -26,11 +26,16 @@<ng-container i18n>Your video contains sensitive content</ng-container></ng-template>- <ng-container ngProjectAs="description">- <ng-container i18n>Some instances hide videos containing mature or explicit content by default.</ng-container>- </ng-container>-<ng-container ngProjectAs="extra">+ <div class="form-group">+ <label i18n for="nsfwSummary">Describe what makes your content sensitive</label>+ <input type="text" id="nsfwSummary" class="form-control" formControlName="nsfwSummary" [ngClass]="{ 'input-error': formErrors.nsfwSummary }" />++ <div *ngIf="formErrors.nsfwSummary" class="form-error" role="alert">{{ formErrors.nsfwSummary }}</div>+ </div>++ <div class="label" i18n>Help viewers to identify your sensitive content</div>+<my-peertube-checkbox inputName="nsfwFlagViolent" formControlName="nsfwFlagViolent"><ng-template ptTemplate="label"><ng-container i18n>Some images may be violent</ng-container>@@ -49,12 +54,7 @@</ng-template></my-peertube-checkbox>- <div class="form-group">- <label i18n for="nsfwSummary">Describe what makes your content sensitive</label>- <input type="text" id="nsfwSummary" class="form-control" formControlName="nsfwSummary" [ngClass]="{ 'input-error': formErrors.nsfwSummary }" />- <div *ngIf="formErrors.nsfwSummary" class="form-error" role="alert">{{ formErrors.nsfwSummary }}</div>- </div></ng-container></my-peertube-checkbox>diff --git a/client/src/app/shared/shared-user-settings/user-video-settings.component.html b/client/src/app/shared/shared-user-settings/user-video-settings.component.htmlindex 9ea1a5abe9..21ee371617 100644--- a/client/src/app/shared/shared-user-settings/user-video-settings.component.html+++ b/client/src/app/shared/shared-user-settings/user-video-settings.component.html@@ -15,6 +15,12 @@</div>@if (isNsfwFlagsEnabled()) {+ <div class="label" i18n>Redefine NSFW policy for specific content</div>++ <div class="form-group-description" i18n>+ ⚠️ These criteria are chosen by the video's author and are subjective, so some videos may not be correctly categorized from your point of view.+ </div>+<div class="form-group mb-3"><my-select-radio[items]="nsfwFlagItems"@@ -22,7 +28,7 @@isGroup="true"labelSecondary="true"i18n-label- label="Redefine policy for violent content"+ label="Violent content"formControlName="nsfwFlagViolent"></my-select-radio></div>@@ -34,7 +40,7 @@isGroup="true"labelSecondary="true"i18n-label- label="Redefine policy for shocking or disturbing content"+ label="Shocking or disturbing content"formControlName="nsfwFlagShocking"></my-select-radio></div>@@ -46,7 +52,7 @@isGroup="true"labelSecondary="true"i18n-label- label="Redefine policy for sexually explicit material"+ label="Sexually explicit material"formControlName="nsfwFlagSex"></my-select-radio></div>diff --git a/client/src/sass/class-helpers/_forms.scss b/client/src/sass/class-helpers/_forms.scssindex ead7109a95..e72f005104 100644--- a/client/src/sass/class-helpers/_forms.scss+++ b/client/src/sass/class-helpers/_forms.scss@@ -1,6 +1,6 @@-@use '_variables' as *;-@use '_mixins' as *;-@use '_form-mixins' as *;+@use "_variables" as *;+@use "_mixins" as *;+@use "_form-mixins" as *;.peertube-radio-container {@include peertube-radio-container;@@ -15,11 +15,10 @@}.input-error:not(:focus) {-&,- +.nav-preview,+ + .nav-preview,// Markdown textarea- +*+.tab-content {+ + * + .tab-content {border-color: pvar(--red) !important;}}@@ -42,11 +41,10 @@// Disable red error on input focus.input-error:focus,.input-group:focus-within {-- +.form-error,- +*+.form-error,+ + .form-error,+ + * + .form-error,// Markdown textarea- +*+*+.form-error {+ + * + * + .form-error {color: pvar(--fg);}}@@ -84,6 +82,7 @@ label,}label + .form-group-description,+.label + .form-group-description,.label-container + .form-group-description {margin-bottom: 10px;margin-top: -0.5rem;