Adjusting design of public pages, optimizing account page queries

3 files changed, 19 insertions, 9 deletions

diff --git a/app/views/accounts/show.html.haml b/app/views/accounts/show.html.haml
index ea55b655b..9f665e8c3 100644
--- a/app/views/accounts/show.html.haml
+++ b/app/views/accounts/show.html.haml
@@ -4,11 +4,21 @@
 
 .card
   .avatar= image_tag @account.avatar.url(:large)
-  .bio
-    %h1.name
-      = @account.display_name.blank? ? @account.username : @account.display_name
-      %small= "@#{@account.username}"
-
+  %h1.name
+    = @account.display_name.blank? ? @account.username : @account.display_name
+    %small= "@#{@account.username}"
+  .details
+    .counter
+      %span.counter-label Posts
+      %span.counter-number= @account.statuses.count
+    .counter
+      %span.counter-label Following
+      %span.counter-number= @account.following.count
+    .counter
+      %span.counter-label Followers
+      %span.counter-number= @account.followers.count
+    .bio
+      %p= @account.note
 .activity-stream
-  - @account.statuses.order('id desc').each do |status|
+  - @statuses.each do |status|
     = render partial: 'stream_entries/status', locals: { status: status, include_threads: false, is_successor: false, is_predecessor: false }
diff --git a/app/views/stream_entries/_follow.html.haml b/app/views/stream_entries/_follow.html.haml
index c1c081374..f19e8783d 100644
--- a/app/views/stream_entries/_follow.html.haml
+++ b/app/views/stream_entries/_follow.html.haml
@@ -1,5 +1,5 @@
 .entry.entry-follow
   .content
-    %strong= follow.account.acct
+    %strong= link_to follow.account.acct, account_path(follow.account)
     is now following
-    %strong= follow.target_account.acct
+    %strong= link_to follow.target_account.acct, url_for_target(follow.target_account)
diff --git a/app/views/stream_entries/show.html.haml b/app/views/stream_entries/show.html.haml
index 6286daf53..a951120ac 100644
--- a/app/views/stream_entries/show.html.haml
+++ b/app/views/stream_entries/show.html.haml
@@ -1,5 +1,5 @@
 - content_for :header_tags do
   %link{ rel: 'alternate', type: 'application/atom+xml', href: account_stream_entry_url(@account, @stream_entry, format: 'atom') }/
 
-.activity-stream
+.activity-stream.activity-stream-headless
   = render partial: @type, locals: { @type.to_sym => @stream_entry.activity, include_threads: true, is_predecessor: false, is_successor: false }