OpenCloud
/
mastodon
mirror of https://github.com/tootsuite/mastodon
1
1
Fork 0
Code Issues Releases Wiki Activity

Pull out full `li` element into admin/status_edits/status_edit partial (#29499)

pull/29656/head
Matt Jankowski 2024-03-19 12:11:10 -04:00 committed by GitHub
parent ffc5be4820
commit 4c84891453
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 30 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

48
app/views/admin/status_edits/_status_edit.html.haml
View File

@ -1,20 +1,30 @@
.status %li
.status__content>< .history__entry
- if status_edit.spoiler_text.blank? %h5
= prerender_custom_emojis(status_content_format(status_edit), status_edit.emojis) - if status_edit_iteration.first?
- else = t('admin.statuses.original_status')
%details< - else
%summary>< = t('admin.statuses.status_changed')
%strong> Content warning: #{prerender_custom_emojis(h(status_edit.spoiler_text), status_edit.emojis)}
= prerender_custom_emojis(status_content_format(status_edit), status_edit.emojis)
- unless status_edit.ordered_media_attachments.empty?
= render partial: 'admin/reports/media_attachments', locals: { status: status_edit }
.detailed-status__meta
%time.formatted{ datetime: status_edit.created_at.iso8601, title: l(status_edit.created_at) }= l(status_edit.created_at)
- if status_edit.sensitive?
· ·
= fa_icon('eye-slash fw') %time.formatted{ datetime: status_edit.created_at.iso8601, title: l(status_edit.created_at) }= l(status_edit.created_at)
= t('stream_entries.sensitive_content')
.status
.status__content><
- if status_edit.spoiler_text.blank?
= prerender_custom_emojis(status_content_format(status_edit), status_edit.emojis)
- else
%details<
%summary><
%strong> Content warning: #{prerender_custom_emojis(h(status_edit.spoiler_text), status_edit.emojis)}
= prerender_custom_emojis(status_content_format(status_edit), status_edit.emojis)
- unless status_edit.ordered_media_attachments.empty?
= render partial: 'admin/reports/media_attachments', locals: { status: status_edit }
.detailed-status__meta
%time.formatted{ datetime: status_edit.created_at.iso8601, title: l(status_edit.created_at) }= l(status_edit.created_at)
- if status_edit.sensitive?
·
= fa_icon('eye-slash fw')
= t('stream_entries.sensitive_content')

13
app/views/admin/statuses/show.html.haml
View File

@ -47,15 +47,4 @@
%h3= t('admin.statuses.history') %h3= t('admin.statuses.history')
%ol.history %ol.history
- batched_ordered_status_edits.with_index do |status_edit, i| = render partial: 'admin/status_edits/status_edit', collection: batched_ordered_status_edits
%li
.history__entry
%h5
- if i.zero?
= t('admin.statuses.original_status')
- else
= t('admin.statuses.status_changed')
·
%time.formatted{ datetime: status_edit.created_at.iso8601, title: l(status_edit.created_at) }= l(status_edit.created_at)
= render status_edit