From 2c70f0ecaa507427d2592434cb4a516bcedd5039 Mon Sep 17 00:00:00 2001
From: Eugen Rochko <eugen@zeonfederated.com>
Date: Sun, 28 Feb 2016 00:02:59 +0100
Subject: Adding paperclip for avatars, fixing design of the public pages

---
 app/views/layouts/application.html.haml    | 1 +
 app/views/profile/_status.html.haml        | 2 +-
 app/views/profile/_status_footer.html.haml | 4 ++--
 app/views/profile/_status_header.html.haml | 6 +++---
 4 files changed, 7 insertions(+), 6 deletions(-)

(limited to 'app/views')

diff --git a/app/views/layouts/application.html.haml b/app/views/layouts/application.html.haml
index e8a9329c3..c654b5f19 100644
--- a/app/views/layouts/application.html.haml
+++ b/app/views/layouts/application.html.haml
@@ -10,4 +10,5 @@
     .container
       = yield
     .footer
+      Powered by
       = link_to 'Mastodon', 'https://github.com/Gargron/mastodon', class: 'mastodon-link'
diff --git a/app/views/profile/_status.html.haml b/app/views/profile/_status.html.haml
index 91c4fad26..44c58b84e 100644
--- a/app/views/profile/_status.html.haml
+++ b/app/views/profile/_status.html.haml
@@ -3,7 +3,7 @@
     .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'
+      = link_to display_name(status.account), profile_url(status.account), 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 f29abf27b..817d19a68 100644
--- a/app/views/profile/_status_footer.html.haml
+++ b/app/views/profile/_status_footer.html.haml
@@ -1,4 +1,4 @@
-.counter.counter-retweets
+.counter.counter-reblogs
   %i.fa.fa-retweet
   %span.num= status.reblogs.count
 
@@ -7,4 +7,4 @@
   %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'
+  = link_to 'View conversation', status_url(status.thread), class: 'conversation-link'
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
-- 
cgit