diff --git a/app/controllers/avatar_controller.rb b/app/controllers/avatar_controller.rb
index b5c174b0c..9d90cb9f2 100644
--- a/app/controllers/avatar_controller.rb
+++ b/app/controllers/avatar_controller.rb
@@ -12,11 +12,13 @@ class AvatarController < ApplicationController
       @source_id = params[:source_id]
       @temp_file = params[:avatar][:image]
       @image_file = @temp_file.original_filename
+      @is_direct = params[:is_direct]
     else
       unless request.raw_post.nil?
         @source_type = params[:source_type]
         @source_id = params[:source_id]
         @temp_file = request.raw_post
+        @is_direct = params[:is_direct]
         if @temp_file.size > 0
           if @temp_file.respond_to?(:original_filename)
             @image_file = @temp_file.original_filename
@@ -38,7 +40,7 @@ class AvatarController < ApplicationController
         @urlfile='/' << File.join("images","avatars",avatar_directory(@source_type),avatar_filename(@source_id,@image_file))
 
         # 用户头像上传时进行特别处理
-        if  @source_type == 'User'
+        if @is_direct == '1' && (@source_type == 'User' || @source_type == 'Course' || @source_type == 'Project')
           diskfile += "temp"
           @urlfile += "temp"
         end
@@ -105,7 +107,7 @@ class AvatarController < ApplicationController
       path = File.dirname(diskfile)
       if File.directory?(path) && File.exist?(diskfile)
         # 用户头像进行特别处理
-        if @source_type == 'User'
+        if @source_type == 'User' || @source_type == 'Course' || @source_type == 'Project'
           diskfile1 = diskfile + 'temp'
           File.open(diskfile1, "wb") do |f|
             buffer = "DELETE"
diff --git a/app/controllers/my_controller.rb b/app/controllers/my_controller.rb
index 05b93d302..858c7e5c3 100644
--- a/app/controllers/my_controller.rb
+++ b/app/controllers/my_controller.rb
@@ -90,14 +90,34 @@ class MyController < ApplicationController
   end
 
   def clear_user_avatar_temp
-    @user = User.current
-    diskfile = disk_filename('User', @user.id)
+    if params[:course]
+      @course = Course.find params[:course]
+      diskfile = disk_filename('Course', @course.id)
+    elsif params[:project]
+      @project = Project.find params[:project]
+      diskfile = disk_filename('Project', @project.id)
+    else
+      @user = User.current
+      diskfile = disk_filename('User', @user.id)
+    end
     diskfile1 = diskfile + 'temp'
     File.delete(diskfile1) if File.exist?(diskfile1)
   end
+
   def save_user_avatar
-    @user = User.current
-    diskfile = disk_filename('User', @user.id)
+    if params[:source_id] && params[:source_type]
+      case params[:source_type]
+        when 'User'
+          @user = User.current
+          diskfile = disk_filename('User', @user.id)
+        when 'Course'
+          @course = Course.find params[:source_id]
+          diskfile = disk_filename('Course', @course.id)
+        when 'Project'
+          @project = Project.find params[:source_id]
+          diskfile = disk_filename('Project', @project.id)
+      end
+    end
     diskfile1 = diskfile + 'temp'
     begin
       FileUtils.mv diskfile1, diskfile, force: true if File.exist? diskfile1
diff --git a/app/views/avatar/_new_avatar_form.html.erb b/app/views/avatar/_new_avatar_form.html.erb
index 2593bf1f5..d13a2a4d5 100644
--- a/app/views/avatar/_new_avatar_form.html.erb
+++ b/app/views/avatar/_new_avatar_form.html.erb
@@ -17,7 +17,8 @@
                            :upload_path => upload_avatar_path(:format => 'js'),
                            :description_placeholder => nil ,# l(:label_optional_description)
                            :source_type => source.class.to_s,
-                           :source_id => source.id.to_s
+                           :source_id => source.id.to_s,
+                           :is_direct => 0
                    } %>
 <!--</span>-->
 <% content_for :header_tags do %>
