about summary refs log tree commit diff
path: root/app/views/profile/_status.html.haml
diff options
context:
space:
mode:
authorEugen Rochko <eugen@zeonfederated.com>2016-02-28 14:02:53 +0100
committerEugen Rochko <eugen@zeonfederated.com>2016-02-28 14:02:53 +0100
commit2825991e09272d6e7227da9d9b8dc387614a83df (patch)
tree74edf6c23928ae3b448e5247e78d60cd5c86b572 /app/views/profile/_status.html.haml
parent5ae54f9e364880e1350ddcc8251a23cf79ae55fc (diff)
Improving status display design, including replies and threads
Diffstat (limited to 'app/views/profile/_status.html.haml')
-rw-r--r--app/views/profile/_status.html.haml15
1 files changed, 11 insertions, 4 deletions
diff --git a/app/views/profile/_status.html.haml b/app/views/profile/_status.html.haml
index c2033b4f7..1edd8df77 100644
--- a/app/views/profile/_status.html.haml
+++ b/app/views/profile/_status.html.haml
@@ -1,16 +1,23 @@
-%div.entry{ class: status.reblog? ? 'entry-reblog' : 'entry-status' }
+- if status.reply? && include_threads
+  = render partial: 'status', locals: { status: status.thread, include_threads: false, is_predecessor: true, is_successor: false }
+
+.entry{ class: entry_classes(status, is_predecessor, is_successor, include_threads) }
   - if status.reblog?
     .pre-header
       %i.fa.fa-retweet
       Shared by
       = link_to display_name(status.account), profile_url(status.account), class: 'name'
-  .entry-container
+  .entry__container
     .avatar
-      = image_tag status.reblog? ? status.reblog.account.avatar.url(:small) : status.account.avatar.url(:small)
-    .container
+      = image_tag avatar_for_status_url(status)
+    .entry__container__container
       .header
         = render partial: 'status_header', locals: { status: status.reblog? ? status.reblog : status }
       .content
         = status.content
       .counters
         = render partial: 'status_footer', locals: { status: status.reblog? ? status.reblog : status }
+
+- if include_threads
+  - status.replies.each do |status|
+    = render partial: 'status', locals: { status: status, include_threads: false, is_successor: true, is_predecessor: false }