From 83b5fe9c5536ed11ef90bf821d38700607f39f82 Mon Sep 17 00:00:00 2001 From: Felix Ableitner Date: Tue, 28 Aug 2018 02:06:00 -0500 Subject: [PATCH] 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 --- .../moderation/moderation.component.scss | 20 ++++++++++++++++ .../video-abuse-list.component.html | 23 +++++++++++-------- .../video-abuse-list.component.scss | 6 ----- .../video-abuse-list.component.ts | 2 +- .../video-blacklist-list.component.html | 8 +++---- .../video-blacklist-list.component.scss | 6 ----- .../video-blacklist-list.component.ts | 2 +- 7 files changed, 39 insertions(+), 28 deletions(-) delete mode 100644 client/src/app/+admin/moderation/video-abuse-list/video-abuse-list.component.scss delete mode 100644 client/src/app/+admin/moderation/video-blacklist-list/video-blacklist-list.component.scss 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 @@ +@import 'variables'; +@import 'mixins'; + .form-sub-title { flex-grow: 0; margin-right: 30px; } + +.moderation-expanded-label { + font-weight: $font-semibold; + min-width: 200px; + display: inline-block; +} + +.moderation-expanded-text { + display: inline-block; +} + +.moderation-expanded { + word-wrap: break-word; + overflow: visible !important; + text-overflow: unset !important; + white-space: unset !important; +} 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 @@ State - Reason Reporter Created Video @@ -17,7 +16,7 @@ - + @@ -27,8 +26,6 @@ - {{ videoAbuse.reason }} - {{ createByString(videoAbuse.reporterAccount) }} @@ -50,12 +47,18 @@ - - - Moderation comment: - {{ videoAbuse.moderationComment }} - - + + +
+ Reason: + {{ videoAbuse.reason }} +
+
+ Moderation comment: + {{ videoAbuse.moderationComment }} +
+ +
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 @@ -@import 'variables'; -@import 'mixins'; - -.moderation-comment-label { - font-weight: $font-semibold; -} \ 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' @Component({ selector: 'my-video-abuse-list', templateUrl: './video-abuse-list.component.html', - styleUrls: [ './video-abuse-list.component.scss'] + styleUrls: [ '../moderation.component.scss'] }) export class VideoAbuseListComponent extends RestTable implements OnInit { @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 @@ - - - Blacklist reason: - {{ videoBlacklist.reason }} + + + Blacklist reason: + {{ videoBlacklist.reason }} 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 @@ -@import 'variables'; -@import 'mixins'; - -.blacklist-reason-label { - font-weight: $font-semibold; -} \ 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' @Component({ selector: 'my-video-blacklist-list', templateUrl: './video-blacklist-list.component.html', - styleUrls: [ './video-blacklist-list.component.scss' ] + styleUrls: [ '../moderation.component.scss' ] }) export class VideoBlacklistListComponent extends RestTable implements OnInit { blacklist: VideoBlacklist[] = []