From a8f30fe85f8acc0cf53986a970b7c7f64330fa3d Mon Sep 17 00:00:00 2001
From: Tim <txz124@sina.com>
Date: Fri, 26 Aug 2016 11:31:54 +0800
Subject: [PATCH] =?UTF-8?q?=E4=B8=AA=E4=BA=BA=E4=B8=BB=E9=A1=B5=EF=BC=8C?=
 =?UTF-8?q?=E8=AF=BE=E7=A8=8B=EF=BC=8C=E9=A1=B9=E7=9B=AE=E5=A4=B4=E5=83=8F?=
 =?UTF-8?q?=E3=80=81logo=E5=A2=9E=E5=8A=A0=E7=BC=96=E8=BE=91=E6=8C=89?=
 =?UTF-8?q?=E9=92=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/views/layouts/_course_base_info.html.erb |  5 ++++-
 app/views/layouts/base_projects.html.erb     |  5 ++++-
 app/views/layouts/new_base_user.html.erb     |  5 ++++-
 public/javascripts/application.js            | 12 ++++++++++++
 4 files changed, 24 insertions(+), 3 deletions(-)

diff --git a/app/views/layouts/_course_base_info.html.erb b/app/views/layouts/_course_base_info.html.erb
index 96edea2f3..566364bc4 100644
--- a/app/views/layouts/_course_base_info.html.erb
+++ b/app/views/layouts/_course_base_info.html.erb
@@ -30,7 +30,10 @@
 
 <div class="cl"></div>
 <div class="sy_class_logo fl">
-  <%= image_tag(url_to_avatar(@course), :width => "96", :height => "96", :alt => "班级logo") %>
+  <div class="pr" style="width: 96px; height:96px;">
+    <%= image_tag(url_to_avatar(@course), :width => "96", :height => "96", :alt => "班级logo") %>
+    <div class="homepageEditProfile undis"><a href="javascript:void(0);" class="homepageEditProfileIcon" title="点击编辑头像"></a></div>
+  </div>
 </div>
 <div class="sy_class_id fl">
   <p>邀 请 码<br />
diff --git a/app/views/layouts/base_projects.html.erb b/app/views/layouts/base_projects.html.erb
index e7b23b3b5..b606fefbd 100644
--- a/app/views/layouts/base_projects.html.erb
+++ b/app/views/layouts/base_projects.html.erb
@@ -50,7 +50,10 @@
     <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") %>
+          <div class="pr" style="width: 64px; height:64px;">
+            <%= image_tag(url_to_avatar(@project), :width => "60", :height => "60") %>
+            <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)%>
diff --git a/app/views/layouts/new_base_user.html.erb b/app/views/layouts/new_base_user.html.erb
index 46cd43ecf..e41db07bc 100644
--- a/app/views/layouts/new_base_user.html.erb
+++ b/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?%>
-            <%=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%>
+            <div class="pr" style="width: 80px; margin:0 auto;">
+              <%=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%>
+              <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 %>
diff --git a/public/javascripts/application.js b/public/javascripts/application.js
index 504fea3cb..95f939ea4 100644
--- a/public/javascripts/application.js
+++ b/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);
+