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>