about summary refs log tree commit diff
path: root/app/views/profile
diff options
context:
space:
mode:
authorEugen Rochko <eugen@zeonfederated.com>2016-02-26 21:11:52 +0100
committerEugen Rochko <eugen@zeonfederated.com>2016-02-26 21:11:52 +0100
commitfa29ef3a41816ee915c52707bcd9db6cc9cdf7d6 (patch)
tree0a7353bb679e8885269077b6a8ef14847c2e966f /app/views/profile
parent24646d57690ad36cf4caecab2eec5774bca7f699 (diff)
Improving design
Diffstat (limited to 'app/views/profile')
-rw-r--r--app/views/profile/_status.html.haml7
-rw-r--r--app/views/profile/_status_footer.html.haml3
2 files changed, 9 insertions, 1 deletions
diff --git a/app/views/profile/_status.html.haml b/app/views/profile/_status.html.haml
index 39e70b69c..91c4fad26 100644
--- a/app/views/profile/_status.html.haml
+++ b/app/views/profile/_status.html.haml
@@ -1,4 +1,9 @@
-%div.entry
+%div.entry{ class: status.reblog? ? 'entry-reblog' : 'entry-status' }
+  - if status.reblog?
+    .pre-header
+      %i.fa.fa-retweet
+      Shared by
+      = link_to status.account.display_name.blank? ? status.account.username : status.account.display_name, (status.account.local? ? profile_url(name: status.account.username) : status.account.url), class: 'name'
   .header
     = render partial: 'status_header', locals: { status: status.reblog? ? status.reblog : status }
   .content
diff --git a/app/views/profile/_status_footer.html.haml b/app/views/profile/_status_footer.html.haml
index 0c47ade90..f29abf27b 100644
--- a/app/views/profile/_status_footer.html.haml
+++ b/app/views/profile/_status_footer.html.haml
@@ -5,3 +5,6 @@
 .counter.counter-favourites
   %i.fa.fa-star
   %span.num= status.favourites.count
+
+- if status.reply?
+  = link_to 'View conversation', status.thread.local? ? status_url(name: status.thread.account.username, id: status.thread.id) : status.thread.url, class: 'conversation-link'