diff options
| author | Claire <claire.github-309c@sitedethib.com> | 2022-05-08 21:45:59 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-05-08 21:45:59 +0200 |
| commit | e8b8ac8908c6623f0fd7ffccc7de3882a773b72f (patch) | |
| tree | 14c554ab68d0f1ab29f2862afb2f306da2127323 /app/views | |
| parent | d7eae4229c3a0b5dd783888953004cfd9777cffd (diff) | |
| parent | dc1685c1e65cd6a2c176fe4a50a92fbc468f3b75 (diff) | |
Merge pull request #1766 from ClearlyClaire/glitch-soc/merge-upstream
Merge upstream changes
Diffstat (limited to 'app/views')
| -rw-r--r-- | app/views/disputes/strikes/show.html.haml | 4 | ||||
| -rw-r--r-- | app/views/statuses/_simple_status.html.haml | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/app/views/disputes/strikes/show.html.haml b/app/views/disputes/strikes/show.html.haml index 0b71e14a3..1be50331a 100644 --- a/app/views/disputes/strikes/show.html.haml +++ b/app/views/disputes/strikes/show.html.haml @@ -3,8 +3,8 @@ - content_for :heading_actions do - if @appeal.persisted? - = link_to t('admin.accounts.approve'), approve_admin_disputes_appeal_path(@appeal), method: :post, class: 'button' if can?(:approve, @appeal) - = link_to t('admin.accounts.reject'), reject_admin_disputes_appeal_path(@appeal), method: :post, class: 'button button--destructive' if can?(:reject, @appeal) + = link_to t('disputes.strikes.approve_appeal'), approve_admin_disputes_appeal_path(@appeal), method: :post, class: 'button' if can?(:approve, @appeal) + = link_to t('disputes.strikes.reject_appeal'), reject_admin_disputes_appeal_path(@appeal), method: :post, class: 'button button--destructive' if can?(:reject, @appeal) - if @strike.overruled? %p.hint diff --git a/app/views/statuses/_simple_status.html.haml b/app/views/statuses/_simple_status.html.haml index 7b672bda7..6192f293a 100644 --- a/app/views/statuses/_simple_status.html.haml +++ b/app/views/statuses/_simple_status.html.haml @@ -65,6 +65,6 @@ - elsif status.private_visibility? || status.limited_visibility? = fa_icon 'lock fw' - else - = fa_icon 'envelope fw' + = fa_icon 'at fw' = link_to remote_interaction_path(status, type: :favourite), class: 'status__action-bar-button icon-button modal-button' do = fa_icon 'star fw' |