about summary refs log tree commit diff
path: root/app/views/profile/_status_header.html.haml
diff options
context:
space:
mode:
authorEugen Rochko <eugen@zeonfederated.com>2016-02-28 00:02:59 +0100
committerEugen Rochko <eugen@zeonfederated.com>2016-02-28 00:02:59 +0100
commit2c70f0ecaa507427d2592434cb4a516bcedd5039 (patch)
tree7d5382144ae1c6d8f87af3b09c06654db5740684 /app/views/profile/_status_header.html.haml
parentfa29ef3a41816ee915c52707bcd9db6cc9cdf7d6 (diff)
Adding paperclip for avatars, fixing design of the public pages
Diffstat (limited to 'app/views/profile/_status_header.html.haml')
-rw-r--r--app/views/profile/_status_header.html.haml6
1 files changed, 3 insertions, 3 deletions
diff --git a/app/views/profile/_status_header.html.haml b/app/views/profile/_status_header.html.haml
index 6f0e8748e..e1c810088 100644
--- a/app/views/profile/_status_header.html.haml
+++ b/app/views/profile/_status_header.html.haml
@@ -1,8 +1,8 @@
-= link_to (status.account.local? ? profile_url(name: status.account.username) : status.account.url), class: 'name' do
-  %strong= status.account.display_name.blank? ? status.account.username : status.account.display_name
+= link_to profile_url(status.account), class: 'name' do
+  %strong= display_name(status.account)
   = "@#{status.account.acct}"
 
-= link_to status.local? ? status_url(name: status.account.username, id: status.stream_entry.id) : status.url, class: 'time' do
+= link_to status_url(status), class: 'time' do
   %span{ title: status.created_at }
     = time_ago_in_words(status.created_at)
     ago