diff --git a/app/views/avatar/upload.js.erb b/app/views/avatar/upload.js.erb
index 41cf3ab77..c2fa23242 100644
--- a/app/views/avatar/upload.js.erb
+++ b/app/views/avatar/upload.js.erb
@@ -1,4 +1,4 @@
-<% if @source_type=='User' %>
+<% if @is_direct == '1' && (@source_type=='User'|| @source_type == 'Course' || @source_type == 'Project') %>
 var imgSpan = $("img[nhname='avatar_image']");
 imgSpan.attr({"src":'<%= "#{@urlfile.to_s}?#{Time.now.to_i}" %>'});
 <% else %>
diff --git a/app/views/courses/settings.html.erb b/app/views/courses/settings.html.erb
index fabd687e0..0ac041921 100644
--- a/app/views/courses/settings.html.erb
+++ b/app/views/courses/settings.html.erb
@@ -27,9 +27,8 @@
   <div class="hwork_dis" id="tbc_01" style="padding-top: 10px;">
     <ul>
       <%= labelled_form_for @course do |f| %>
-          <li class="ml45 mb10">
+          <li class="ml45 mb10" id="course_avatar_form">
             <%= render :partial => "avatar/new_avatar_form", :locals => {source: @course} %>
-            <div class="cl"></div>
           </li>
           <li class="ml45 mb10">
             <label><span class="c_red">*</span>&nbsp;<%= l(:label_tags_syllabus_name)%>&nbsp;&nbsp;：</label>
diff --git a/app/views/layouts/_course_base_info.html.erb b/app/views/layouts/_course_base_info.html.erb
index 96edea2f3..c1c977462 100644
--- a/app/views/layouts/_course_base_info.html.erb
+++ b/app/views/layouts/_course_base_info.html.erb
@@ -30,7 +30,11 @@
 
 <div class="cl"></div>
 <div class="sy_class_logo fl">
-  <%= image_tag(url_to_avatar(@course), :width => "96", :height => "96", :alt => "班级logo") %>
+  <% if User.current.logged? && (User.current == @course.teacher || User.current.admin?)%>
+      <%=link_to image_tag(url_to_avatar(@course),width:"96", height: "96", :id=>'nh_source_tx'), my_clear_user_avatar_temp_path(:course => @course.id), :remote => true%>
+  <% else %>
+      <%= image_tag(url_to_avatar(@course), :width => "96", :height => "96", :alt => "班级logo") %>
+  <% end %>
 </div>
 <div class="sy_class_id fl">
   <p>邀 请 码<br />
diff --git a/app/views/layouts/_upload_avatar.html.erb b/app/views/layouts/_upload_avatar.html.erb
new file mode 100644
index 000000000..ac6af739f
--- /dev/null
+++ b/app/views/layouts/_upload_avatar.html.erb
@@ -0,0 +1,44 @@
+<div>
+  <div><a href="javascript:hideModal();" class="box_close"></a></div>
+  <div class="cl"></div>
+  <div class="pro_new">
+    <h3 class="box_h3 mb10">头像设置</h3>
+    <div class="uppicBox">
+      <input type="button" class="uppic_btn" onclick="$('#upload_avatar').click();" value="浏览.."/>
+      <%= file_field_tag 'avatar[image]',
+                         :id => "upload_avatar",
+                         :style => 'display:none;',#added by young
+                         :size => "1",
+                         :multiple => false,
+                         :onchange => 'addInputAvatar(this);',
+                         :data => {
+                                 :max_file_size => Setting.attachment_max_size.to_i.kilobytes,
+                                 :max_file_size_message => l(:error_attachment_too_big, :max_size => number_to_human_size(Setting.attachment_max_size.to_i.kilobytes)),
+                                 :max_concurrent_uploads => Redmine::Configuration['max_concurrent_ajax_uploads'].to_i,
+                                 :file_type => Redmine::Configuration['pic_types'].to_s,
+                                 :type_support_message => l(:error_pic_type),
+                                 :upload_path => upload_avatar_path(:format => 'js'),
+                                 :description_placeholder => nil ,# l(:label_optional_description)
+                                 :source_type => source.class.to_s,
+                                 :source_id => source.id.to_s,
+                                 :is_direct => 1
+                         } %>
+      <!--<br/>-->
+      <!--<span>只支持jpg,png,gif,大小不超过5M</span>-->
+    </div>
+    <div class="showpicBox">
+      <p>预览</p>
+      <%= image_tag(url_to_avatar(source), :style=>"width:96px;height:96px;",:class=>"mb5 mt10",:nhname=>'avatar_image') %>
+      <br/>
+      <span >96px*96px</span> <br />
+      <div class="mb20"></div>
+      <%= image_tag(url_to_avatar(source), :style=>"width:48px;height:48px;",:class=>"mb5",:nhname=>'avatar_image') %>
+      <br />
+      <span>48px*48px</span> <br />
+    </div>
+    <div class="cl mb10"></div>
+    <a href="javascript:hideModal();" class=" fr grey_btn mr15 f14"> 取&nbsp;&nbsp;消</a>
+    <a href="<%= url_for(:controller => 'my', :action => 'save_user_avatar', :source_id => source.id, :source_type => source.class.to_s) %>" data-remote="true" class="blue_btn fr mr10 f14">确&nbsp;&nbsp;定</a>
+  </div><!--talknew end-->
+  <div class="cl"></div>
+</div><!--floatbox end-->
\ No newline at end of file
diff --git a/app/views/layouts/base_courses.html.erb b/app/views/layouts/base_courses.html.erb
index 5de64aeba..b6082fb82 100644
--- a/app/views/layouts/base_courses.html.erb
+++ b/app/views/layouts/base_courses.html.erb
@@ -18,7 +18,7 @@
   <%= heads_for_theme %>
   <%= call_hook :view_layouts_base_html_head %>
   <%= stylesheet_link_tag  'jquery/jquery-ui-1.9.2','css/common','css/public', 'css/structure','prettify', 'css/courses','css/popup','sy_public','syllabus'%>
