Unverified Commit 0f60b9fb authored by SansPseudoFix's avatar SansPseudoFix Committed by Steffen van Bergerem
Browse files

Switch reason and message 

unify

rename and show full post on reports

Fix XSS issue

Unification

Style

Fix pronto

closes #7180
parent d0e70ccd

Changelog.md

+1 −0
Original line number Diff line number Diff line
@@ -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)

app/assets/stylesheets/report.scss

+5 −1
Original line number Diff line number Diff line 
#reports {

  .reason {

  .reason-label {

    font-weight: bold;

  }



  .content {

    padding-bottom: 20px;

  }

  form input {

app/helpers/report_helper.rb

+1 −1
Original line number Diff line number Diff line
@@ -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)),

app/views/report/index.html.haml

+7 −4
Original line number Diff line number Diff line
@@ -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}),

config/locales/diaspora/en.yml

+3 −3
Original line number Diff line number Diff line
@@ -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"