From 6eff8c50454bb1abd2425affc4a6a82aee1faf29 Mon Sep 17 00:00:00 2001
From: wanglinchun <123@163.com>
Date: Sat, 10 Aug 2013 20:44:13 +0800
Subject: [PATCH] =?UTF-8?q?=E5=9C=A8=E7=94=A8=E6=88=B7=E5=88=97=E8=A1=A8?=
 =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E7=B2=89=E4=B8=9D=E3=80=81=E5=85=B3=E6=B3=A8?=
 =?UTF-8?q?=E3=80=81=E8=B5=9E=E7=9A=84=E6=95=B0=E5=AD=97?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/views/users/index.html.erb | 9 ++++++++-
 config/locales/zh.yml          | 5 ++++-
 2 files changed, 12 insertions(+), 2 deletions(-)

diff --git a/app/views/users/index.html.erb b/app/views/users/index.html.erb
index 2f29210f7..0bf0642dd 100644
--- a/app/views/users/index.html.erb
+++ b/app/views/users/index.html.erb
@@ -92,9 +92,16 @@
 		<%= content_tag "p", "#{format_date(user.created_on)}#{l(:label_member_since)}", :class => "float_right member_since" %>
 		<%= image_tag "/images/time_member.png", :class => "img_member_time"%>
 		<!-- <%= get_avatar?(user) ? (link_to image_tag(avatar_image(user), :class => 'avatar'), user_path(user),  :class => "avatar") :  (link_to image_tag("/images/12_50.png", :class => 'avatar'), user_path(user), :class => "avatar") %> -->
+	<div>
 		<%= link_to image_tag(url_to_avatar(user), :class => 'avatar'), user_path(user)  %>
 		<%= content_tag "span", link_to_user(user), :class => "nomargin avatar_name" %>
-		<%= content_tag "span", content_tag("p", user.firstname), :class => "clear avatar_name" %>
+	</div>
+	  <div style="margin-top: 20px;margin-left:66px">
+		<%= l(:label_has_fans,:count=>user.watcher_users.count)%>
+		<%= l(:label_has_watchers,:count=>User.watched_by(user.id).count) %>
+		<%= l(:label_has_praisers,:count=>get_praise_num(user))%>
+	  </div>
+	  <!--<%= content_tag "span", content_tag("p", user.firstname), :class => "clear avatar_name" %>-->
 		<div class="user-bottom">
 			<% unless user.memberships.empty? %>
 			<%= l(:label_contribute_to, :project_count => "#{user.memberships.count}") %>
diff --git a/config/locales/zh.yml b/config/locales/zh.yml
index b7f63410e..bca508b3e 100644
--- a/config/locales/zh.yml
+++ b/config/locales/zh.yml
@@ -1210,4 +1210,7 @@ zh:
   label_create_course: 创建课程
   label_news: 新闻
   label_milestone: 里程碑
-  label_features: 特性
\ No newline at end of file
+  label_features: 特性
+  label_has_praisers: 赞(%{count})
+  label_has_watchers: 关注(%{count})
+  label_has_fans: 粉丝(%{count})
\ No newline at end of file