diff --git a/app/controllers/courses_controller.rb b/app/controllers/courses_controller.rb
index b7dbb5822..042e57ee6 100644
--- a/app/controllers/courses_controller.rb
+++ b/app/controllers/courses_controller.rb
@@ -8,7 +8,7 @@ class CoursesController < ApplicationController
       course = Project.find(params[:object_id])
       if params[:course_password] == Course.find_by_extra(course.identifier).password
       members = []
-      members << Member.new(:role_ids => [5], :user_id => User.current.id)
+      members << Member.new(:role_ids => [10], :user_id => User.current.id)
       course.members << members
   
       StudentsForCourse.create(:student_id => User.current.id, :course_id => params[:object_id])
diff --git a/app/views/layouts/base_courses.html.erb b/app/views/layouts/base_courses.html.erb
index 39203679c..cb1694629 100644
--- a/app/views/layouts/base_courses.html.erb
+++ b/app/views/layouts/base_courses.html.erb
@@ -52,15 +52,15 @@
 							<div class="spaceleft">
 								<!--informations-->
 								<div class="inf_user_image">
-									<% @project = Project.find_by_id(@project.id)%>
-									<% @course = Course.find_by_extra(@project.identifier)%>
+									<% @project = Project.find_by_id(@project.id) %>
+									<% @course = Course.find_by_extra(@project.identifier) %>
 									<table>
 										<tr>
 											<td><% if(@project.project_type==1) %>
 											<% if get_avatar?(@project) %>
 											<%= image_tag(url_to_avatar(@project), :class => "avatar2") %>
 											<% else %>
-											<%= link_to image_tag('../images/avatars/Project/course.jpg',  :class => "avatar2"), project_path(@project)%>
+											<%= link_to image_tag('../images/avatars/Project/course.jpg',  :class => "avatar2"), project_path(@project) %>
 											<% end %>
 											<% else %>
 											<%= image_tag(url_to_avatar(@project), :class => "avatar2") %>
@@ -69,12 +69,12 @@
 											<div class="info_font" style=" word-wrap: break-word; word-break: break-all">
 												<%= @project.name %>
 											</div> 
-											<%if User.current.logged?%>
-												<% if @course.teacher.id == User.current.id%>
+											<%if User.current.logged? %>
+												<% if @course.teacher.id == User.current.id %>
 													</br><%= link_to l(:label_course_modify_settings), {:controller => 'projects', :action => 'settings', :id => @project} %>
 												<% else %>
 										
-													<%= join_in_course(@project, User.current)%></div>
+													<%= join_in_course(@project, User.current) %></div>
 												<% end %> 
 												<% unless User.current.member_of?(@project) %>
 												<!-- <%= image_tag "/images/fav.png" %> -->
diff --git a/app/views/projects/settings/_members.html.erb b/app/views/projects/settings/_members.html.erb
index bbc598e20..828cb7f8c 100644
--- a/app/views/projects/settings/_members.html.erb
+++ b/app/views/projects/settings/_members.html.erb
@@ -1,20 +1,6 @@
 <%= error_messages_for 'member' %>
-<% if @project.project_type == 1 %>
-<% r = [] %>
-<% for i in 3..5 %>
-<% roles = Role.givable.all[i]
-   members = @project.member_principals.includes(:roles, :principal).all.sort %>
-   <% r << roles %>     
-   <% end %>
-<% else %>
-<% r = [] %>
-<% for i in 0..2 %>
-<% roles = Role.givable.all[i]
+<% roles = Role.find_all_givable
    members = @project.member_principals.includes(:roles, :principal).all.sort %>
-   <% r << roles %>     
-   <% end %>
-
-<% end %>
 <div class="splitcontentleft">
 <% if members.any? %>
 <table class="list members">
@@ -30,11 +16,40 @@
   <tr id="member-<%= member.id %>" class="<%= cycle 'odd', 'even' %> member">
   <td class="<%= member.principal.class.name.downcase %>"><%= link_to_user member.principal %></td>
   <td class="roles">
-    <span id="member-<%= member.id %>-roles"><%=h member.roles.sort.collect(&:to_s).join(', ') %></span>
+    <span id="member-<%= member.id %>-roles"><!-- <%=h member.roles.sort.collect(&:to_s).join(', ') %> -->
+    	<!--modified by huang for: -->
+     <% if @project.project_type == 1 %>     				       
+      	<% if member.roles.sort.collect(&:to_s).join(', ') =='Manager' %>
+      	老师      
+      	<% else %>
+      	<%=h member.roles.sort.collect(&:to_s).join(', ') %>
+      	<% end %>	      	 
+     <% else %>         	
+      	<%=h member.roles.sort.collect(&:to_s).join(', ') %>
+     <% end %>
+    </span>
       <%= form_for(member, {:as => :membership, :remote => true, :url => membership_path(member),
                                           :method => :put,
                                           :html => { :id => "member-#{member.id}-roles-form", :class => 'hol' }}
              ) do |f| %>
