diff --git a/app/views/layouts/_join_exit_project.html.erb b/app/views/layouts/_join_exit_project.html.erb
index 1d302babf..9cd376c60 100644
--- a/app/views/layouts/_join_exit_project.html.erb
+++ b/app/views/layouts/_join_exit_project.html.erb
@@ -1,19 +1,24 @@
 <div class="pr_info_join fl">
-   <!--关注项目-->
-  <% if ( !(User.current.member_of? @project) && User.current.login?) %>   <!--added by linchun-->
+   <!--关注:非项目成员-->
+  <% if !User.current.member_of?(@project) && User.current.login? && !User.current.admin %>
       <span><%= watcher_link_for_project(@project, User.current) %></span>
   <% end %>
   <!--加入项目 -->
-  <% if ( !(User.current.member_of? @project) && User.current.login?) %>
+  <% if !User.current.member_of?(@project) && User.current.login? && !User.current.admin  %>
       <%= join_in_project_link(@project, User.current) %>
   <% end %>
-  <!--退出项目-->
+  <!--配置项目-->
   <% if User.current.admin? || User.current.allowed_to?({:controller => 'projects', :action => 'settings'}, @project)  %>
       <%= link_to "<span class='pr_setting'></span>#{l(:button_configure)}".html_safe, settings_project_path(@project), :class => "pr_join_a" %>
   <% end %>
-  <% if Member.where(:user_id => User.current.id, :project_id=>@project.id).first.roles.first.to_s.include?("Manager") || User.current.admin? %>
+  <!--项目类型-->
+  <% if (User.current.login? && User.current.member_of?(@project) && Member.where(:user_id => User.current.id, :project_id => @project.id).first.roles.first.to_s.include?("Manager")) || User.current.admin? %>
       <%= link_to "<span class='#{typeclass}'></span>#{text}".html_safe,"javascript:void(0)" ,:onClick => "show_window();", :class => "pr_join_a",:id => "setting_project_type"%>
-  <% else %>
+  <% end %>
+  <!--退出项目-->
+  <% if (User.current.member_of? @project) && User.current.login? &&
+     Member.where(:user_id => User.current.id, :project_id => @project.id).first.roles.first.to_s != "Manager" %>
       <%= exit_project_link(@project) %>
   <% end %>
+
 </div>