diff options
| author | ThibG <thib@sitedethib.com> | 2018-08-17 18:09:30 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-08-17 18:09:30 +0200 |
| commit | 32075fe27f699d5a586e6ecf26c172550f9d4086 (patch) | |
| tree | 61f48fa2dee608f72990f76a8f0497d670339252 /app/views/admin | |
| parent | 4a6bc2482a26aa0441485ca360a3d3c0eeea7fe4 (diff) | |
| parent | a16ff45d81d77d93f33ad57e746c780392ab1a1c (diff) | |
Merge pull request #642 from ThibG/glitch-soc/merge-upstream
Merge upstream changes
Diffstat (limited to 'app/views/admin')
| -rw-r--r-- | app/views/admin/reports/_status.html.haml | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/app/views/admin/reports/_status.html.haml b/app/views/admin/reports/_status.html.haml index 5e174f312..5b410ec84 100644 --- a/app/views/admin/reports/_status.html.haml +++ b/app/views/admin/reports/_status.html.haml @@ -3,11 +3,13 @@ = f.check_box :status_ids, { multiple: true, include_hidden: false }, status.id .batch-table__row__content .status__content>< - - unless status.proper.spoiler_text.blank? - %p>< - %strong> Content warning: #{Formatter.instance.format_spoiler(status.proper)} - - = Formatter.instance.format(status.proper, custom_emojify: true) + - if status.proper.spoiler_text.blank? + = Formatter.instance.format(status.proper, custom_emojify: true) + - else + %details< + %summary>< + %strong> Content warning: #{Formatter.instance.format_spoiler(status.proper)} + = Formatter.instance.format(status.proper, custom_emojify: true) - unless status.proper.media_attachments.empty? - if status.proper.media_attachments.first.video? |