Merge branch 'cxt_course' of https://git.trustie.net/jacknudt/trustieforge into cxt_course

Conflicts:
	app/views/layouts/_course_base_info.html.erb
	app/views/layouts/base_projects.html.erb
	app/views/layouts/new_base_user.html.erb

app/views/layouts/_course_base_info.html.erb

@@ -30,11 +30,14 @@
 
 <div class="cl"></div>
 <div class="sy_class_logo fl">
+  <div class="pr" style="width: 96px; height:96px;">
      <% 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 class="homepageEditProfile undis"><a href="javascript:void(0);" class="homepageEditProfileIcon" title="点击编辑头像"></a></div>
+  </div>
 </div>
 <div class="sy_class_id fl">
   <p>邀 请 码<br />

app/views/layouts/base_projects.html.erb

@@ -50,11 +50,14 @@
     <div id="LSide" class="fl">
       <div class="project_info">
         <div class="pr_info_logo fl mr10 mb5">
+          <div class="pr" style="width: 64px; height:64px;">
             <% 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 class="homepageEditProfile undis"><a href="javascript:void(0);" class="homepageEditProfileIcon" title="点击编辑Logo"></a></div>
+          </div>
         </div>
         <div class="pr_info_id fl mb5 f14">
           <%= l(:label_project_ivite_code)%>

app/views/layouts/new_base_user.html.erb

@@ -103,7 +103,10 @@
     <div class="homepageLeft mt10" id="LSide">
       <div class="user_leftinfo mb10">
         <% if User.current.logged?%>
+            <div class="pr" style="width: 80px; margin:0 auto;">
             <%=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%>
+              <div class="homepageEditProfile undis"><a href="javascript:void(0);" class="homepageEditProfileIcon" title="点击编辑Logo"></a></div>
+            </div>
         <% else %>
             <img src="images/user/male.jpg" width="74" height="74" />
         <% end %>

public/javascripts/application.js

@@ -2099,3 +2099,15 @@ function throttle_me(method, context, e, condition, url){
     },500);
 }
 
+//头像、logo编辑图标显隐
+function edit_img(){
+    $(".homepageEditProfile").parent().mouseover(function(){
+        $(".homepageEditProfile").show();
+    });
+    $(".homepageEditProfile").parent().mouseout(function(){
+        $(".homepageEditProfile").hide();
+    });
+}
+
+$(document).ready(edit_img);
+