From fc65b691df3c1a0a9635ae337fd163c5336f87ce Mon Sep 17 00:00:00 2001 From: kibigo! Date: Thu, 29 Jun 2017 22:59:28 -0700 Subject: [PATCH] Images now behind CWs on static pages --- .../stream_entries/_content_spoiler.html.haml | 2 +- .../stream_entries/_detailed_status.html.haml | 29 ++++++++--------- app/views/stream_entries/_media.html.haml | 2 +- .../stream_entries/_simple_status.html.haml | 31 ++++++++++--------- 4 files changed, 33 insertions(+), 31 deletions(-) diff --git a/app/views/stream_entries/_content_spoiler.html.haml b/app/views/stream_entries/_content_spoiler.html.haml index d80ea46a0..0bd6314d0 100644 --- a/app/views/stream_entries/_content_spoiler.html.haml +++ b/app/views/stream_entries/_content_spoiler.html.haml @@ -1,3 +1,3 @@ -.media-spoiler +.media-spoiler>< %span= t('stream_entries.sensitive_content') %span= t('stream_entries.click_to_show') diff --git a/app/views/stream_entries/_detailed_status.html.haml b/app/views/stream_entries/_detailed_status.html.haml index ef60b9925..589d647ce 100644 --- a/app/views/stream_entries/_detailed_status.html.haml +++ b/app/views/stream_entries/_detailed_status.html.haml @@ -12,21 +12,22 @@ %p{ style: 'margin-bottom: 0' }< %span.p-summary> #{status.spoiler_text}  %a.status__content__spoiler-link{ href: '#' }= t('statuses.show_more') - .e-content{ lang: status.language, style: "display: #{status.spoiler_text? ? 'none' : 'block'}; direction: #{rtl_status?(status) ? 'rtl' : 'ltr'}" }= Formatter.instance.format(status) + .e-content{ lang: status.language, style: "display: #{status.spoiler_text? ? 'none' : 'block'}; direction: #{rtl_status?(status) ? 'rtl' : 'ltr'}" }< + = Formatter.instance.format(status) - - unless status.media_attachments.empty? - - if status.media_attachments.first.video? - .video-player - - if status.sensitive? - = render partial: 'stream_entries/content_spoiler' - %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' - .status__attachments__inner - - status.media_attachments.each do |media| - = render partial: 'stream_entries/media', locals: { media: media } + - unless status.media_attachments.empty? + - if status.media_attachments.first.video? + .video-player>< + - if status.sensitive? + = render partial: 'stream_entries/content_spoiler' + %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' + .status__attachments__inner< + - status.media_attachments.each do |media| + = render partial: 'stream_entries/media', locals: { media: media } .detailed-status__meta %data.dt-published{ value: status.created_at.to_time.iso8601 } diff --git a/app/views/stream_entries/_media.html.haml b/app/views/stream_entries/_media.html.haml index 779f02c8d..32d024cf6 100644 --- a/app/views/stream_entries/_media.html.haml +++ b/app/views/stream_entries/_media.html.haml @@ -1,4 +1,4 @@ -.media-item +.media-item>< = link_to media.remote_url.blank? ? media.file.url(:original) : media.remote_url, style: media.image? ? "background-image: url(#{media.file.url(:original)})" : '', target: '_blank', rel: 'noopener', class: "u-#{media.video? || media.gifv? ? 'video' : 'photo'}" do - unless media.image? %video{ src: media.file.url(:original), autoplay: true, loop: true }/ diff --git a/app/views/stream_entries/_simple_status.html.haml b/app/views/stream_entries/_simple_status.html.haml index db4e30fda..88750180f 100644 --- a/app/views/stream_entries/_simple_status.html.haml +++ b/app/views/stream_entries/_simple_status.html.haml @@ -18,19 +18,20 @@ %p{ style: 'margin-bottom: 0' }< %span.p-summary> #{status.spoiler_text}  %a.status__content__spoiler-link{ href: '#' }= t('statuses.show_more') - .e-content{ lang: status.language, style: "display: #{status.spoiler_text? ? 'none' : 'block'}; direction: #{rtl_status?(status) ? 'rtl' : 'ltr'}" }= Formatter.instance.format(status) + .e-content{ lang: status.language, style: "display: #{status.spoiler_text? ? 'none' : 'block'}; direction: #{rtl_status?(status) ? 'rtl' : 'ltr'}" }< + = Formatter.instance.format(status) - - unless status.media_attachments.empty? - .status__attachments - - if status.sensitive? - = render partial: 'stream_entries/content_spoiler' - - if status.media_attachments.first.video? - .status__attachments__inner - .video-item - = link_to (status.media_attachments.first.remote_url.blank? ? status.media_attachments.first.file.url(:original) : status.media_attachments.first.remote_url), style: "background-image: url(#{status.media_attachments.first.file.url(:small)})", target: '_blank', rel: 'noopener', class: 'u-video' do - .video-item__play - = fa_icon('play') - - else - .status__attachments__inner - - status.media_attachments.each do |media| - = render partial: 'stream_entries/media', locals: { media: media } + - unless status.media_attachments.empty? + .status__attachments>< + - if status.sensitive? + = render partial: 'stream_entries/content_spoiler' + - if status.media_attachments.first.video? + .status__attachments__inner< + .video-item< + = link_to (status.media_attachments.first.remote_url.blank? ? status.media_attachments.first.file.url(:original) : status.media_attachments.first.remote_url), style: "background-image: url(#{status.media_attachments.first.file.url(:small)})", target: '_blank', rel: 'noopener', class: 'u-video' do + .video-item__play + = fa_icon('play') + - else + .status__attachments__inner< + - status.media_attachments.each do |media| + = render partial: 'stream_entries/media', locals: { media: media }