-
-
Notifications
You must be signed in to change notification settings - Fork 1.5k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Predefined report reasons reporter UI
- Loading branch information
Showing
31 changed files
with
499 additions
and
62 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1 +1,2 @@ | ||
| export * from './video-abuse.service' | ||
| export * from './video-abuse-predefined-reasons.model' |
14 changes: 14 additions & 0 deletions
14
client/src/app/shared/video-abuse/video-abuse-predefined-reasons.model.ts
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,14 @@ | ||
| export enum PredefinedReasons { | ||
| violentOrRepulsive = 'violentOrRepulsive', | ||
| hatefulOrAbusive = 'hatefulOrAbusive', | ||
| spamOrMisleading = 'spamOrMisleading', | ||
| privacy = 'privacy', | ||
| rights = 'rights', | ||
| serverRules = 'serverRules', | ||
| thumbnails = 'thumbnails', | ||
| captions = 'captions' | ||
| } | ||
|
|
||
| export type VideoAbusePredefinedReasons = { | ||
| [key in PredefinedReasons]?: boolean | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
105 changes: 82 additions & 23 deletions
105
client/src/app/shared/video/modals/video-report.component.html
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,38 +1,97 @@ | ||
| <ng-template #modal> | ||
| <div class="modal-header"> | ||
| <h4 i18n class="modal-title">Report video</h4> | ||
| <h4 i18n class="modal-title">Report video "{{ video.name }}"</h4> | ||
| <my-global-icon iconName="cross" aria-label="Close" role="button" (click)="hide()"></my-global-icon> | ||
| </div> | ||
|
|
||
| <div class="modal-body"> | ||
| <form novalidate [formGroup]="form" (ngSubmit)="report()"> | ||
|
|
||
| <div i18n class="information"> | ||
| Your report will be sent to moderators of {{ currentHost }}<ng-container *ngIf="isRemoteVideo()"> and will be forwarded to the video origin ({{ originHost }}) too</ng-container>. | ||
| </div> | ||
| <div class="row"> | ||
| <div class="col-5 form-group"> | ||
|
|
||
| <label i18n for="reportPredefinedReasons">What is the issue?</label> | ||
|
|
||
| <div class="ml-2 mt-2 d-flex flex-column"> | ||
| <ng-container formGroupName="predefinedReasons"> | ||
| <div class="form-group" *ngFor="let reason of predefinedReasons"> | ||
| <my-peertube-checkbox formControlName="{{reason.id}}" labelText="{{reason.label}}"> | ||
| <ng-template *ngIf="reason.help" ptTemplate="help"> | ||
| <div [innerHTML]="reason.help"></div> | ||
| </ng-template> | ||
| <ng-container *ngIf="reason.description" ngProjectAs="description"> | ||
| <div [innerHTML]="reason.description"></div> | ||
| </ng-container> | ||
| </my-peertube-checkbox> | ||
| </div> | ||
| </ng-container> | ||
| </div> | ||
|
|
||
| <form novalidate [formGroup]="form" (ngSubmit)="report()"> | ||
| <div class="form-group"> | ||
| <textarea | ||
| i18n-placeholder placeholder="Reason..." formControlName="reason" | ||
| [ngClass]="{ 'input-error': formErrors['reason'] }" class="form-control" | ||
| ></textarea> | ||
| <div *ngIf="formErrors.reason" class="form-error"> | ||
| {{ formErrors.reason }} | ||
| </div> | ||
| </div> | ||
|
|
||
| <div class="form-group inputs"> | ||
| <input | ||
| type="button" role="button" i18n-value value="Cancel" class="action-button action-button-cancel" | ||
| (click)="hide()" (key.enter)="hide()" | ||
| > | ||
| <div class="col-7"> | ||
| <div class="row justify-content-center"> | ||
| <div class="col-12 col-lg-9 mb-2"> | ||
| <div class="screenratio"> | ||
| <div [innerHTML]="embedHtml"></div> | ||
| </div> | ||
| </div> | ||
| </div> | ||
|
|
||
| <div class="mb-1 start-at" formGroupName="timestamp"> | ||
| <my-peertube-checkbox | ||
| formControlName="hasStart" | ||
| i18n-labelText labelText="Start at" | ||
| ></my-peertube-checkbox> | ||
|
|
||
| <my-timestamp-input | ||
| [timestamp]="timestamp.startAt" | ||
| [maxTimestamp]="video.duration" | ||
| formControlName="startAt" | ||
| inputName="startAt" | ||
| > | ||
| </my-timestamp-input> | ||
| </div> | ||
|
|
||
| <div class="mb-3 stop-at" formGroupName="timestamp" *ngIf="timestamp.hasStart"> | ||
| <my-peertube-checkbox | ||
| formControlName="hasEnd" | ||
| i18n-labelText labelText="Stop at" | ||
| ></my-peertube-checkbox> | ||
|
|
||
| <input | ||
| type="submit" i18n-value value="Submit" class="action-button-submit" | ||
| [disabled]="!form.valid" | ||
| > | ||
| <my-timestamp-input | ||
| [timestamp]="timestamp.endAt" | ||
| [maxTimestamp]="video.duration" | ||
| formControlName="endAt" | ||
| inputName="endAt" | ||
| > | ||
| </my-timestamp-input> | ||
| </div> | ||
|
|
||
| <div i18n class="information"> | ||
| Your report will be sent to moderators of {{ currentHost }}<ng-container *ngIf="isRemoteVideo()"> and will be forwarded to the video origin ({{ originHost }}) too</ng-container>. | ||
| </div> | ||
|
|
||
| <div class="form-group"> | ||
| <textarea | ||
| i18n-placeholder placeholder="Please describe the issue..." formControlName="reason" ngbAutofocus | ||
| [ngClass]="{ 'input-error': formErrors['reason'] }" class="form-control" | ||
| ></textarea> | ||
| <div *ngIf="formErrors.reason" class="form-error"> | ||
| {{ formErrors.reason }} | ||
| </div> | ||
| </div> | ||
| </div> | ||
| </form> | ||
| </div> | ||
|
|
||
| <div class="form-group inputs"> | ||
| <input | ||
| type="button" role="button" i18n-value value="Cancel" class="action-button action-button-cancel" | ||
| (click)="hide()" (key.enter)="hide()" | ||
| > | ||
| <input type="submit" i18n-value value="Submit" class="action-button-submit" [disabled]="!form.valid"> | ||
| </div> | ||
|
|
||
| </form> | ||
| </div> | ||
| </ng-template> |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.