diff --git a/Changelog.md b/Changelog.md index 47c7e16463f8345c2777e4c0394ca623b97be0ea..804954d0067cbc2af04c37a71ebec2d7a9e70426 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 4282ad6371eb0a53c5c95bae860ec161b3d86c16..c3a5f62eb713535c0f92692dbf54e9ea4ff6d2bd 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 022ef1bb72366a8f99cc7b9ef8b48edf4c8b3b68..67b5ba6ad18fe5876b323cf9aecf14e30d1376c3 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 2df36adf88d8d25e6ab74e2c74f6c34d99c9a86a..219ad34ba1cc5dcbd768ef1df4853a6973345376 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 b41a7203594a79beb1c8f03cbc03e61e80779c36..37fd1565d14e3d4da24799885e085f4c1589cf8c 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"