+ <!--added by huang for: filer the roles-->
+<%= error_messages_for 'member' %>
+<% if @project.project_type == 1 %>
+<% r = [] %>
+<% for i in 3..5 %>
+<% roles = Role.givable.all[i]
+   members = @project.member_principals.includes(:roles, :principal).all.sort %>
+   <% r << roles %>     
+   <% end %>
+<% else %>
+<% r = [] %>
+<% for i in 0..2 %>
+<% roles = Role.givable.all[i]
+   members = @project.member_principals.includes(:roles, :principal).all.sort %>
+   <% r << roles %>     
+   <% end %>
+<% end %>
+<!--end-->                                      
         <p><% r.each do |role| %>
         <label><%= check_box_tag 'membership[role_ids][]', role.id, member.roles.include?(role),
                                                        :disabled => member.member_roles.detect {|mr| mr.role_id == role.id && !mr.inherited_from.nil?} %> <%=h role %></label><br />
@@ -46,14 +61,34 @@
              %></p>
       <% end %>
   </td>
-  <td class="buttons">
-      <%= link_to_function l(:button_edit),
+  <!--modified by huang for: if the user'roles is Manager that he will can't modified himself-->
+  <%= error_messages_for 'member' %>
+<% roles = Role.find_all_givable
+   members = @project.member_principals.includes(:roles, :principal).all.sort %>
+  <% if @project.project_type == 1 %>
+  	<%if member.roles.first.to_s == "Manager" %>
+ 		 <td class="buttons"></td> 
+  	<% else %>
+  		<td class="buttons">
+     	 <%= link_to_function l(:button_edit),
                            "$('#member-#{member.id}-roles').hide(); $('#member-#{member.id}-roles-form').show(); return false;",
                            :class => 'icon icon-edit' %>
-      <%= delete_link membership_path(member),
+     	 <%= delete_link membership_path(member),
                       :remote => true,
-                      :data => (!User.current.admin? && member.include?(User.current) ? {:confirm => l(:text_own_membership_delete_confirmation)} : {}) if member.deletable? %>
-  </td>
+                      :data => (!User.current.admin? && member.include?(User.current) ? {:confirm => l(:text_own_membership_delete_confirmation)} : {}) if member.deletable? %> 
+  		</td>   
+    <% end %>
+  <% else %> 
+   		<td class="buttons">
+     	 <%= link_to_function l(:button_edit),
+                           "$('#member-#{member.id}-roles').hide(); $('#member-#{member.id}-roles-form').show(); return false;",
+                           :class => 'icon icon-edit' %>
+     	 <%= delete_link membership_path(member),
+                      :remote => true,
+                      :data => (!User.current.admin? && member.include?(User.current) ? {:confirm => l(:text_own_membership_delete_confirmation)} : {}) if member.deletable? %> 
+  		</td>  
+  <% end %>
+  <!--end-->
   <%= call_hook(:view_projects_settings_members_table_row, { :project => @project, :member => member}) %>
   </tr>
 <% end; reset_cycle %>
@@ -64,6 +99,25 @@
 <% end %>
 </div>
 
+<!--added by huang for: filer the roles-->
+<%= error_messages_for 'member' %>
+<% if @project.project_type == 1 %>
+<% r = [] %>
+<% for i in 3..5 %>
+<% roles = Role.givable.all[i]
+   members = @project.member_principals.includes(:roles, :principal).all.sort %>
+   <% r << roles %>     
+   <% end %>
+<% else %>
+<% r = [] %>
+<% for i in 0..2 %>
+<% roles = Role.givable.all[i]
+   members = @project.member_principals.includes(:roles, :principal).all.sort %>
+   <% r << roles %>     
+   <% end %>
+<% end %>
+<!--end-->
+
 <div class="splitcontentright">
 <% if r.any? %>
   <%= form_for(@member, {:as => :membership, :url => project_memberships_path(@project), :remote => true, :method => :post}) do |f| %>
@@ -75,7 +129,7 @@
     <div id="principals_for_new_member">
       <%= render_principals_for_new_members(@project) %>
     </div>
-
+ <!--show the roles which will select-->
     <p style="padding-top: 5px"><%= l(:label_role_plural) %>:    	    	
     <% r.each do |role| %>