Merge remote-tracking branch 'origin/szzh' into szzh

app/views/layouts/_logined_header.html.erb

@@ -62,7 +62,7 @@
   <div class="navHomepageProfile">
     <ul>
       <li class="homepageProfileMenuIcon">
-        <%= link_to "<div class='mt5 mb8'>#{image_tag(url_to_avatar(User.current),:width =>"40",:height => "40",:alt=>"头像", :id => "nh_user_logo")}</div>".html_safe,user_activities_path(User.current.id)%>
+        <%= link_to "<div class='mt5 mb8'>#{image_tag(url_to_avatar(User.current),:width =>"40",:height => "40",:class => "portraitRadius",:alt=>"头像", :id => "nh_user_logo")}</div>".html_safe,user_activities_path(User.current.id)%>
         <ul class="topnav_login_list">
           <li>
             <%= link_to "修改资料", my_account_path, :class => "menuGrey"%>

app/views/layouts/new_base_user.html.erb

@@ -55,7 +55,9 @@
           <% end %>
           <div class="cl"></div>
           <p class="mb8 c_dark f14">教授</p>
-          <%= link_to("编辑资料", my_account_path, :class => "fl gz_btn mr10") if is_current_user%>
+          <%= link_to("编辑资料", my_account_path, :class => "fl UsersEditBtn") if is_current_user%>
+          <a href="javascript:void(0);" class="UsersAttBtn" style="display:none;">添加关注</a>
+          <a href="javascript:void(0);" class="UsersApBtn" style="display:none;">取消关注</a>
         </div>
         <div class="cl"></div>
         <div>

public/stylesheets/new_user.css

@@ -488,6 +488,7 @@ a.homepageSearchIcon:hover {background:url(../images/nav_icon.png) -49px 3px no-
 .homepageNewsIcon {background:url(../images/nav_icon.png) -5px -85px  no-repeat; width:30px; height:35px; display:block;}
 .newsActive {width:10px; height:10px; border-radius:50%; border:2px solid #ffffff; background-color:#ff0000; position:absolute; left:17px; top:5px;}
 .navHomepageProfile {width:65px; display:block; float:right; margin-left:33px;}
+.portraitRadius {border-radius: 5px;}
 .homepageProfileMenuIcon {background:url(../images/nav_icon.png) 30px -155px no-repeat; width:65px; height:54px; position:relative; display:inline-block;}
 .homepageProfileMenuIcon:hover {background:url(../images/nav_icon.png) 30px -122px no-repeat;}
 .navHomepageProfile ul li ul {display:none;}
@@ -504,6 +505,12 @@ a.homepageSearchIcon:hover {background:url(../images/nav_icon.png) -49px 3px no-
 .homepageImageName {font-size:16px; color:#484848; margin-right:5px; height:25px; float:left; font-weight: bold; max-width:78px;overflow: hidden; white-space:nowrap; text-overflow:ellipsis;}
 .homepageImageSexMan {top:116px; left:5px; width:20px; height:20px; background:url(../images/homepage_icon.png) -10px -112px no-repeat; float:left;}
 .homepageImageSexWomen {width: 20px;height: 20px;background: url(../images/homepage_icon.png) -10px -149px no-repeat;float: left;}
+a.UsersEditBtn{ display:block; width:55px; height:20px; border:1px solid #6d6d6d; color:#fff; background:#888888 url(../images/homepage_icon.png) -11px -35px no-repeat; padding-left:25px; line-height:1.9;-moz-border-radius:2px;  -webkit-border-radius:2px;  border-radius:2px;}
+a:hover.UsersEditBtn{ color:#484848;  background:#888888 url(../images/homepage_icon.png) -11px -74px no-repeat;}
+a.UsersAttBtn{ display:block; width:55px; height:20px; border:1px solid #d3d3d3; color:#888888; background:#f2f3f3 url(../images/homepage_icon.png) -9px -6px no-repeat; padding-left:25px; line-height:1.9;-moz-border-radius:2px;  -webkit-border-radius:2px;  border-radius:2px;}
+a:hover.UsersAttBtn{border:1px solid #888888; }
+a.UsersApBtn{ display:block; width:55px; height:20px; border:1px solid #d3d3d3; color:#888888; background:#f2f3f3 url(../images/homepage_icon.png) -177px -6px no-repeat; padding-left:25px; line-height:1.9;-moz-border-radius:2px;  -webkit-border-radius:2px;  border-radius:2px;}
+a:hover.UsersApBtn{border:1px solid #888888; }
 .homepageSignatureTextarea {width:207px; height:80px; max-width:207px; max-height:80px; border:1px solid #d9d9d9; outline:none; margin:0px 0px 12px 15px;;}
 .homepageSignature {font-size:12px; color:#888888; margin:10px 0; width:208px;}
 .homepageImageBlock {margin:0 auto; width:68px; float:left; text-align:center; display:inline-block;}
@@ -515,11 +522,11 @@ a.homepageImageNumber:hover {color:#269ac9;}
 .homepageLeftMenuBlock {border-bottom:1px solid #dddddd; height:50px; line-height:50px; vertical-align:middle;}
 .homepageLeftMenuCourses {font-size:14px; border-bottom:1px solid #dddddd;}
 .homepageLeftMenuCoursesLine {padding-left:25px; height:38px; line-height:38px; vertical-align:middle;}
-.homepageLeftMenuCoursesLine:hover {background-color:#b3e0ee;}
+.homepageLeftMenuCoursesLine:hover {background-color:#269ac9;}
 a.coursesLineGrey {color:#808080; display:block;}
 a.coursesLineGrey:hover {color:#ffffff;}
 .homepageLeftMenuMore {height:18px;}
-.homepageLeftMenuMore:hover {background-color:#b3e0ee;}
+.homepageLeftMenuMore:hover {background-color:#269ac9;}
 .homepageLeftMenuMoreIcon {background:url(../images/homepage_icon.png) -74px -240px no-repeat; display:block; height:18px;}
 .homepageMenuSetting {display:inline-block; margin-left:155px;}
 a.homepageMenuText {color:#484848; font-size:16px; margin-left:20px;}