diff options
| author | Claire <claire.github-309c@sitedethib.com> | 2022-02-22 18:06:29 +0100 |
|---|---|---|
| committer | Claire <claire.github-309c@sitedethib.com> | 2022-02-22 18:06:29 +0100 |
| commit | 954e052b0727099be97552af577831a8a0f81a88 (patch) | |
| tree | 560526b10076fdfa31245fe8bfdd4a58303ae214 /app/views/disputes/strikes | |
| parent | e0d94323bc8f6c5d249452e2baf1f103c15546b8 (diff) | |
| parent | 166f6e4b500dd84eeffdbf887b2dc21e6d8c0aa6 (diff) | |
Merge branch 'main' into glitch-soc/merge-upstream
Conflicts: - `app/models/media_attachment.rb`: Upstream moved hardcoded values around, while in glitch-soc they are configurable. Moved them like upstream, but keeping glitch-soc's ability to configure them through env vars.
Diffstat (limited to 'app/views/disputes/strikes')
| -rw-r--r-- | app/views/disputes/strikes/show.html.haml | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/app/views/disputes/strikes/show.html.haml b/app/views/disputes/strikes/show.html.haml index 3dcb19016..7248b2574 100644 --- a/app/views/disputes/strikes/show.html.haml +++ b/app/views/disputes/strikes/show.html.haml @@ -23,7 +23,7 @@ .report-header__card .strike-card - unless @strike.none_action? - %p= t "user_mailer.warning.explanation.#{@strike.action}" + %p= t "user_mailer.warning.explanation.#{@strike.action}", instance: Rails.configuration.x.local_domain - unless @strike.text.blank? = Formatter.instance.linkify(@strike.text) @@ -34,9 +34,10 @@ = t("user_mailer.warning.categories.#{@strike.report.category}") - if @strike.report.violation? && @strike.report.rule_ids.present? - %ul.rules-list + %ul.strike-card__rules - @strike.report.rules.each do |rule| - %li= rule.text + %li + %span.strike-card__rules__text= rule.text - if @strike.status_ids.present? && !@strike.status_ids.empty? %p @@ -75,7 +76,7 @@ .report-header__details__item__header %strong= t('disputes.strikes.recipient') .report-header__details__item__content - = admin_account_link_to @strike.target_account, path: can?(:show, @strike.target_account) ? admin_account_path(@strike.target_account_id) : ActivityPub::TagManager.instance.url_for(@strike.target_account) + = link_to @strike.target_account.username, can?(:show, @strike.target_account) ? admin_account_path(@strike.target_account_id) : ActivityPub::TagManager.instance.url_for(@strike.target_account), class: 'table-action-link' .report-header__details__item .report-header__details__item__header %strong= t('disputes.strikes.action_taken') @@ -89,7 +90,7 @@ .report-header__details__item__header %strong= t('disputes.strikes.associated_report') .report-header__details__item__content - = link_to t('admin.reports.report', id: @strike.report.id), admin_report_path(@strike.report) + = link_to t('admin.reports.report', id: @strike.report.id), admin_report_path(@strike.report), class: 'table-action-link' - if @appeal.persisted? .report-header__details__item .report-header__details__item__header |