diff options
| author | Claire <claire.github-309c@sitedethib.com> | 2022-01-19 14:22:59 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-01-19 14:22:59 +0100 |
| commit | b209e919bddb4bb72bb4f8589f4b15654f22ef53 (patch) | |
| tree | ccd980d2d701c03f9c16358908f20560f2d5be2c /app/views/admin/report_notes | |
| parent | f6acc039ec95c6d1c8cc2e2955f2af31d27e928c (diff) | |
| parent | c42938aed4677f52207bbb6389c7edc2772a6f7a (diff) | |
Merge pull request #1662 from ClearlyClaire/glitch-soc/merge-upstream
Merge upstream changes
Diffstat (limited to 'app/views/admin/report_notes')
| -rw-r--r-- | app/views/admin/report_notes/_report_note.html.haml | 23 |
1 files changed, 17 insertions, 6 deletions
diff --git a/app/views/admin/report_notes/_report_note.html.haml b/app/views/admin/report_notes/_report_note.html.haml index d34dc3d15..428b6cf59 100644 --- a/app/views/admin/report_notes/_report_note.html.haml +++ b/app/views/admin/report_notes/_report_note.html.haml @@ -1,7 +1,18 @@ -.speech-bubble - .speech-bubble__bubble +.report-notes__item + = image_tag report_note.account.avatar.url, class: 'report-notes__item__avatar' + + .report-notes__item__header + %span.username + = link_to display_name(report_note.account), admin_account_path(report_note.account_id) + %time{ datetime: report_note.created_at.iso8601, title: l(report_note.created_at) } + - if report_note.created_at.today? + = t('admin.report_notes.today_at', time: l(report_note.created_at, format: :time)) + - else + = l report_note.created_at.to_date + + .report-notes__item__content = simple_format(h(report_note.content)) - .speech-bubble__owner - = admin_account_link_to report_note.account - %time.formatted{ datetime: report_note.created_at.iso8601 }= l report_note.created_at - = table_link_to 'trash', t('admin.reports.notes.delete'), admin_report_note_path(report_note), method: :delete if can?(:destroy, report_note) + + - if can?(:destroy, report_note) + .report-notes__item__actions + = table_link_to 'trash', t('admin.reports.notes.delete'), admin_report_note_path(report_note), method: :delete |