-  <%= javascript_include_tag "course","header","attachments",'prettify' %>
+  <%= javascript_include_tag "course","avatars","header","attachments",'prettify' %>
   <!-- page specific tags -->
   <%= yield :header_tags -%>
   <!-- MathJax的配置 -->
@@ -151,6 +151,9 @@
   <span><%= l(:label_loading) %></span>
 </div>
 <div id="ajax-modal" style="display:none;"></div>
+<div id="nh_tx_dialog_html" class="white_content" style="display:none;">
+  <%=render :partial => 'layouts/upload_avatar', :locals => {:source => @course} %>
+</div>
 <%= call_hook :view_layouts_base_body_bottom %>
 </body>
 <script>
diff --git a/app/views/layouts/base_projects.html.erb b/app/views/layouts/base_projects.html.erb
index e7b23b3b5..1fcef7327 100644
--- a/app/views/layouts/base_projects.html.erb
+++ b/app/views/layouts/base_projects.html.erb
@@ -13,7 +13,7 @@
   <%= javascript_heads %>
   <%= heads_for_theme %>
   <%= stylesheet_link_tag  'jquery/jquery-ui-1.9.2','css/common','css/structure','scm','css/public', 'css/project','css/popup','prettify','repository' %>
-  <%= javascript_include_tag 'cookie','project', 'header','prettify','select_list_move','attachments' %>
+  <%= javascript_include_tag 'cookie','project',"avatars", 'header','prettify','select_list_move','attachments' %>
 
   <%= call_hook :view_layouts_base_html_head %>
   <!-- page specific tags -->
@@ -50,7 +50,11 @@
     <div id="LSide" class="fl">
       <div class="project_info">
         <div class="pr_info_logo fl mr10 mb5">
-          <%= image_tag(url_to_avatar(@project), :width => "60", :height => "60") %>
+          <% if User.current.logged? && (User.current.id == @project.user_id || User.current.admin?)%>
+              <%=link_to image_tag(url_to_avatar(@project),width:"60", height: "60", :id=>'nh_source_tx'), my_clear_user_avatar_temp_path(:project => @project.id), :remote => true%>
+          <% else %>
+              <%= image_tag(url_to_avatar(@project), :width => "60", :height => "60", :alt => "项目logo") %>
+          <% end %>
         </div>
         <div class="pr_info_id fl mb5 f14">
           <%= l(:label_project_ivite_code)%>
@@ -249,6 +253,9 @@
   <span><%= l(:label_loading) %></span>
 </div>
 <div id="ajax-modal" style="display:none;"></div>
+<div id="nh_tx_dialog_html" class="white_content" style="display:none;">
+  <%=render :partial => 'layouts/upload_avatar', :locals => {:source => @project} %>
+</div>
 <%= call_hook :view_layouts_base_body_bottom %>
 </body>
 </html>
