Unfloyded/Legamunt
0
0
Fork 0
Code Activity

Improve Activity stream spoiler (#4088)

Browse source
This commit is contained in:
abcang 2017-07-07 04:31:03 +09:00 • committed by Eugen Rochko
parent 6bf6d35637
commit f76e71825d
5 changed files with 28 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

10
app/views/stream_entries/_content_spoiler.html.haml
View file

@ -1,3 +1,7 @@
.media-spoiler
%span= t('stream_entries.sensitive_content')
%span= t('stream_entries.click_to_show')
.media-spoiler-wrapper{ class: sensitive == false && 'media-spoiler-wrapper__visible' }
.spoiler-button
.icon-button.overlayed
%i.fa.fa-fw.fa-eye
.media-spoiler
%span= t('stream_entries.sensitive_content')
%span= t('stream_entries.click_to_show')

6
app/views/stream_entries/_detailed_status.html.haml
View file

@ -17,13 +17,11 @@
- unless status.media_attachments.empty?
- if status.media_attachments.first.video?
.video-player
- if status.sensitive?
= render partial: 'stream_entries/content_spoiler'
= render partial: 'stream_entries/content_spoiler', locals: { sensitive: status.sensitive? }
%video.u-video{ src: status.media_attachments.first.file.url(:original), loop: true }
- else
.detailed-status__attachments
- if status.sensitive?
= render partial: 'stream_entries/content_spoiler'
= render partial: 'stream_entries/content_spoiler', locals: { sensitive: status.sensitive? }
.status__attachments__inner
- status.media_attachments.each do |media|
= render partial: 'stream_entries/media', locals: { media: media }

3
app/views/stream_entries/_simple_status.html.haml
View file

@ -22,8 +22,7 @@
- unless status.media_attachments.empty?
.status__attachments
- if status.sensitive?
= render partial: 'stream_entries/content_spoiler'
= render partial: 'stream_entries/content_spoiler', locals: { sensitive: status.sensitive? }
- if status.media_attachments.first.video?
.status__attachments__inner
.video-item