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

app/views/layouts/new_base_user.html.erb

@@ -30,8 +30,8 @@
   <div class="homepageContent">
     <div class="homepageLeft" id="LSide">
       <div class="homepagePortraitContainer">
-        <div class="homepagePortraitImage" id="homepage_portrait_image">
+        <div class="homepagePortraitImage fl" id="homepage_portrait_image">
-          <%= image_tag(url_to_avatar(@user),width:"206", height: "206", :id=>'nh_user_tx') %>
+          <%= image_tag(url_to_avatar(@user),width:"78", height: "78", :id=>'nh_user_tx') %>
           <% if User.current.logged?%>
             <% if is_current_user%>
               <div id="edit_user_file_btn" class="none">
@@ -46,16 +46,18 @@
             <% end %>
           <% end%>
         </div>
-        <div>
+        <div class="fl ml15">
-          <div class="homepageImageName hidden db">
+          <p class="homepageImageName hidden db mb5">
             <%= @user.login %>
-          </div>
+          </p>
           <% if (@user.user_extensions && (@user.user_extensions.identity != 2) ) %>
-              <div class="<%= @user.user_extensions.gender == 1 ? 'homepageImageSexWomen' : 'homepageImageSexMan' %> "></div>
+              <span class="<%= @user.user_extensions.gender == 1 ? 'homepageImageSexWomen' : 'homepageImageSexMan' %> "></span>
           <% end %>
-          <%= link_to("编辑资料", my_account_path, :class => "fr gz_btn mr10") if is_current_user%>
           <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%>
         </div>
+        <div class="cl"></div>
         <div>
           <div class="homepageSignature break_word">
             <p id="user_brief_introduction_show">

public/stylesheets/new_user.css

@@ -494,19 +494,19 @@ a.homepageSearchIcon:hover {background:url(../images/nav_icon.png) -49px 3px no-
 .navHomepageProfile ul li:hover ul {display:block;}
 .homepageLeft {width:240px; float:left; margin-right:10px; margin-bottom:10px;}
 .homepageRight {width:750px; float:left; margin-top:15px; margin-bottom:10px;}
-.homepagePortraitContainer {width:238px; border:1px solid #dddddd; background-color:#ffffff; margin-top:15px; padding-bottom:15px;}
+.homepagePortraitContainer {width:208px; border:1px solid #dddddd; background-color:#ffffff; margin-top:15px; padding:15px;}
-.homepagePortraitImage {width:206px; height:206px; padding:2px; margin:15px 14px 10px 14px; position:relative; border:1px solid #cbcbcb;}
+.homepagePortraitImage {width:78px; height:78px; position:relative; border:1px solid #cbcbcb; padding: 2px;}
 .homepagePortraitImage:hover {border:1px solid #269ac9;}
 .homepageFollow {background:url(../images/homepage_icon.png) -10px -8px no-repeat; width:20px; height:20px; position:absolute; right:9px; top:9px;}
 .homepageFollowCancel {background:url(../images/homepage_icon.png) -178px -8px no-repeat; width:20px; height:20px; position:absolute; right:9px; top:9px;}
-.homepageEditProfile {width:20px; height:20px; border-radius:2px; background-color:#888888; position:absolute; right:9px; bottom:9px; font-size:12px; filter:alpha(opacity=50); -moz-opacity:0.5; opacity: 0.5;}
+.homepageEditProfile {width:16px; height:16px; border-radius:2px; background-color:#888888; position:absolute; right:5px; bottom:5px; font-size:12px; filter:alpha(opacity=50); -moz-opacity:0.5; opacity: 0.5;}
-.homepageEditProfileIcon {background:url(../images/homepage_icon.png) -11px -35px no-repeat; width:20px; height:20px; display:block;}
+.homepageEditProfileIcon {background:url(../images/homepage_icon.png) -14px -37px no-repeat; width:20px; height:20px; display:block;}
-.homepageImageName {font-size:16px; color:#484848; margin-left:15px;  margin-right:8px; height:25px; float:left;}
+.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;}
 .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-left:15px; margin-top:10px; margin-bottom:12px; width:208px;}
+.homepageSignature {font-size:12px; color:#888888; margin:10px 0; width:208px;}
-.homepageImageBlock {margin:0 auto; width:78px; float:left; text-align:center; display:inline-block;}
+.homepageImageBlock {margin:0 auto; width:68px; float:left; text-align:center; display:inline-block;}
 a.homepageImageNumber {font-size:12px; color:#484848; font-weight: bold;}
 a.homepageImageNumber:hover {color:#269ac9;}
 .homepageImageText {font-size:12px; color:#888888;}
@@ -861,7 +861,7 @@ a.box_close{background:url(../images/img_floatbox.png) -22px 0 no-repeat;}
 .uppic_btn{border:none; width:150px; background:none; margin-bottom:5px; color:#666; margin-top:105px;}
 
 /*20150820课程作业 LB*/
-.HomeWork {width:708px; background-color:#ffffff; padding:20px; border:1px solid #dddddd;}
+.HomeWork {width:708px; background-color:#ffffff; padding:10px 20px 20px 20px; border:1px solid #dddddd;}
 .RightBanner {width:708px; height:34px;  border-bottom:1px solid #e9e9e9;}
 select.InputBox,input.InputBox,textarea.InputBox{ border:1px solid #d9d9d9; color:#888888; height:28px; line-height:28px; padding-left:5px; font-size:14px;}
 a.BlueCirBtn{ display:block;width:75px; height:28px; background-color:#ffffff; line-height:28px; vertical-align:middle;  text-align:center; border:1px solid #15bccf; color:#15bccf;  -moz-border-radius:5px;  -webkit-border-radius:5px;  border-radius:5px;}