aboutsummaryrefslogtreecommitdiffhomepage
path: root/client/src/app/+admin
diff options
context:
space:
mode:
authorFelix Ableitner <me@nutomic.com>2018-08-28 02:06:00 -0500
committerChocobozzz <me@florianbigard.com>2018-08-28 09:06:00 +0200
commit83b5fe9c5536ed11ef90bf821d38700607f39f82 (patch)
tree5237a56aaf279e9ce21f7769903e565e39485f2d /client/src/app/+admin
parentbee0abffff73804d816b90c7fd599e0a51c09d61 (diff)
downloadPeerTube-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')
-rw-r--r--client/src/app/+admin/moderation/moderation.component.scss20
-rw-r--r--client/src/app/+admin/moderation/video-abuse-list/video-abuse-list.component.html23
-rw-r--r--client/src/app/+admin/moderation/video-abuse-list/video-abuse-list.component.scss6
-rw-r--r--client/src/app/+admin/moderation/video-abuse-list/video-abuse-list.component.ts2
-rw-r--r--client/src/app/+admin/moderation/video-blacklist-list/video-blacklist-list.component.html8
-rw-r--r--client/src/app/+admin/moderation/video-blacklist-list/video-blacklist-list.component.scss6
-rw-r--r--client/src/app/+admin/moderation/video-blacklist-list/video-blacklist-list.component.ts2
7 files changed, 39 insertions, 28 deletions
diff --git a/client/src/app/+admin/moderation/moderation.component.scss b/client/src/app/+admin/moderation/moderation.component.scss
index 766d7853b..5bb2c50a7 100644
--- a/client/src/app/+admin/moderation/moderation.component.scss
+++ b/client/src/app/+admin/moderation/moderation.component.scss
@@ -1,4 +1,24 @@
1@import 'variables';
2@import 'mixins';
3
1.form-sub-title { 4.form-sub-title {
2 flex-grow: 0; 5 flex-grow: 0;
3 margin-right: 30px; 6 margin-right: 30px;
4} 7}
8
9.moderation-expanded-label {
10 font-weight: $font-semibold;
11 min-width: 200px;
12 display: inline-block;
13}
14
15.moderation-expanded-text {
16 display: inline-block;
17}
18
19.moderation-expanded {
20 word-wrap: break-word;
21 overflow: visible !important;
22 text-overflow: unset !important;
23 white-space: unset !important;
24}
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
diff --git a/client/src/app/+admin/moderation/video-abuse-list/video-abuse-list.component.scss b/client/src/app/+admin/moderation/video-abuse-list/video-abuse-list.component.scss
deleted file mode 100644
index 2391fef8f..000000000
--- a/client/src/app/+admin/moderation/video-abuse-list/video-abuse-list.component.scss
+++ /dev/null
@@ -1,6 +0,0 @@
1@import 'variables';
2@import 'mixins';
3
4.moderation-comment-label {
5 font-weight: $font-semibold;
6} \ No newline at end of file
diff --git a/client/src/app/+admin/moderation/video-abuse-list/video-abuse-list.component.ts b/client/src/app/+admin/moderation/video-abuse-list/video-abuse-list.component.ts
index b17278b94..681db7434 100644
--- a/client/src/app/+admin/moderation/video-abuse-list/video-abuse-list.component.ts
+++ b/client/src/app/+admin/moderation/video-abuse-list/video-abuse-list.component.ts
@@ -13,7 +13,7 @@ import { Video } from '../../../shared/video/video.model'
13@Component({ 13@Component({
14 selector: 'my-video-abuse-list', 14 selector: 'my-video-abuse-list',
15 templateUrl: './video-abuse-list.component.html', 15 templateUrl: './video-abuse-list.component.html',
16 styleUrls: [ './video-abuse-list.component.scss'] 16 styleUrls: [ '../moderation.component.scss']
17}) 17})
18export class VideoAbuseListComponent extends RestTable implements OnInit { 18export class VideoAbuseListComponent extends RestTable implements OnInit {
19 @ViewChild('moderationCommentModal') moderationCommentModal: ModerationCommentModalComponent 19 @ViewChild('moderationCommentModal') moderationCommentModal: ModerationCommentModalComponent
diff --git a/client/src/app/+admin/moderation/video-blacklist-list/video-blacklist-list.component.html b/client/src/app/+admin/moderation/video-blacklist-list/video-blacklist-list.component.html
index dafaeb1e2..0585e0490 100644
--- a/client/src/app/+admin/moderation/video-blacklist-list/video-blacklist-list.component.html
+++ b/client/src/app/+admin/moderation/video-blacklist-list/video-blacklist-list.component.html
@@ -36,10 +36,10 @@
36 </ng-template> 36 </ng-template>
37 37
38 <ng-template pTemplate="rowexpansion" let-videoBlacklist> 38 <ng-template pTemplate="rowexpansion" let-videoBlacklist>
39 <tr class="blacklist-reason"> 39 <tr>
40 <td colspan="7"> 40 <td class="moderation-expanded" colspan="5">
41 <span i18n class="blacklist-reason-label">Blacklist reason:</span> 41 <span i18n class="moderation-expanded-label">Blacklist reason:</span>
42 {{ videoBlacklist.reason }} 42 <span class="moderation-expanded-text">{{ videoBlacklist.reason }}</span>
43 </td> 43 </td>
44 </tr> 44 </tr>
45 </ng-template> 45 </ng-template>
diff --git a/client/src/app/+admin/moderation/video-blacklist-list/video-blacklist-list.component.scss b/client/src/app/+admin/moderation/video-blacklist-list/video-blacklist-list.component.scss
deleted file mode 100644
index 063f6324e..000000000
--- a/client/src/app/+admin/moderation/video-blacklist-list/video-blacklist-list.component.scss
+++ /dev/null
@@ -1,6 +0,0 @@
1@import 'variables';
2@import 'mixins';
3
4.blacklist-reason-label {
5 font-weight: $font-semibold;
6} \ No newline at end of file
diff --git a/client/src/app/+admin/moderation/video-blacklist-list/video-blacklist-list.component.ts b/client/src/app/+admin/moderation/video-blacklist-list/video-blacklist-list.component.ts
index 9890d1f90..bb051d00f 100644
--- a/client/src/app/+admin/moderation/video-blacklist-list/video-blacklist-list.component.ts
+++ b/client/src/app/+admin/moderation/video-blacklist-list/video-blacklist-list.component.ts
@@ -11,7 +11,7 @@ import { Video } from '../../../shared/video/video.model'
11@Component({ 11@Component({
12 selector: 'my-video-blacklist-list', 12 selector: 'my-video-blacklist-list',
13 templateUrl: './video-blacklist-list.component.html', 13 templateUrl: './video-blacklist-list.component.html',
14 styleUrls: [ './video-blacklist-list.component.scss' ] 14 styleUrls: [ '../moderation.component.scss' ]
15}) 15})
16export class VideoBlacklistListComponent extends RestTable implements OnInit { 16export class VideoBlacklistListComponent extends RestTable implements OnInit {
17 blacklist: VideoBlacklist[] = [] 17 blacklist: VideoBlacklist[] = []