diff options
| author | Claire <claire.github-309c@sitedethib.com> | 2022-02-22 19:53:36 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-02-22 19:53:36 +0100 |
| commit | 2c8615fbf8f8085eb836733b27b33c9522c29c71 (patch) | |
| tree | 6f5f64b7e4e49f652712236b923d5da8c6455176 /app/views/admin/account_warnings | |
| parent | e0d94323bc8f6c5d249452e2baf1f103c15546b8 (diff) | |
| parent | 5169a9f9d9a1c4532c49c36aeeb9021f443c5565 (diff) | |
Merge pull request #1699 from ClearlyClaire/glitch-soc/merge-upstream
Merge upstream changes
Diffstat (limited to 'app/views/admin/account_warnings')
| -rw-r--r-- | app/views/admin/account_warnings/_account_warning.html.haml | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/app/views/admin/account_warnings/_account_warning.html.haml b/app/views/admin/account_warnings/_account_warning.html.haml index ef23c3b77..1462e76d0 100644 --- a/app/views/admin/account_warnings/_account_warning.html.haml +++ b/app/views/admin/account_warnings/_account_warning.html.haml @@ -1,7 +1,8 @@ -= link_to disputes_strike_path(account_warning), class: ['log-entry', account_warning.overruled? && 'log-entry--inactive'] do += link_to disputes_strike_path(account_warning), class: 'log-entry' do .log-entry__header .log-entry__avatar - = image_tag account_warning.target_account.avatar.url(:original), alt: '', width: 40, height: 40, class: 'avatar' + .indicator-icon{ class: account_warning.overruled? ? 'success' : 'failure' } + = fa_icon 'warning' .log-entry__content .log-entry__title = t(account_warning.action, scope: 'admin.strikes.actions', name: content_tag(:span, account_warning.account.username, class: 'username'), target: content_tag(:span, account_warning.target_account.acct, class: 'target')).html_safe @@ -11,7 +12,7 @@ - if account_warning.report_id.present? · - = t('admin.reports.title', id: account_warning.report_id) + = t('admin.reports.report', id: account_warning.report_id) - if account_warning.overruled? · |