From 647781effa4a3039589599260374c27c73aea3fb Mon Sep 17 00:00:00 2001
From: nieguanghui <hust.ud.hui@gmail.com>
Date: Sat, 17 Aug 2013 10:44:25 +0800
Subject: [PATCH] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E7=B2=89=E4=B8=9D=E5=92=8C?=
 =?UTF-8?q?=E5=85=B3=E6=B3=A8=E5=A4=84=E6=9B=B4=E5=A4=9A=E7=9A=84=E9=93=BE?=
 =?UTF-8?q?=E6=8E=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/helpers/application_helper.rb     | 16 ++++++++++++++++
 app/views/layouts/base_users.html.erb |  8 +++++++-
 app/views/welcome/index.html.erb      |  2 +-
 3 files changed, 24 insertions(+), 2 deletions(-)

diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb
index 0bf1567e2..d268e1007 100644
--- a/app/helpers/application_helper.rb
+++ b/app/helpers/application_helper.rb
@@ -1300,6 +1300,14 @@ module ApplicationHelper
   
 #added by nie
 # Display watcher picture
+  def show_more_watchers?(obj)
+    if User.watched_by(obj.id).count > 12
+      return true
+    else
+      return false
+    end
+  end
+  
   def show_watcher_profile(obj)
     count = 0
     html = ''
@@ -1314,6 +1322,14 @@ module ApplicationHelper
   end
 
 #display fans picture
+  def show_more_fans?(obj)
+    if obj.watcher_users.count > 12
+      return true
+    else
+      return false
+    end
+  end
+  
   def show_fans_picture(obj)
     html = ''
     count = 0
diff --git a/app/views/layouts/base_users.html.erb b/app/views/layouts/base_users.html.erb
index f00000a31..635120f85 100644
--- a/app/views/layouts/base_users.html.erb
+++ b/app/views/layouts/base_users.html.erb
@@ -69,7 +69,7 @@
 										</table>
 
 									</div>
-									
+									<!--Modified by nie-->
 									<!--tags-->
 									<div class="user_underline"></div>
 									<!-- <div class="user_fans"> -->
@@ -86,6 +86,9 @@
 									<div class="user_fans">
 										<div class="font_title_left">
 											<strong><%= l(:label_user_watcher) %></strong>
+											<% if show_more_watchers?(@user) %>
+											<div  style="font-size: 11px; display: inline; float: right; margin-top: 5px; margin-right: 20px" ><%= link_to l(:label_more), :controller => "users", :action => "user_watchlist"%></div>
+											<% end %>
 										</div>
 
 										<div class="left_wf">
@@ -101,6 +104,9 @@
 									<div class="user_fans">
 										<div class="font_title_left">
 											<strong><%= l(:label_user_fans) %></strong>
+											<% if show_more_fans?(@user) %>
+											<div  style="font-size: 11px; display: inline; float: right; margin-top: 5px; margin-right: 20px" ><%= link_to l(:label_more), :controller => "users", :action => "user_fanslist"%></div>
+											<% end %>
 										</div>
 										<div class="left_wf">
 											<table>
diff --git a/app/views/welcome/index.html.erb b/app/views/welcome/index.html.erb
index b91b638f1..7ab462a34 100644
--- a/app/views/welcome/index.html.erb
+++ b/app/views/welcome/index.html.erb
@@ -137,7 +137,7 @@ software development and software crowdsourcing.</td></tr>
 <!--add by huang-->
 
 <!--add by huang-->
-<div style="height:230px;">
+<div style="height:250px;">
 	<div class="welcone_left">
 		<table width="350px">
 			<tr>