diff options
author | Claire <claire.github-309c@sitedethib.com> | 2022-02-17 10:58:25 +0100 |
---|---|---|
committer | Claire <claire.github-309c@sitedethib.com> | 2022-02-17 10:58:44 +0100 |
commit | f224237862b009ad4b008a8730c58111f103145b (patch) | |
tree | 097c08663c6348914fdf95d2ac9ce57ee2a3307c /app/views/auth/registrations/_account_warning.html.haml | |
parent | ec4f9066189fbab4368a275e9cd654dc7ad48217 (diff) | |
parent | ac99f586bb4138e083676579097d951434e90515 (diff) |
Merge branch 'main' into glitch-soc/merge-upstream
Conflicts: - `db/schema.rb`: Conflict due to glitch-soc adding the `content_type` column on status edits and thus having a different schema version number. Solved by taking upstream's schema version number, as it is higher than glitch-soc's.
Diffstat (limited to 'app/views/auth/registrations/_account_warning.html.haml')
-rw-r--r-- | app/views/auth/registrations/_account_warning.html.haml | 20 |
1 files changed, 20 insertions, 0 deletions
diff --git a/app/views/auth/registrations/_account_warning.html.haml b/app/views/auth/registrations/_account_warning.html.haml new file mode 100644 index 000000000..40e7e1296 --- /dev/null +++ b/app/views/auth/registrations/_account_warning.html.haml @@ -0,0 +1,20 @@ += link_to disputes_strike_path(account_warning), class: 'log-entry' do + .log-entry__header + .log-entry__avatar + .indicator-icon{ class: account_warning.overruled? ? 'success' : 'failure' } + = fa_icon 'warning' + .log-entry__content + .log-entry__title + = t('disputes.strikes.title', action: t(account_warning.action, scope: 'disputes.strikes.title_actions'), date: l(account_warning.created_at.to_date)) + .log-entry__timestamp + %time.formatted{ datetime: account_warning.created_at.iso8601 }= l(account_warning.created_at) + + - if account_warning.overruled? + · + %span.positive-hint= t('disputes.strikes.your_appeal_approved') + - elsif account_warning.appeal&.pending? + · + %span.warning-hint= t('disputes.strikes.your_appeal_pending') + - elsif account_warning.appeal&.rejected? + · + %span.negative-hint= t('disputes.strikes.your_appeal_rejected') |