From 80108280ffcb9b48684fa46f1cd87d71778f3826 Mon Sep 17 00:00:00 2001 From: Emelia Smith Date: Thu, 22 Aug 2024 22:44:37 +0200 Subject: [PATCH] WIP --- .../admin/account_moderation_notes_helper.rb | 4 +- app/javascript/styles/mastodon/admin.scss | 9 +++++ app/views/admin/reports/index.html.haml | 38 +++++++++++-------- config/locales/en.yml | 2 +- 4 files changed, 35 insertions(+), 18 deletions(-) diff --git a/app/helpers/admin/account_moderation_notes_helper.rb b/app/helpers/admin/account_moderation_notes_helper.rb index 2a3d954a35..bd55f1ae1f 100644 --- a/app/helpers/admin/account_moderation_notes_helper.rb +++ b/app/helpers/admin/account_moderation_notes_helper.rb @@ -23,8 +23,6 @@ module Admin::AccountModerationNotesHelper ) end - private - def labeled_account_avatar(account) safe_join( [ @@ -35,6 +33,8 @@ module Admin::AccountModerationNotesHelper ) end + private + def account_inline_text(account) content_tag(:span, account.acct, class: 'username') end diff --git a/app/javascript/styles/mastodon/admin.scss b/app/javascript/styles/mastodon/admin.scss index 5319eaca94..32d0c82bca 100644 --- a/app/javascript/styles/mastodon/admin.scss +++ b/app/javascript/styles/mastodon/admin.scss @@ -288,6 +288,10 @@ $content-width: 840px; padding-bottom: 8px; margin-bottom: 8px; border-bottom: 1px solid var(--background-border-color); + + &.no-border { + border-bottom: none; + } } h6 { @@ -938,6 +942,11 @@ a.name-tag, &__icon { margin-inline-end: 4px; font-weight: 500; + + .name-tag { + color: inherit; + margin-inline-start: 4px; + } } } diff --git a/app/views/admin/reports/index.html.haml b/app/views/admin/reports/index.html.haml index 60ec6b8464..6b3cad2cbe 100644 --- a/app/views/admin/reports/index.html.haml +++ b/app/views/admin/reports/index.html.haml @@ -30,7 +30,7 @@ %button.button= t('admin.accounts.search') = link_to t('admin.accounts.reset'), admin_reports_path, class: 'button negative' -%h4 Reports by reported account +%h4.no-border Reports grouped by reported account - @reports.group_by(&:target_account_id).each_value do |reports| - target_account = reports.first.target_account @@ -54,6 +54,20 @@ .report-card__summary__item__reported-by = link_to admin_report_path(report), class: 'report-card__summary__item__report-id' do .one-line= t('admin.reports.report', id: report.id) + - case report.category + - when 'legal' + Illegal + - when 'spam' + Spam + - when 'violation' + Rule Violation + - else + Other + + .report-card__summary__item__content + = link_to admin_report_path(report) do + .one-line + = report.comment.presence || t('admin.reports.comment.none') %span.report-card__summary__item__content__icon{ title: t('admin.accounts.statuses') } = material_symbol('comment') @@ -62,27 +76,21 @@ %span.report-card__summary__item__content__icon{ title: t('admin.accounts.media_attachments') } = material_symbol('photo_camera') = report.media_attachments_count - - .report-card__summary__item__content - = link_to admin_report_path(report) do - .one-line= report.comment.presence || t('admin.reports.comment.none') - - - %span.report-card__summary__item__content__icon{ title: } + %span.report-card__summary__item__content__icon - if report.account.instance_actor? = material_symbol('cloud') = site_hostname - elsif report.account.local? - = material_symbol('person') - = report.account.acct + .name-tag= labeled_account_avatar report.account + -# = material_symbol('person') + = report.account.acct + - if report.forwarded? + • + = t('admin.reports.forwarded') - else = material_symbol('cloud') = report.account.domain - - if report.forwarded? - ยท - = t('admin.reports.forwarded_to', domain: target_account.domain) - .report-card__summary__item__assigned %span.report-card__summary__item__content__icon{ title: t('admin.reports.notes.title') } = material_symbol('comment') @@ -92,5 +100,5 @@ - if report.assigned_account.present? = admin_account_link_to report.assigned_account - else - unassigned + = t 'admin.reports.unassigned' = paginate @reports diff --git a/config/locales/en.yml b/config/locales/en.yml index 99dcb657f4..4b79e20637 100644 --- a/config/locales/en.yml +++ b/config/locales/en.yml @@ -614,7 +614,7 @@ en: category: Category category_description_html: The reason this account and/or content was reported will be cited in communication with the reported account comment: - none: None + none: No Comment comment_description_html: 'To provide more information, %{name} wrote:' confirm: Confirm confirm_action: Confirm moderation action against @%{acct}