diff --git a/app/views/layouts/new_base_user.html.erb b/app/views/layouts/new_base_user.html.erb
index 46cd43ecf..d05850a56 100644
--- a/app/views/layouts/new_base_user.html.erb
+++ b/app/views/layouts/new_base_user.html.erb
@@ -103,7 +103,7 @@
     <div class="homepageLeft mt10" id="LSide">
       <div class="user_leftinfo mb10">
         <% if User.current.logged?%>
-            <%=link_to image_tag(url_to_avatar(@user),width:"74", height: "74", :id=>'nh_user_tx'), my_clear_user_avatar_temp_path, :class => "user_leftinfo_img", :remote => true%>
+            <%=link_to image_tag(url_to_avatar(@user),width:"74", height: "74", :id=>'nh_source_tx'), my_clear_user_avatar_temp_path, :class => "user_leftinfo_img", :remote => true%>
         <% else %>
             <img src="images/user/male.jpg" width="74" height="74" />
         <% end %>
@@ -226,49 +226,7 @@
   <span><%= l(:label_loading) %></span>
 </div>
 <div id="nh_tx_dialog_html" class="white_content" style="display:none;">
-  <div>
-    <div><a href="javascript:hideModal();" class="box_close"></a></div>
-    <div class="cl"></div>
-    <div class="pro_new">
-      <h3 class="box_h3 mb10">头像设置</h3>
-      <div class="uppicBox">
-        <input type="button" class="uppic_btn" onclick="$('#upload_user_image').click();" value="浏览.."/>
-        <%= file_field_tag 'avatar[image]',
-                           :id => "upload_user_image",
-                           :style => 'display:none;',#added by young
-                           :size => "1",
-                           :multiple => false,
-                           :onchange => 'addInputAvatar(this);',
-                           :data => {
-                                   :max_file_size => Setting.attachment_max_size.to_i.kilobytes,
-                                   :max_file_size_message => l(:error_attachment_too_big, :max_size => number_to_human_size(Setting.attachment_max_size.to_i.kilobytes)),
-                                   :max_concurrent_uploads => Redmine::Configuration['max_concurrent_ajax_uploads'].to_i,
-                                   :file_type => Redmine::Configuration['pic_types'].to_s,
-                                   :type_support_message => l(:error_pic_type),
-                                   :upload_path => upload_avatar_path(:format => 'js'),
-                                   :description_placeholder => nil ,# l(:label_optional_description)
-                                   :source_type => @user.class.to_s,
-                                   :source_id => @user.id.to_s
-                           } %>
-        <!--<br/>-->
-        <!--<span>只支持jpg,png,gif,大小不超过5M</span>-->
-      </div>
-      <div class="showpicBox">
-        <p>预览</p>
-        <%= image_tag(url_to_avatar(@user), :style=>"width:96px;height:96px;",:class=>"mb5 mt10",:nhname=>'avatar_image') %>
-        <br/>
-        <span >96px*96px</span> <br />
-        <div class="mb20"></div>
-        <%= image_tag(url_to_avatar(@user), :style=>"width:48px;height:48px;",:class=>"mb5",:nhname=>'avatar_image') %>
-        <br />
-        <span>48px*48px</span> <br />
-      </div>
-      <div class="cl mb10"></div>
-      <a href="javascript:hideModal();" class=" fr grey_btn mr15 f14"> 取&nbsp;&nbsp;消</a>
-      <a href="<%= url_for(:controller => 'my', :action => 'save_user_avatar') %>" data-remote="true" class="blue_btn fr mr10 f14">确&nbsp;&nbsp;定</a>
-    </div><!--talknew end-->
-    <div class="cl"></div>
-  </div><!--floatbox end-->
+  <%=render :partial => 'layouts/upload_avatar', :locals => {:source => @user} %>
 </div>
 <script type="text/javascript">
     $(function(){
diff --git a/app/views/my/clear_user_avatar_temp.js.erb b/app/views/my/clear_user_avatar_temp.js.erb
index 8795177fc..1d1ef48f0 100644
--- a/app/views/my/clear_user_avatar_temp.js.erb
+++ b/app/views/my/clear_user_avatar_temp.js.erb
@@ -1,4 +1,4 @@
-    $("img[nhname='avatar_image']").attr('src',$("#nh_user_tx").attr('src'));
+    $("img[nhname='avatar_image']").attr('src',$("#nh_source_tx").attr('src'));
     $('#ajax-modal').html($("#nh_tx_dialog_html").html());
     showModal('ajax-modal','460px');
     $('#ajax-modal').siblings().hide();
diff --git a/app/views/my/save_user_avatar.js.erb b/app/views/my/save_user_avatar.js.erb
index 1e24a4a7c..01302db87 100644
--- a/app/views/my/save_user_avatar.js.erb
+++ b/app/views/my/save_user_avatar.js.erb
@@ -1,3 +1,14 @@
-$("#nh_user_tx").replaceWith('<%= image_tag(url_to_avatar(@user), :id=>'nh_user_tx',:style=>"width:78px;height:78px;overflow:hidden",:alt=>"头像") %>');
+<% if @user %>
+$("#nh_source_tx").replaceWith('<%= image_tag(url_to_avatar(@user), :id=>'nh_source_tx',:style=>"width:78px;height:78px;overflow:hidden",:alt=>"头像") %>');
 $("#nh_user_logo").replaceWith('<%= image_tag(url_to_avatar(@user), :id=>'nh_user_logo',:width =>"40",:height => "40",:alt=>"头像") %>');
+<% elsif @course %>
+$("#nh_source_tx").replaceWith('<%= image_tag(url_to_avatar(@course), :id=>'nh_source_tx',:style=>"width:96px;height:96px;overflow:hidden",:alt=>"班级logo") %>');
+if($("#course_avatar_form").length > 0) {
+    window.location.href = "<%=settings_course_path(@course) %>";
+}
+<% elsif @project %>
+$("#nh_source_tx").replaceWith('<%= image_tag(url_to_avatar(@project), :id=>'nh_source_tx',:style=>"width:60px;height:60px;overflow:hidden",:alt=>"项目logo") %>');
+if($("#project_avatar_form").length > 0) {
+    window.location.href = "<%=settings_project_path(@project) %>";
+}<% end %>
 hideModal();
\ No newline at end of file
diff --git a/app/views/projects/settings/_new_edit.html.erb b/app/views/projects/settings/_new_edit.html.erb
index 1fa96e602..3a2408504 100644
--- a/app/views/projects/settings/_new_edit.html.erb
+++ b/app/views/projects/settings/_new_edit.html.erb
@@ -1,9 +1,8 @@
 <%= error_messages_for 'project' %>
 <%= labelled_form_for @project do |f| %>
     <ul class="newpro_box ">
-        <li class="ml45 mb10">
+        <li class="ml45 mb10" id="project_avatar_form">
           <%= render :partial=>"avatar/new_avatar_form",:locals=> {source:@project} %>
-          <div class="cl"></div>
         </li>
         <li >
           <label class="label02"><span class="c_red">*</span>&nbsp;项目名称&nbsp;&nbsp;：</label>
diff --git a/public/javascripts/avatars.js b/public/javascripts/avatars.js
index 05b0df2fe..2d7224119 100644
--- a/public/javascripts/avatars.js
+++ b/public/javascripts/avatars.js
@@ -39,7 +39,7 @@
 
             ajaxUpload.uploading++;
 
-            uploadBlob(file, $(inputEl).data('upload-path'),$(inputEl).data('source-type'), $(inputEl).data('source-id'),{
+            uploadBlob(file, $(inputEl).data('upload-path'),$(inputEl).data('source-type'), $(inputEl).data('source-id'),$(inputEl).data('is-direct'),{
                 loadstartEventHandler: onLoadstart.bind(progressSpan),
                 progressEventHandler: onProgress.bind(progressSpan)
             })
@@ -82,14 +82,14 @@
         return false;
     }
 
-    function uploadBlob(blob, uploadUrl, source_type,source_id, options) {
+    function uploadBlob(blob, uploadUrl, source_type,source_id,is_direct, options) {
 
         var actualOptions = $.extend({
             loadstartEventHandler: $.noop,
             progressEventHandler: $.noop
         }, options);
 
-        uploadUrl = uploadUrl + '?source_type=' + source_type + '&source_id=' + source_id;
+        uploadUrl = uploadUrl + '?source_type=' + source_type + '&source_id=' + source_id + '&is_direct=' + is_direct;
         if (blob instanceof window.File) {
             uploadUrl += '&filename=' + encodeURIComponent(blob.name);
         }