From 185407d3a2ad19f67b1d3b5b3f8b1626a87e31da Mon Sep 17 00:00:00 2001
From: Emelia Smith <ThisIsMissEm@users.noreply.github.com>
Date: Thu, 19 Apr 2018 15:39:54 +0200
Subject: [PATCH] Reports: Merge contents and comment columns (#7189)
---
app/views/admin/reports/_report.html.haml | 22 +++++++++++-----------
app/views/admin/reports/index.html.haml | 1 -
2 files changed, 11 insertions(+), 12 deletions(-)
diff --git a/app/views/admin/reports/_report.html.haml b/app/views/admin/reports/_report.html.haml
index d266f4840b..84db00ad50 100644
--- a/app/views/admin/reports/_report.html.haml
+++ b/app/views/admin/reports/_report.html.haml
@@ -5,18 +5,18 @@
= link_to report.target_account.acct, admin_account_path(report.target_account.id)
%td.reporter
= link_to report.account.acct, admin_account_path(report.account.id)
- %td.comment
- %span{ title: report.comment }
+ %td
+ %div{ title: report.comment }
= truncate(report.comment, length: 30, separator: ' ')
- %td.stats
- - unless report.statuses.empty?
- %span{ title: t('admin.accounts.statuses') }
- = fa_icon('comment')
- = report.statuses.count
- - unless report.media_attachments.empty?
- %span{ title: t('admin.accounts.media_attachments') }
- = fa_icon('camera')
- = report.media_attachments.count
+ %div
+ - unless report.statuses.empty?
+ %span{ title: t('admin.accounts.statuses') }
+ = fa_icon('comment')
+ = report.statuses.count
+ - unless report.media_attachments.empty?
+ %span{ title: t('admin.accounts.media_attachments') }
+ = fa_icon('camera')
+ = report.media_attachments.count
%td
- if report.assigned_account.nil?
\-
diff --git a/app/views/admin/reports/index.html.haml b/app/views/admin/reports/index.html.haml
index 3b127c4fc0..c3baaf6be7 100644
--- a/app/views/admin/reports/index.html.haml
+++ b/app/views/admin/reports/index.html.haml
@@ -18,7 +18,6 @@
%th= t('admin.reports.id')
%th= t('admin.reports.target')
%th= t('admin.reports.reported_by')
- %th= t('admin.reports.comment.label')
%th= t('admin.reports.report_contents')
%th= t('admin.reports.assigned')
%th