diff --git a/app/views/layouts/new_base_user.html.erb b/app/views/layouts/new_base_user.html.erb
index 3f5e2eb25..550f6653f 100644
--- a/app/views/layouts/new_base_user.html.erb
+++ b/app/views/layouts/new_base_user.html.erb
@@ -30,12 +30,13 @@
     <div class="homepageLeft">
       <div class="homepagePortraitContainer">
         <div class="homepagePortraitImage">
-          <%= image_tag(url_to_avatar(User.current),width:"208", height: "208") %>
+          <%= image_tag(url_to_avatar(@user),width:"206", height: "206") %>
           <% if User.current.logged?%>
             <% if User.current == @user%>
               <div>
-                <%#= link_to "编辑资料", my_account_path, :class => "homepageEditProfile c_white"%>
-                <div class="homepageEditProfile"><a href="javascript:void(0);" class="homepageEditProfileIcon"></a></div>
+                <div class="homepageEditProfile">
+                  <a href="javascript:void(0);" class="homepageEditProfileIcon"></a>
+                </div>
               </div>
             <% else %>
               <div>
@@ -49,7 +50,6 @@
             <% end %>
           <% end%>
         </div>
-
         <div>
           <div class="homepageImageName">
             <%= @user.login %>
@@ -58,35 +58,49 @@
               <span class="<%= @user.user_extensions.gender==1?'icon_female':'icon_male' %> fl mt3 ml5"></span>
           <% end %>
           <div class="homepageImageSex"></div>
+          <%= link_to "编辑资料", my_account_path, :class => "fr gz_btn mr10"%>
           <div class="cl"></div>
         </div>
         <div>
           <div class="homepageSignature">
-            <p>这位童鞋很懒，什么也没有留下～&nbsp;
-              <a href="javascript:void(0);">
-                <img src="../images/signature_edit.png" width="12" height="12" />
-              </a>
-            </p>
+            <% if @user.user_extensions && @user.user_extensions.brief_introduction && !@user.user_extensions.brief_introduction.empty? %>
+                <p>
+                  <%= @user.user_extensions.brief_introduction %>&nbsp;
+                  <a href="javascript:void(0);">
+                    <img src="../images/signature_edit.png" width="12" height="12" />
+                  </a>
+                </p>
+            <% else%>
+                <% if User.current == @user%>
+                    <p>
+                      这位童鞋很懒，什么也没有留下～&nbsp;
+                      <a href="javascript:void(0);">
+                        <img src="../images/signature_edit.png" width="12" height="12" />
+                      </a>
+                    </p>
+                <% end%>
+            <% end %>
           </div>
         </div>
         <div>
           <div class="homepageImageBlock">
             <div>
-              <a href="javascript:void(0);" class="homepageImageNumber">85</a>
+              <%= link_to User.watched_by(@user.id).count.to_s, {:controller=>"users", :action=>"user_watchlist",:id=>@user.id},:class=>"homepageImageNumber" %>
             </div>
             <div class="homepageImageText">关注</div>
           </div>
           <div class="homepageVerDiv"></div>
           <div class="homepageImageBlock">
             <div>
-              <a href="javascript:void(0);" class="homepageImageNumber">24</a>
+              <%= link_to @user.watcher_users.count.to_s, {:controller=>"users", :action=>"user_fanslist",:id=>@user.id},:class=>"homepageImageNumber"%>
             </div>
             <div class="homepageImageText">粉丝</div>
           </div>
           <div class="homepageVerDiv"></div>
           <div class="homepageImageBlock">
             <div>
-              <a href="javascript:void(0);" class="homepageImageNumber">91</a>
+              <%= link_to(format("%.2f" ,get_option_number(@user,1).total_score ).to_i,
+                          {:controller => 'users', :action => 'show_new_score', :remote => true, :id => @user.id }, :class => 'homepageImageNumber',:id => 'user_score') %>
             </div>
             <div class="homepageImageText">积分</div>
           </div>
@@ -95,7 +109,7 @@
       </div>
       <div class="homepageLeftMenuContainer">
         <div class="homepageLeftMenuBlock">
