From fdcb68bd6945a8a32ad54d8c636ea312f39e5b78 Mon Sep 17 00:00:00 2001
From: wanglinchun <sxszwlc@sina.cn>
Date: Tue, 31 Dec 2013 11:12:39 +0800
Subject: [PATCH] =?UTF-8?q?=E5=BD=93=E7=94=A8=E6=88=B7=E6=9C=AA=E7=99=BB?=
 =?UTF-8?q?=E9=99=86=E7=9A=84=E6=97=B6=E5=80=99=EF=BC=8C=E9=9A=90=E8=97=8F?=
 =?UTF-8?q?=E6=8E=89=E4=BA=86=E2=80=9C=E8=BD=AF=E4=BB=B6=E4=BC=97=E5=8C=85?=
 =?UTF-8?q?=E2=80=9D=E4=B8=AD=E7=9A=84=E2=80=9C=E9=80=89=E4=B8=BA=E4=BD=9C?=
 =?UTF-8?q?=E4=B8=9A=E2=80=9D=20=E5=BD=93=E7=94=A8=E6=88=B7=E6=9C=AA?=
 =?UTF-8?q?=E7=99=BB=E9=99=86=E7=9A=84=E6=97=B6=E5=80=99=EF=BC=8C=E9=9A=90?=
 =?UTF-8?q?=E8=97=8F=E6=8E=89=E4=BA=86=E2=80=9C=E9=A1=B9=E7=9B=AE=E6=89=98?=
 =?UTF-8?q?=E7=AE=A1=E2=80=9D=E3=80=81=E2=80=9C=E5=88=9B=E6=96=B0=E7=AB=9E?=
 =?UTF-8?q?=E8=B5=9B=E2=80=9D=E4=BB=A5=E5=8F=8A=E2=80=9C=E8=BD=AF=E4=BB=B6?=
 =?UTF-8?q?=E4=BC=97=E5=8C=85=E2=80=9D=20=E5=85=B3=E6=B3=A8=20=E5=89=8D?=
 =?UTF-8?q?=E7=9A=84=E6=98=9F=E5=8F=B7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/views/layouts/base_bids.html.erb     | 4 +++-
 app/views/layouts/base_contest.html.erb  | 4 +++-
 app/views/layouts/base_projects.html.erb | 5 +++--
 3 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/app/views/layouts/base_bids.html.erb b/app/views/layouts/base_bids.html.erb
index 48a67b400..5c680ce9b 100644
--- a/app/views/layouts/base_bids.html.erb
+++ b/app/views/layouts/base_bids.html.erb
@@ -68,13 +68,15 @@
 												<table>
 													<tr>
 														<td class="info_font" style=" word-wrap: break-word; word-break: break-all"><%= h @bid.name %></td>
-													</tr>												
+													</tr>	
+													<% if ( !(User.current.member_of? @project) && User.current.login?) %>											
 													<tr>
 														<td align="center"> <%= link_to(l(:label_fork_homework_new), fork_path(@bid)) %></td>
 													</tr>
 													<tr>
 														<td align="center"> <span style="margin-right:10px;"><span class="icon-fav icon"></span><%= watcher_link(@bid, User.current) %></span></td>
 													</tr>
+													<% end %>
 												</table></td>
 											</tr>
 										</table>
diff --git a/app/views/layouts/base_contest.html.erb b/app/views/layouts/base_contest.html.erb
index cbc2173b1..5dc4e7574 100644
--- a/app/views/layouts/base_contest.html.erb
+++ b/app/views/layouts/base_contest.html.erb
@@ -59,13 +59,15 @@
 												<table>
 													<tr>
 														<td class="info_font" style=" word-wrap: break-word; word-break: break-all"><%= h @bid.name %></td>
-													</tr>															
+													</tr>	
+													<% if ( !(User.current.member_of? @project) && User.current.login?) %>		<!--added by linchun-->												
 													<tr colspan='3'>
 														<td valign="middle">
 															<span style="display:block; margin-left:20px;"><%= join_in_contest(@bid, User.current)%></span>
 															<span style="display:block; margin-left:20px;"><span class="icon-fav icon"></span><%= watcher_link(@bid, User.current) %></span>
 														</td>
 												   </tr>
+												   <% end %>
 												</table>									
 							   <!-- added by bai 增加了竞赛的配置 -->
 														<% if User.current.logged? %>
diff --git a/app/views/layouts/base_projects.html.erb b/app/views/layouts/base_projects.html.erb
index 682791923..794623dd2 100644
--- a/app/views/layouts/base_projects.html.erb
+++ b/app/views/layouts/base_projects.html.erb
@@ -57,8 +57,9 @@
 												<div class="info-course">
 													<%= @project.name %>
 												</div>
-												<div style="margin-left: 20px;">		
-													<% unless User.current.member_of? @project %>
+												<div style="margin-left: 20px;">
+													
+													<% if ( !(User.current.member_of? @project) && User.current.login?) %>   <!--added by linchun-->	
 													<span class="icon-fav icon"></span><%= watcher_link(@project, User.current) %>
 													<% end %>
 												</div>