From caff0f55c968cb2e55d5e50c3d5a40bd829c8bbc Mon Sep 17 00:00:00 2001
From: wanglinchun <sxszwlc@sina.cn>
Date: Thu, 8 May 2014 18:38:09 +0800
Subject: [PATCH] =?UTF-8?q?=E8=B0=83=E6=95=B4=E4=BA=86=E7=AB=9E=E8=B5=9B?=
 =?UTF-8?q?=E9=A1=B5=E9=9D=A2=E4=B8=AD=E5=8F=82=E8=B5=9B=E4=BD=9C=E5=93=81?=
 =?UTF-8?q?=E6=95=B0=E9=87=8F=E7=BB=9F=E8=AE=A1=E5=8F=8A=E8=B7=B3=E8=BD=AC?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/views/layouts/base_newcontest.html.erb | 18 ++++++++++++------
 config/locales/zh.yml                      |  3 ++-
 2 files changed, 14 insertions(+), 7 deletions(-)

diff --git a/app/views/layouts/base_newcontest.html.erb b/app/views/layouts/base_newcontest.html.erb
index 07654eddb..479e74e4c 100644
--- a/app/views/layouts/base_newcontest.html.erb
+++ b/app/views/layouts/base_newcontest.html.erb
@@ -98,19 +98,25 @@
 										<tr align="center" width="80px">										                          
 											<!-- <td class="font_index">
 												<%=link_to "#{@contest.join_in_competitions.count}",:controller => "contests",:action => "show_participator" %>
-											</td> -->											
+											</td> -->	
+											<!--关注人数-->										
 											<td class="font_index">
 												<%=link_to "#{@contest.projects.where('is_public=1').count}", :controller => 'contests', :action => 'show_project' %>
-											</td>	
-											<td class="font_index">
-												<%=link_to "#{@contest.contesting_softapplications.count}", :controller => 'contests', :action => 'show_softapplication' %>
+											</td>
+											<!--参赛作品数量-->	
+											<td class="font_index"> 
+												<% if @contest.id == 2 or @contest.id == 3 or @contest.id == 6 %>
+													<%=link_to "#{@contest.projects.where('is_public=1').count}", :controller => 'contests', :action => 'show_attendingcontest' %>
+												<% else %>
+													<%=link_to "#{@contest.contesting_softapplications.count}", :controller => 'contests', :action => 'show_attendingcontest' %>
+												<% end %>
 											</td>	
 											
 											</tr>																														
 										<tr class="font_aram">
 											<!-- <td align="center" width="70px"> <%= l(:label_participate) %></td>  -->										
-											<td align="center" width="70px"> <%= l(:label_contest_project) %></td>	
-											<td align="center" width="70px"> <%= l(:label_contest_application) %></td>		
+											<td align="center" width="70px"> <%= l(:label_contest_watchers) %></td>	
+											<td align="center" width="70px"> <%= l(:label_contest_work) %></td>		
 																												
 										</tr>
 									</table>
diff --git a/config/locales/zh.yml b/config/locales/zh.yml
index 1b3d0e23c..228145dfb 100644
--- a/config/locales/zh.yml
+++ b/config/locales/zh.yml
@@ -1840,8 +1840,9 @@ zh:
   label_contest_project: 参赛项目
   label_contest_softapplication: 参赛应用
   label_contest_response: 用户反馈
-  label_contest_watchers: 关注人员
+  label_contest_watchers: 关注人数
   label_contest_application: 参赛应用
+  label_contest_work: 参赛作品
   button_contesting_as_project: 我要参赛（新建项目）
   button_contesting_as_application: 我要参赛（发布应用）
   label_release_softapplication: 发布应用