From 0f60b9fb949f51abde379e34e66ffabfca1a38df Mon Sep 17 00:00:00 2001
From: SansPseudoFix <spf@sanspseudofix.fr>
Date: Thu, 3 Nov 2016 14:59:12 +0100
Subject: [PATCH] Switch reason and message
unify
rename and show full post on reports
Fix XSS issue
Unification
Style
Fix pronto
closes #7180
---
Changelog.md | 1 +
app/assets/stylesheets/report.scss | 6 +++++-
app/helpers/report_helper.rb | 2 +-
app/views/report/index.html.haml | 11 +++++++----
config/locales/diaspora/en.yml | 6 +++---
5 files changed, 17 insertions(+), 9 deletions(-)
diff --git a/Changelog.md b/Changelog.md
index 47c7e16463..804954d006 100644
--- a/Changelog.md
+++ b/Changelog.md
@@ -5,6 +5,7 @@
* Replace fileuploader-custom with FineUploader [#7083](https://github.com/diaspora/diaspora/pull/7083)
* Always show mobile reaction counts [#7207](https://github.com/diaspora/diaspora/pull/7207)
* Refactor mobile alerts for error responses [#7227](https://github.com/diaspora/diaspora/pull/7227)
+* Switch content and given reason in the reports overview [#7180](https://github.com/diaspora/diaspora/pull/7180)
## Bug fixes
* Fix background color of year on notifications page with dark theme [#7263](https://github.com/diaspora/diaspora/pull/7263)
diff --git a/app/assets/stylesheets/report.scss b/app/assets/stylesheets/report.scss
index 4282ad6371..c3a5f62eb7 100644
--- a/app/assets/stylesheets/report.scss
+++ b/app/assets/stylesheets/report.scss
@@ -1,5 +1,9 @@
#reports {
- .reason {
+ .reason-label {
+ font-weight: bold;
+ }
+
+ .content {
padding-bottom: 20px;
}
form input {
diff --git a/app/helpers/report_helper.rb b/app/helpers/report_helper.rb
index 022ef1bb72..67b5ba6ad1 100644
--- a/app/helpers/report_helper.rb
+++ b/app/helpers/report_helper.rb
@@ -6,7 +6,7 @@ module ReportHelper
def report_content(report)
case (item = report.item)
when Post
- raw t("report.post_label", title: link_to(post_page_title(item), post_path(item.id)))
+ raw t("report.post_label", content: link_to(post_message(item), post_path(item.id)))
when Comment
raw t("report.comment_label", data: link_to(
h(comment_message(item)),
diff --git a/app/views/report/index.html.haml b/app/views/report/index.html.haml
index 2df36adf88..219ad34ba1 100644
--- a/app/views/report/index.html.haml
+++ b/app/views/report/index.html.haml
@@ -17,11 +17,14 @@
.panel-heading
.reporter.pull-right
= raw t("report.reported_label", person: link_to(username, user_profile_path(username)))
- .title
- = report_content(report)
- .panel-body
.reason
- = t("report.reason_label", text: report.text)
+ %span.reason-label
+ = t("report.reason_label")
+ %span
+ = report.text
+ .panel-body
+ .content
+ = report_content(report)
= button_to t("report.reported_user_details"),
user_search_path(admins_controller_user_search: {guid: report.reported_author.guid}),
diff --git a/config/locales/diaspora/en.yml b/config/locales/diaspora/en.yml
index b41a720359..37fd1565d1 100644
--- a/config/locales/diaspora/en.yml
+++ b/config/locales/diaspora/en.yml
@@ -935,10 +935,10 @@ en:
report:
title: "Reports overview"
- post_label: "<b>Post</b>: %{title}"
- comment_label: "<b>Comment</b>:<br>%{data}"
+ post_label: "<b>Post</b>: %{content}"
+ comment_label: "<b>Comment</b>: %{data}"
reported_label: "<b>Reported by</b> %{person}"
- reason_label: "Reason: %{text}"
+ reason_label: "Reason:"
review_link: "Mark as reviewed"
delete_link: "Delete item"
reported_user_details: "Details on reported user"
--
GitLab