From e17b83470694f71c32b4c06b3b99a855b1889bd1 Mon Sep 17 00:00:00 2001
From: sw <939547590@qq.com>
Date: Fri, 31 Jul 2015 16:09:07 +0800
Subject: [PATCH] =?UTF-8?q?=E7=BC=96=E8=BE=91=E8=B5=84=E6=96=99=E6=98=BE?=
 =?UTF-8?q?=E7=A4=BA=E5=9C=A8=E5=A4=B4=E5=83=8F=E7=9A=84=E5=8F=B3=E4=B8=8B?=
 =?UTF-8?q?=E8=A7=92?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/views/layouts/_user_watch_btn.html.erb | 17 ++++++++++-------
 app/views/layouts/base_users_new.html.erb  |  4 +---
 public/stylesheets/users.css               |  4 +++-
 3 files changed, 14 insertions(+), 11 deletions(-)

diff --git a/app/views/layouts/_user_watch_btn.html.erb b/app/views/layouts/_user_watch_btn.html.erb
index 234b81152..578319b68 100644
--- a/app/views/layouts/_user_watch_btn.html.erb
+++ b/app/views/layouts/_user_watch_btn.html.erb
@@ -1,8 +1,11 @@
-<% if(User.current.logged? && User.current!=target)%>
-  <%if(target.watched_by?(User.current))%>
-    <a id="user_watch_id" href="<%= watch_path(:object_type=>
-                              'user',:object_id=>target.id,:target_id=>target.id) %>" class="fr qx_btn mr10" data-method="delete" data-remote="true" title="取消关注">取消关注</a>
-  <% else %>
-    <a id="user_watch_id" href="<%= watch_path(:object_type=>'user',:object_id=>target.id,:target_id=>target.id) %>" class="fr gz_btn mr10" data-method="post" data-remote="true" title="添加关注">关注</a>
-  <% end %>
+<% if User.current.logged?%>
+    <% if User.current == target%>
+        <a href="<%= url_for(:controller => 'my', :action => 'account') %>" class="fr gz_btn mr10 ">编辑资料</a>
+    <%else%>
+        <%if(target.watched_by?(User.current))%>
+            <a id="user_watch_id" href="<%= watch_path(:object_type=> 'user',:object_id=>target.id,:target_id=>target.id) %>" class="fr qx_btn mr10" data-method="delete" data-remote="true" title="取消关注">取消关注</a>
+        <% else %>
+            <a id="user_watch_id" href="<%= watch_path(:object_type=>'user',:object_id=>target.id,:target_id=>target.id) %>" class="fr gz_btn mr10" data-method="post" data-remote="true" title="添加关注">添加关注</a>
+        <% end %>
+    <% end%>
 <% end %>
\ No newline at end of file
diff --git a/app/views/layouts/base_users_new.html.erb b/app/views/layouts/base_users_new.html.erb
index 1f8e10bc9..33973b047 100644
--- a/app/views/layouts/base_users_new.html.erb
+++ b/app/views/layouts/base_users_new.html.erb
@@ -146,9 +146,7 @@
               <span style="font-weight:normal;font-size:12px;color:#FF5722;">(<%=@user.projects.count%>)</span>
             </a>
           </div>
-            <div class="subNav ">
-              <a href="<%= url_for(:controller => 'my', :action => 'account') %>" class=" f14 c_blue02">编辑资料</a>
-            </div>
+
         <% else%>
             <div class="subNav">
               <a href="<%=url_for(:controller => 'users', :action => 'user_courses',:id=>@user.id)%>" class=" f14 c_blue02">
diff --git a/public/stylesheets/users.css b/public/stylesheets/users.css
index 649ce1255..9a809b7ce 100644
--- a/public/stylesheets/users.css
+++ b/public/stylesheets/users.css
@@ -97,7 +97,9 @@ a.select_btn_select{ background:#64bddb; color:#fff;}
 .w70{ width:70px;}
 .h200{ height:200px;}
 /* 个人主页*/
-a.gz_btn{display:block; background:url(../images/pic_uersall.png) -318px -25px no-repeat; width:33px; height:18px; border:1px solid #cdcdcd; color:#333333; padding:0px 0 0 18px;}
+a.edit_btn{display:block; background:url(../images/leftside.png) -1px 0 no-repeat; width:33px; height:18px; border:1px solid #cdcdcd; color:#333333; padding:0px 0 0 18px;}
+a:hover.edit_btn{ color:#ff5722;}
+a.gz_btn{display:block; background:url(../images/pic_uersall.png) -318px -25px no-repeat; width:53px; height:18px; border:1px solid #cdcdcd; color:#333333; padding:0px 0 0 18px;}
 a:hover.gz_btn{ color:#ff5722;}
 a.qx_btn{display:block; background:url(../images/pic_uersall.png) -318px -47px no-repeat; width:53px; height:18px; border:1px solid #cdcdcd; color:#333333; padding:0px 0 0 18px;}
 a:hover.qx_btn{color:#64bdd9;}