diff options
author | Felix Ableitner <me@nutomic.com> | 2018-08-28 02:06:00 -0500 |
---|---|---|
committer | Chocobozzz <me@florianbigard.com> | 2018-08-28 09:06:00 +0200 |
commit | 83b5fe9c5536ed11ef90bf821d38700607f39f82 (patch) | |
tree | 5237a56aaf279e9ce21f7769903e565e39485f2d /client/src/app/+admin/moderation/video-abuse-list/video-abuse-list.component.html | |
parent | bee0abffff73804d816b90c7fd599e0a51c09d61 (diff) | |
download | PeerTube-83b5fe9c5536ed11ef90bf821d38700607f39f82.tar.gz PeerTube-83b5fe9c5536ed11ef90bf821d38700607f39f82.tar.zst PeerTube-83b5fe9c5536ed11ef90bf821d38700607f39f82.zip |
Display report reason in multiple lines (#957)
* Display report reason in multiple lines
* more adjustments:
- move report reason into dropdown
- allow line wrap in dropdown (also in video blacklist)
- fix colspan in blacklist dropdown
- merge css rules into moderation.component.scss
* use min-width for labels
Diffstat (limited to 'client/src/app/+admin/moderation/video-abuse-list/video-abuse-list.component.html')
-rw-r--r-- | client/src/app/+admin/moderation/video-abuse-list/video-abuse-list.component.html | 23 |
1 files changed, 13 insertions, 10 deletions
diff --git a/client/src/app/+admin/moderation/video-abuse-list/video-abuse-list.component.html b/client/src/app/+admin/moderation/video-abuse-list/video-abuse-list.component.html index 722ff7906..0d0f644dc 100644 --- a/client/src/app/+admin/moderation/video-abuse-list/video-abuse-list.component.html +++ b/client/src/app/+admin/moderation/video-abuse-list/video-abuse-list.component.html | |||
@@ -6,7 +6,6 @@ | |||
6 | <tr> | 6 | <tr> |
7 | <th style="width: 40px"></th> | 7 | <th style="width: 40px"></th> |
8 | <th i18n pSortableColumn="state" style="width: 80px;">State <p-sortIcon field="state"></p-sortIcon></th> | 8 | <th i18n pSortableColumn="state" style="width: 80px;">State <p-sortIcon field="state"></p-sortIcon></th> |
9 | <th i18n>Reason</th> | ||
10 | <th i18n>Reporter</th> | 9 | <th i18n>Reporter</th> |
11 | <th i18n pSortableColumn="createdAt">Created <p-sortIcon field="createdAt"></p-sortIcon></th> | 10 | <th i18n pSortableColumn="createdAt">Created <p-sortIcon field="createdAt"></p-sortIcon></th> |
12 | <th i18n>Video</th> | 11 | <th i18n>Video</th> |
@@ -17,7 +16,7 @@ | |||
17 | <ng-template pTemplate="body" let-expanded="expanded" let-videoAbuse> | 16 | <ng-template pTemplate="body" let-expanded="expanded" let-videoAbuse> |
18 | <tr> | 17 | <tr> |
19 | <td> | 18 | <td> |
20 | <span *ngIf="videoAbuse.moderationComment" class="expander" [pRowToggler]="videoAbuse"> | 19 | <span class="expander" [pRowToggler]="videoAbuse"> |
21 | <i [ngClass]="expanded ? 'glyphicon glyphicon-menu-down' : 'glyphicon glyphicon-menu-right'"></i> | 20 | <i [ngClass]="expanded ? 'glyphicon glyphicon-menu-down' : 'glyphicon glyphicon-menu-right'"></i> |
22 | </span> | 21 | </span> |
23 | </td> | 22 | </td> |
@@ -27,8 +26,6 @@ | |||
27 | <span *ngIf="isVideoAbuseRejected(videoAbuse)" [title]="videoAbuse.state.label" class="glyphicon glyphicon-remove"></span> | 26 | <span *ngIf="isVideoAbuseRejected(videoAbuse)" [title]="videoAbuse.state.label" class="glyphicon glyphicon-remove"></span> |
28 | </td> | 27 | </td> |
29 | 28 | ||
30 | <td>{{ videoAbuse.reason }}</td> | ||
31 | |||
32 | <td> | 29 | <td> |
33 | <a [href]="videoAbuse.reporterAccount.url" i18n-title title="Go to the account" target="_blank" rel="noopener noreferrer"> | 30 | <a [href]="videoAbuse.reporterAccount.url" i18n-title title="Go to the account" target="_blank" rel="noopener noreferrer"> |
34 | {{ createByString(videoAbuse.reporterAccount) }} | 31 | {{ createByString(videoAbuse.reporterAccount) }} |
@@ -50,12 +47,18 @@ | |||
50 | </ng-template> | 47 | </ng-template> |
51 | 48 | ||
52 | <ng-template pTemplate="rowexpansion" let-videoAbuse> | 49 | <ng-template pTemplate="rowexpansion" let-videoAbuse> |
53 | <tr class="moderation-comment"> | 50 | <tr> |
54 | <td colspan="7"> | 51 | <td class="moderation-expanded" colspan="6"> |
55 | <span i18n class="moderation-comment-label">Moderation comment:</span> | 52 | <div> |
56 | {{ videoAbuse.moderationComment }} | 53 | <span i18n class="moderation-expanded-label">Reason:</span> |
57 | </td> | 54 | <span class="moderation-expanded-text">{{ videoAbuse.reason }}</span> |
58 | </tr> | 55 | </div> |
56 | <div *ngIf="videoAbuse.moderationComment"> | ||
57 | <span i18n class="moderation-expanded-label">Moderation comment:</span> | ||
58 | <span class="moderation-expanded-text">{{ videoAbuse.moderationComment }}</span> | ||
59 | </div> | ||
60 | </td> | ||
61 | </tr> | ||
59 | </ng-template> | 62 | </ng-template> |
60 | </p-table> | 63 | </p-table> |
61 | 64 | ||