From 5de6759917329bd90eb5ebfa0004b73d9f5f581c Mon Sep 17 00:00:00 2001
From: Yoong Kang Lim <yoongkang.lim@gmail.com>
Date: Fri, 21 Nov 2014 00:29:45 +1100
Subject: [PATCH] Moved number of follows/followers under activity and added
 pagination.

---
 app/controllers/members_controller.rb      |  4 ++--
 app/views/members/_account.html.haml       |  7 -------
 app/views/members/_stats.html.haml         | 13 +++++++++++++
 app/views/members/view_followers.html.haml | 11 ++++++++---
 app/views/members/view_follows.html.haml   | 10 ++++++++--
 5 files changed, 31 insertions(+), 14 deletions(-)

diff --git a/app/controllers/members_controller.rb b/app/controllers/members_controller.rb
index dbdaaf9ef..ac53f4194 100644
--- a/app/controllers/members_controller.rb
+++ b/app/controllers/members_controller.rb
@@ -36,12 +36,12 @@ class MembersController < ApplicationController
 
   def view_follows
     @member = Member.confirmed.find(params[:login_name])
-    @follows = @member.followed
+    @follows = @member.followed.paginate(:page => params[:page])
   end
 
   def view_followers
     @member = Member.confirmed.find(params[:login_name])
-    @followers = @member.followers
+    @followers = @member.followers.paginate(:page => params[:page])
   end
 
 end
diff --git a/app/views/members/_account.html.haml b/app/views/members/_account.html.haml
index e44bae027..68dfbd591 100644
--- a/app/views/members/_account.html.haml
+++ b/app/views/members/_account.html.haml
@@ -9,10 +9,3 @@
   = member.account_type
   account
 
-%p
-  %strong Following:
-  = link_to member.follows.count, member_follows_path(member)
-
-%p
-  %strong Followed by:
-  = link_to member.followers.count, member_followers_path(member)
diff --git a/app/views/members/_stats.html.haml b/app/views/members/_stats.html.haml
index 38d6b96c3..0929e5998 100644
--- a/app/views/members/_stats.html.haml
+++ b/app/views/members/_stats.html.haml
@@ -21,3 +21,16 @@
       = link_to pluralize(member.posts.count, "post"), posts_by_author_path(:author => member)
     - else
       0 posts
+
+  %li
+    - if member.followed.count > 0
+      = link_to pluralize(member.followed.count, "follow"), member_follows_path(member)
+    - else
+      0 following
+
+  %li
+    - if member.followers.count > 0
+      = link_to pluralize(member.followers.count, "follower"), member_followers_path(member)
+    - else
+      0 followers
+
diff --git a/app/views/members/view_followers.html.haml b/app/views/members/view_followers.html.haml
index e196a8130..25a10a860 100644
--- a/app/views/members/view_followers.html.haml
+++ b/app/views/members/view_followers.html.haml
@@ -1,6 +1,8 @@
-- content_for :title, @member.login_name
+- content_for :title, "#{@member.login_name}'s followers"
 
-%p Followed by: 
+%div.pagination
+  = page_entries_info @followers, :model => "members"
+  = will_paginate @followers
 
 .row
   .col-md-12
@@ -8,4 +10,7 @@
       .col-md-4.three-across      
         .thumbnail 
           = render :partial => "members/thumbnail", :locals => { :member => f }
-          
\ No newline at end of file
+          
+%div.pagination
+  = page_entries_info @followers, :model => "members"
+  = will_paginate @followers
\ No newline at end of file
diff --git a/app/views/members/view_follows.html.haml b/app/views/members/view_follows.html.haml
index ee2248239..93d2695ac 100644
--- a/app/views/members/view_follows.html.haml
+++ b/app/views/members/view_follows.html.haml
@@ -1,6 +1,8 @@
-- content_for :title, @member.login_name
+- content_for :title, "#{@member.login_name}'s follows"
 
-%p Follows: 
+%div.pagination
+  = page_entries_info @follows, :model => "members"
+  = will_paginate @follows
 
 .row
   .col-md-12
@@ -8,3 +10,7 @@
       .col-md-4.three-across      
         .thumbnail 
           = render :partial => "members/thumbnail", :locals => { :member => f }
+
+%div.pagination
+  = page_entries_info @follows, :model => "members"
+  = will_paginate @follows
\ No newline at end of file