-          <a href="javascript:void(0);" class="homepageMenuText">动态</a>
+          <%= link_to "动态",user_activities_path(@user.id),:class => "homepageMenuText"%>
         </div>
         <div class="homepageLeftMenuBlock">
           <a href="javascript:void(0);" class="homepageMenuText">课程</a>
@@ -103,12 +117,32 @@
             <img src="../images/menu_setting.png" width="14" height="14" />
           </a>
         </div>
+        <div class="homepageLeftMenuCourses">
+          <ul>
+            <li class="homepageLeftMenuCoursesLine"><a href="javascript:void(0);" class="coursesLineGrey">课程名称一</a></li>
+            <li class="homepageLeftMenuCoursesLine"><a href="javascript:void(0);" class="coursesLineGrey">课程名称二</a></li>
+            <li class="homepageLeftMenuCoursesLine"><a href="javascript:void(0);" class="coursesLineGrey">课程名称三</a></li>
+            <li class="homepageLeftMenuCoursesLine"><a href="javascript:void(0);" class="coursesLineGrey">课程名称四</a></li>
+            <li class="homepageLeftMenuCoursesLine"><a href="javascript:void(0);" class="coursesLineGrey">课程名称五</a></li>
+            <li class="homepageLeftMenuMore"><a href="javascript:void(0);" class="homepageLeftMenuMoreIcon"></a></li>
+          </ul>
+        </div>
         <div class="homepageLeftMenuBlock">
           <a href="javascript:void(0);" class="homepageMenuText">项目</a>
           <a href="javascript:void(0);" class="homepageMenuSetting">
             <img src="../images/menu_setting.png" width="14" height="14" />
           </a>
         </div>
+        <div class="homepageLeftMenuCourses">
+          <ul>
+            <li class="homepageLeftMenuCoursesLine"><a href="javascript:void(0);" class="coursesLineGrey">项目名称一</a></li>
+            <li class="homepageLeftMenuCoursesLine"><a href="javascript:void(0);" class="coursesLineGrey">项目名称二</a></li>
+            <li class="homepageLeftMenuCoursesLine"><a href="javascript:void(0);" class="coursesLineGrey">项目名称三</a></li>
+            <li class="homepageLeftMenuCoursesLine"><a href="javascript:void(0);" class="coursesLineGrey">项目名称四</a></li>
+            <li class="homepageLeftMenuCoursesLine"><a href="javascript:void(0);" class="coursesLineGrey">项目名称五</a></li>
+            <li class="homepageLeftMenuMore"><a href="javascript:void(0);" class="homepageLeftMenuMoreIcon"></a></li>
+          </ul>
+        </div>
         <div class="homepageLeftMenuBlock">
           <a href="javascript:void(0);" class="homepageMenuText">留言</a>
         </div>
diff --git a/public/images/homepage_icon.png b/public/images/homepage_icon.png
index ad293b7ca..5b61ff102 100644
Binary files a/public/images/homepage_icon.png and b/public/images/homepage_icon.png differ
diff --git a/public/stylesheets/new_public.css b/public/stylesheets/new_public.css
index add80c7f2..1f0612fc1 100644
--- a/public/stylesheets/new_public.css
+++ b/public/stylesheets/new_public.css
@@ -403,7 +403,7 @@ a.homepageSearchIcon:hover {background:url(../images/nav_icon.png) -49px 3px no-
 .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;}
-.homepagePortraitImage {width:206px; height:206px; padding:2px; margin:15px 16px 14px 16px; position:relative; border:1px solid #cbcbcb;}
+.homepagePortraitImage {width:206px; height:206px; padding:2px; margin:15px 13px 5px 13px;; position:relative; border:1px solid #cbcbcb;}
 .homepagePortraitImage:hover {border:1px solid #15bccf;}
 .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;}
@@ -509,6 +509,8 @@ a.postOptionLink:hover {color:#ffffff; background-color:#15bccf;}
 .postAttSize {color:#888888; font-size:12px;}
 a.postGrey {color:#484848;}
 a.postGrey:hover {color:#000000;}
+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;margin-top: 2px;}
+a:hover.gz_btn{ color:#ff5722;}