From 271427d29e454ef63fb37b2dd7c1d20b1064c6d7 Mon Sep 17 00:00:00 2001
From: kg <gcm3651@126.com>
Date: Thu, 24 Apr 2014 08:18:14 +0800
Subject: [PATCH] homepage status

---
 app/views/welcome/index.html.erb | 4 ++--
 config/locales/zh.yml            | 6 ++++++
 2 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/app/views/welcome/index.html.erb b/app/views/welcome/index.html.erb
index c1b5bba9..4a6c53c8 100644
--- a/app/views/welcome/index.html.erb
+++ b/app/views/welcome/index.html.erb
@@ -244,13 +244,13 @@
 <div class="clearfix"></div>
 
 <div style="width:100%;">
-	<div style="width:600px;margin:0px auto;margin-top:80px;">
+	<div style="width:600px;margin:0px auto;margin-top:180px;">
 	<table style="width:600px;font-size:15px; color: gray;">
 		<tr>
 			<td><strong>当前网站状态</strong></td>
 			<td>活跃项目：<%=@projectCount%>个</td>
 			<td>私有项目： <%=@projectHidenCount%>个</td>
-			<td>开发者：<%=@developerCount%>个 </td>
+			<td>开发者：<%=@allUsercount%>个 </td>
 		</tr>
 	</table>
 	</div>
diff --git a/config/locales/zh.yml b/config/locales/zh.yml
index 5cc7b7d8..daab3adc 100644
--- a/config/locales/zh.yml
+++ b/config/locales/zh.yml
@@ -1545,6 +1545,7 @@ zh:
   label_sort_by_time: 按时间排序
   label_sort_by_active: 按活跃度排序
   label_sort_by_influence: 按影响力排序
+  label_sort_by_activity: 按动态数排序
   label_bids_published: 发布于
   label_bids_published_ago: 之前
   label_welcome_trustie: Trustie
@@ -1713,6 +1714,11 @@ zh:
     zero: 份资料
     one: 份资料
     other: 份资料
+#added by gcm
+  label_x_activity:
+    zero: 个动态
+    one: 个动态
+    other: 个动态