about summary refs log tree commit diff
path: root/app
diff options
context:
space:
mode:
authorkibigo! <marrus-sh@users.noreply.github.com>2017-09-28 17:18:12 -0700
committerkibigo! <marrus-sh@users.noreply.github.com>2017-09-28 17:18:12 -0700
commit152279585376c54f1e738983c4046ce6f0bb2448 (patch)
tree78649cc2cf3debc1922f6233b60c0d0edb9a0244 /app
parente9f9e3cc89365ec75759f91f66931e4015448c75 (diff)
new HAML for statuses
Diffstat (limited to 'app')
-rw-r--r--app/views/stream_entries/_detailed_status.html.haml18
-rw-r--r--app/views/stream_entries/_simple_status.html.haml20
2 files changed, 13 insertions, 25 deletions
diff --git a/app/views/stream_entries/_detailed_status.html.haml b/app/views/stream_entries/_detailed_status.html.haml
index 4c85fef8b..a839b4898 100644
--- a/app/views/stream_entries/_detailed_status.html.haml
+++ b/app/views/stream_entries/_detailed_status.html.haml
@@ -17,20 +17,16 @@
       %p{ style: 'margin-bottom: 0' }<
         %span.p-summary> #{Formatter.instance.format_spoiler(status)}&nbsp;
         %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, custom_emojify: true)
 
-      - unless status.media_attachments.empty?
+      - if !status.media_attachments.empty?
         - if status.media_attachments.first.video?
-          .video-player><
-            = render partial: 'stream_entries/content_spoiler', locals: { sensitive: status.sensitive? }
-            %video.u-video{ src: status.media_attachments.first.file.url(:original), loop: true }
+          - video = status.media_attachments.first
+          %div{ data: { component: 'Video', props: Oj.dump(src: video.file.url(:original), preview: video.file.url(:small), sensitive: status.sensitive?, width: 670, height: 380) }}><
         - else
-          .detailed-status__attachments><
-            = 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 }
+          %div{ data: { component: 'MediaGallery', props: Oj.dump(height: 380, sensitive: status.sensitive?, standalone: true, 'autoPlayGif': current_account&.user&.setting_auto_play_gif, media: status.media_attachments.map { |a| ActiveModelSerializers::SerializableResource.new(a, serializer: REST::MediaAttachmentSerializer).as_json }) }}><
+      - elsif status.preview_cards.first
+        %div{ data: { component: 'Card', props: Oj.dump('maxDescription': 160, card: ActiveModelSerializers::SerializableResource.new(status.preview_cards.first, serializer: REST::PreviewCardSerializer).as_json) }}><
 
   .detailed-status__meta
     %data.dt-published{ value: status.created_at.to_time.iso8601 }
diff --git a/app/views/stream_entries/_simple_status.html.haml b/app/views/stream_entries/_simple_status.html.haml
index 88700543d..a227467f0 100644
--- a/app/views/stream_entries/_simple_status.html.haml
+++ b/app/views/stream_entries/_simple_status.html.haml
@@ -18,19 +18,11 @@
       %p{ style: 'margin-bottom: 0' }<
         %span.p-summary> #{Formatter.instance.format_spoiler(status)}&nbsp;
         %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, custom_emojify: true)
 
       - unless status.media_attachments.empty?
-        .status__attachments><
-          = render partial: 'stream_entries/content_spoiler', locals: { sensitive: status.sensitive? }
-          - 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 }
+        - if status.media_attachments.first.video?
+          - video = status.media_attachments.first
+          %div{ data: { component: 'Video', props: Oj.dump(src: video.file.url(:original), preview: video.file.url(:small), sensitive: status.sensitive?, width: 610, height: 343) }}><
+        - else
+          %div{ data: { component: 'MediaGallery', props: Oj.dump(height: 343, sensitive: status.sensitive?, 'autoPlayGif': current_account&.user&.setting_auto_play_gif, media: status.media_attachments.map { |a| ActiveModelSerializers::SerializableResource.new(a, serializer: REST::MediaAttachmentSerializer).as_json }) }}><