diff --git a/app/controllers/at_controller.rb b/app/controllers/at_controller.rb
index 81d678261..9994e5a3c 100644
--- a/app/controllers/at_controller.rb
+++ b/app/controllers/at_controller.rb
@@ -29,7 +29,7 @@ class AtController < ApplicationController
     case type
       when "Issue"
         find_issue(id)
-      whne 'TrainingTask'
+      when 'TrainingTask'
         find_training_task(id)
       when 'Project'
         find_project(id)
diff --git a/app/controllers/users_controller.rb b/app/controllers/users_controller.rb
index a0fc10506..1e30e6618 100644
--- a/app/controllers/users_controller.rb
+++ b/app/controllers/users_controller.rb
@@ -4446,6 +4446,10 @@ class UsersController < ApplicationController
       format.html {render :layout => 'clear_base'}
     end
   end
+  # 邮件激活页面，用户修改邮件地址弹框
+  def change_user_email
+    @user = User.find params[:id]
+  end
 
   private
   def show_system_message
diff --git a/app/views/account/email_activation.html.erb b/app/views/account/email_activation.html.erb
index 253867447..62f1e1fff 100644
--- a/app/views/account/email_activation.html.erb
+++ b/app/views/account/email_activation.html.erb
@@ -7,25 +7,26 @@
       <p class="email_prompt_p">如果您尚未收到激活邮件，请按照以下步骤操作：</p>
       <li>检查邮箱的“订阅邮件”、“垃圾邮件”，可能会发现激活邮件。 </li>
       <li>如果激活邮件已无效，请点击重新发送激活邮件按钮。</li>
-      <li>如果重发注册验证邮箱邮件仍然没有收到，请<a href="javascript:void(0);" class="link-blue" onclick="change_user_email()">更换邮箱地址</a>，重新发送激活邮件</li>
+      <li>如果重发注册验证邮箱邮件仍然没有收到，请<a href="javascript:void(0);" class="link-blue" id="change_email">更换邮箱地址</a>，重新发送激活邮件</li>
       <li>如果您始终无法收到激活邮件，请直接给我们留言：</li>
       <div class="mt10">
-        <% get_memo %>
-        <%= form_for(@new_memo, :url => mail_feedback_forum_path(@public_forum, :user_id => @user.id), :remote => true) do |f|  %>
-            <%= f.text_area :subject, :id => "subject", :class => "email_prompt_mes", :style => "width: 568px;", :placeholder => l(:label_email_feedback_tips) %>
-            <%= f.hidden_field :content, :id => 'hidden', :required => true , :value => l(:label_feedback_value) %>
-            <span class="c_red fl" id="mail_valid_feedback_tip" style="display: none;">内容不能为空</span>
-            <a href="javascript:void(0);" class="btn btn-blue fr" onclick="f_submit();">确定</a>
-        <% end %>
+        <textarea style="resize: none;width: 570px;" class="email_prompt_mes" placeholder="<%= l(:label_email_feedback_tips) %>"></textarea>
+        <div class="c1"></div>
+        <button class="email_sub_btn fr" onclick="leave_email_activation_message('<%= leave_email_activation_message_path(1)%>','<%= @user.id %>');">确定</button>
+        <div class="cl"></div>
       </div>
     </ul>
   </div>
 </div>
 <script type="text/javascript">
-    function change_user_email(){
-        var htmlvalue = "<%= j (render :partial => 'account/change_user_email', :locals => {:user => @user}) %>";
-        pop_box_new(htmlvalue,520,316);
-    }
+    $(document).ready(function(){
+        $("#change_email").click(function(){
+            $.ajax({
+                url: "<%= change_user_email_user_path(@user) %>"
+            });
+        });
+    });
+
   function resendMail(url,id)
   {
       $.get(
diff --git a/app/views/account/email_valid.html.erb b/app/views/account/email_valid.html.erb
index 21ab2e270..e850d96c2 100644
--- a/app/views/account/email_valid.html.erb
+++ b/app/views/account/email_valid.html.erb
@@ -17,16 +17,12 @@
       <li>请确认是否填写了正确的邮箱地址 </li>
       <li>请注意查看邮箱中的“订阅邮件”、“垃圾邮件”，可能Trustie的邮件被误杀了</li>
       <li>请点击重新发送激活邮件按钮</li>
-      <li>如果重发注册验证邮箱邮件仍然没有收到，请<a href="javascript:void(0);" class="link-blue" onclick="change_user_email()">更换邮箱地址</a>，重新发送激活邮件</li>
+      <li>如果重发注册验证邮箱邮件仍然没有收到，请<a href="javascript:void(0);" class="link-blue" id="change_email">更换邮箱地址</a>，重新发送激活邮件</li>
       <li>如果您始终无法收到激活邮件，请直接给我们留言：</li>
-      <div class="mt10 clearfix">
-        <% get_memo %>
-        <%= form_for(@new_memo, :url => mail_feedback_forum_path(@public_forum, :user_id => @user.id), :remote => true) do |f|  %>
-            <%= f.text_area :subject, :id => "subject", :class => "email_prompt_mes", :style => "width: 568px;", :placeholder => l(:label_email_feedback_tips) %>
-            <%= f.hidden_field :content, :id => 'hidden', :required => true , :value => l(:label_feedback_value) %>
-            <span class="c_red fl" id="mail_valid_feedback_tip" style="display: none;">内容不能为空</span>
-            <a href="javascript:void(0);" class="btn btn-blue fr" onclick="f_submit();">确定</a>
-        <% end %>
+      <div class="mt10">
+        <textarea style="resize: none;width: 570px;" class="email_prompt_mes" placeholder="<%= l(:label_email_feedback_tips) %>"></textarea>
+        <div class="c1"></div>
+        <button class="email_sub_btn fr" onclick="leave_email_activation_message('<%= leave_email_activation_message_path(1)%>','<%= @user.id %>');">确定</button>
         <div class="cl"></div>
       </div>
     </ul>
@@ -34,10 +30,34 @@
 </div>
 
 <script>
+    $(document).ready(function(){
+        $("#change_email").click(function(){
+           $.ajax({
+               url: "<%= change_user_email_user_path(@user) %>"
+           });
+        });
+    });
 
-    function change_user_email(){
-        var htmlvalue = "<%= j (render :partial => 'account/change_user_email', :locals => {:user => @user}) %>";
-        pop_box_new(htmlvalue,520,316);
+
+    function leave_email_activation_message(url,user)
+    {
+        if ($(".email_prompt_mes").val().length == 0){
+            //弹框请他输入文字
+            var htmlvalue = "</br><div style='width:550px;text-align:center'>您的留言不能为空</div></br><div style='width:67px; margin:0 auto; text-align:center'><a href='javascript:void(0);' class='Blue-btn' onclick='hideModal()'>确定</a></div>";
+            pop_up_box(htmlvalue,580,30,50);
+            return;
+        }
+
+        $.ajax({
+            url: url,
+            data: {user: user, text: $(".email_prompt_mes").val() },
+            type: "POST",
+            success: function (data) {
+                var htmlvalue = "<div class='email_tancon'><h2 class='email_tan_title'>您的留言已发送</h2><p class='email_tan_p'>我们将尽快处理好并通知您。感谢您的反馈！</p></div>"
+                pop_up_box(htmlvalue, 580, 30, 50);
+                $(".email_prompt_mes").val("");
+            }
+        });
     }
     function regex_mv_name()
     {
diff --git a/app/views/layouts/_logined_header.html.erb b/app/views/layouts/_logined_header.html.erb
index 4cade508c..2a9704d4e 100644
--- a/app/views/layouts/_logined_header.html.erb
+++ b/app/views/layouts/_logined_header.html.erb
@@ -58,7 +58,7 @@
     <% name = name%>
 
     <%= form_tag({controller: :welcome, action: :search },:class=>'navHomepageSearchBox', method: :get) do %>
-        <input type="text" name="q" value="<%= name.nil? ? "" : name%>" id="navHomepageSearchInput" class="navHomepageSearchInput"  placeholder="请输入关键词搜索" style="width: 300px" />
+        <input type="text" name="q" value="<%= name.nil? ? "" : name %>" id="navHomepageSearchInput" class="navHomepageSearchInput"  placeholder="请输入关键词搜索" style="width: 300px" />
         <input type="hidden" name="search_type" id="type" value="all"/>
         <input type="text" style="display: none;"/>
         <a href="javascript:void(0);" class="homepageSearchIcon" onclick="search_in_header($(this));"></a>
diff --git a/app/views/layouts/new_base_user.html.erb b/app/views/layouts/new_base_user.html.erb
index 1d08ab7da..a230c21df 100644
--- a/app/views/layouts/new_base_user.html.erb
+++ b/app/views/layouts/new_base_user.html.erb
@@ -7,7 +7,7 @@
   <meta name="keywords" content="issue,bug,tracker" />
   <%= csrf_meta_tag %>
   <%= favicon %>
-  <%= stylesheet_link_tag 'jquery/jquery-ui-1.9.2','css/common', 'css/structure','css/public', 'prettify','css/project','css/courses','css/popup','css/syllabus','css/moduel', 'css/user', :media => 'all' %>
+  <%= stylesheet_link_tag 'jquery/jquery-ui-1.9.2','css/common', 'css/structure','css/public', 'prettify','css/project','css/courses','css/popup','css/syllabus','css/moduel', 'css/user', 'css/font-awesome.css', :media => 'all' %>
   <%= stylesheet_link_tag 'rtl', :media => 'all' if l(:direction) == 'rtl' %>
   <%= javascript_heads %>
   <%= javascript_include_tag "bootstrap","avatars","new_user",'attachments','prettify'%>
@@ -79,61 +79,72 @@
   <div class="cl"></div>
   <div class="homepageContent">
     <div class="homepageLeft mt10" id="LSide">
-      <div class="user_leftinfo mb10">
+      <div class="home-user-new-img mb10">
         <% if User.current.logged? && User.current == @user %>
-            <div class="pr" style="width: 80px; margin:0 auto;">
-                <%= link_to image_tag(url_to_avatar(@user),width:"74", height: "74", :id => 'nh_source_tx'),
-                           my_clear_user_avatar_temp_path, :class => "user_leftinfo_img", :remote => true %>
-                <div class="homepageEditProfile undis">
-                  <%=link_to '', my_clear_user_avatar_temp_path, :class => 'homepageEditProfileIcon', :remote => true, :title => '点击编辑Logo' %>
-                </div>
-            </div>
+              <%= link_to image_tag(url_to_avatar(@user),width:"238", height: "200", :id => 'nh_source_tx'),
+                          my_clear_user_avatar_temp_path, :remote => true %>
         <% else %>
-			<a href="javascript:void(0)" class="user_leftinfo_img" style="cursor: default">
-              <%=image_tag(url_to_avatar(@user),width:"74", height: "74", :id=>'nh_source_tx') %>
-            </a>
-	    <% end %>
-        <% if (@user.user_extensions && (@user.user_extensions.identity != 2) ) %>
-            <span class="<%= @user.user_extensions.gender == 1 ? 'user_leftinfo_female' : 'user_leftinfo_male' %> "></span>
+              <%=image_tag(url_to_avatar(@user),width:"238", height: "200", :id=>'nh_source_tx') %>
         <% end %>
-        <div class="user_info_inner">
-          <div class=" user_leftinfo_namebox" >
-            <%= link_to @user.show_name, user_path(@user), :class => "user_leftinfo_name" %>
-            <% if @user.user_extensions && @user.user_extensions.identity %>
-                <span class="user_cirbtn_yellow" ><%= get_user_roll @user %></span>
-            <% end%>
-          </div>
-          <div>
-            <div class="user_info_intro" style="word-wrap:break-word; text-align:justify;">
-              <div id="user_brief_introduction_show">
-                <%= render :partial => 'layouts/user_brief_introduction', :locals => {:user => @user} %>
-              </div>
-            </div>
-          <!--  <textarea class="homepageSignatureTextarea none" placeholder="请编辑签名" id="user_brief_introduction_edit" onblur="edit_user_introduction('<%#= edit_brief_introduction_user_path(@user.id)%>');"><%#= @user.user_extensions.brief_introduction %></textarea>-->
-          </div>
-          <ul class="user_atten clear">
-            <li>
-              <a href="<%= user_blogs_path(:user_id => @user) %>">
-                <strong style="font-weight:normal;">博客</strong><br />
-                <span class="sy_cgrey"><%= @user.blog.blog_comments.where("#{BlogComment.table_name}.parent_id is null").count %></span>
-              </a>
-            </li>
-            <li>
-              <a href="<%= user_watchlist_user_path(@user) %>">
-                <strong style="font-weight:normal;">关注</strong><br />
-                <span class="sy_cgrey" id="user_watchers_number"><%= User.watched_by(@user).count %></span>
-              </a>
-            </li>
-            <li>
-              <a href="<%= user_fanslist_user_path(@user) %>">
-                <strong style="font-weight:normal;">粉丝</strong><br />
-                <span id="user_fans_number" class="sy_cgrey"><%= @user.watcher_users.count %></span>
-              </a>
-            </li>
-          </ul>
-        </div>
-        <div id="watch_user_btn_div">
-          <%= render :partial => 'layouts/user_watch_btn', :locals => {:target => @user} %>
+      </div>
+      <div class="home-user-newinfo-box mb10">
+        <h3 class="mb5 fontGrey3 break_full_word">
+          <%= link_to @user.show_name, user_path(@user), :class => "mb5 fontGrey3" %>
+          <% if @user.user_extensions && @user.user_extensions.identity %>
+              （<%= get_user_roll @user %>）
+          <% end%>
+          <% if (@user.user_extensions && (@user.user_extensions.identity != 2) ) %>
+              <span class="<%= @user.user_extensions.gender == 1 ? 'user_leftinfo_female fr' : 'user_leftinfo_male fr' %> "></span>
+          <% end %>
+        </h3>
+        <h4 class="fontGrey2 mb5"><%= @user.login %></h4>
+        <p class="fontGrey2">
+          <% if  !@user.user_extensions.school_id.blank? %>
+              <%= @user.user_extensions.school.name %>
+          <% end %>
+        </p>
+        <span class="border-line mt10 mb10"></span>
+        <ul class="home-user-newinfo-ul ">
+          <li class="clear">
+            <a href="<%= user_blogs_path(:user_id => @user) %>" class="fl linkGrey7 f14">博客</a>
+            <span class="issues_nav_tag fr"><%= @user.blog.blog_comments.where("#{BlogComment.table_name}.parent_id is null").count %></span>
+          </li>
+          <li class="clear">
+            <a href="<%= user_watchlist_user_path(@user) %>" class="fl linkGrey7 f14" >关注</a>
+            <span class="issues_nav_tag fr" id="user_watchers_number"><%= User.watched_by(@user).count %></span>
+          </li>
+          <li class="clear">
+            <a href="<%= user_fanslist_user_path(@user) %>" class="fl linkGrey7 f14">粉丝</a>
+            <span class="issues_nav_tag fr" id="user_fans_number"><%= @user.watcher_users.count %></span>
+          </li>
+        </ul>
+        <div class="clear">
+          <% if User.current.logged?%>
+              <% if User.current == @user %>
+                  <%= link_to '个人主页', homepage_user_path(@user), :class => "home-big-btn-grey", :target => '_blank' %>
+              <% else %>
+                  <% if(@user.watched_by?(User.current)) %>
+                      <%= link_to "取消关注",
+                                  watch_path(:object_type => 'user', :object_id => @user.id, :target_id => @user.id),
+                                  :class => "home-btn-grey fl mr12",
+                                  :method => "delete",
+                                  :remote => "true",
+                                  :title => "取消关注" %>
+                  <% else %>
+                      <%= link_to "添加关注",
+                                  watch_path(:object_type => 'user', :object_id => @user.id, :target_id => @user.id),
+                                  :class => "home-btn-grey fl mr12",
+                                  :method => "post",
+                                  :remote => "true",
+                                  :title => "添加关注" %>
+                  <% end %>
+                  <% if @user.base_homepage.nil? %>
+                      <a href="javascript:void(0)" class ="home-btn-grey fl" title="该用户暂未设置主页">TA的主页</a>
+                  <% else %>
+                      <%= link_to "TA的主页", homepage_user_path(@user.login), :class => 'home-btn-grey fl', :target => '_blank' %>
+                  <% end %>
+              <% end %>
+          <% end %>
         </div>
       </div>
       <% if is_current_user %>
@@ -217,19 +228,19 @@
             <ul>
               <% if hidden_unproject_infos && user_course_count > 0 %>
                   <li class="home-user-leftnav-li icons-class clear">
-                    <%= link_to user_course_count > 0 ? "课程<span class='issues_nav_tag ml140'>#{user_course_count}</span>".html_safe : "课程",
+                    <%= link_to user_course_count > 0 ? "课程<span class='issues_nav_tag ml140' style='line-height:18px;margin-top:9px;font-size:11px;background-color:#f5f2f2;color:#666;'>#{user_course_count}</span>".html_safe : "课程",
                                 user_course_community_path(@user), :id => "user_course_list", :class => "fl", :target => "_blank" %>
                   </li>
               <% end %>
               <% if user_project_count > 0 %>
               <li class="home-user-leftnav-li icons-project clear">
-                <%= link_to  user_project_count > 0 ? "项目<span class='issues_nav_tag ml140'>#{user_project_count}</span>".html_safe : "项目",
+                <%= link_to  user_project_count > 0 ? "项目<span class='issues_nav_tag ml140' style='line-height:18px;margin-top:9px;font-size:11px;background-color:#f5f2f2;color:#666;'>#{user_project_count}</span>".html_safe : "项目",
                              user_project_community_path(@user), :id => 'user_project_list', :class => "fl", :target => "_blank" %>
               </li>
               <% end %>
               <% if hidden_unproject_infos && user_contest_count > 0 %>
                   <li class="home-user-leftnav-li icons-project clear">
-                    <%= link_to  user_contest_count > 0 ? "竞赛<span class='issues_nav_tag ml140'>#{user_contest_count}</span>".html_safe : "竞赛",
+                    <%= link_to  user_contest_count > 0 ? "竞赛<span class='issues_nav_tag ml140' style='line-height:18px;margin-top:9px;font-size:11px;background-color:#f5f2f2;color:#666;'>#{user_contest_count}</span>".html_safe : "竞赛",
                                  user_contest_community_path(@user), :id => 'user_contest_list', :class => "fl", :target => "_blank" %>
                   </li>
               <% end %>
@@ -246,7 +257,15 @@
 
       <%# 更新访问数,刷新的时候更新访问次数 %>
       <%  update_visiti_count @user %>
-      <div class="fontGrey5 mt10 ml20">访问计数 <%= @user.visits.to_i %> （自2016年5月）</div>
+      <div class="">
+        <ul class="home-user-footerinfo">
+          <li><i class="icon-map-marker mr5 ml10 f14"></i>
+            <span><%= @user.user_extensions.location %><% unless @user.user_extensions.location_city.blank? %>-<%= @user.user_extensions.location_city %><% end %></span>
+          </li>
+          <li><i class="icon-time mr5 ml10 f14"></i><span><%= @user.created_on.strftime('%Y-%m-%d') %>开始使用</span></li>
+          <li style="color:#b3b3b3"><i class="icon-eye-open mr5 ml10 f14"></i><span><%= @user.visits.to_i %>次访问（自2016年5月）</span></li>
+        </ul>
+      </div>
     </div>
     <div class="homepageRight">
       <%= yield %>
diff --git a/app/views/my/save_user_avatar.js.erb b/app/views/my/save_user_avatar.js.erb
index 4e49df917..8671924d4 100644
--- a/app/views/my/save_user_avatar.js.erb
+++ b/app/views/my/save_user_avatar.js.erb
@@ -1,6 +1,6 @@
 <% if @user %>
-$("#nh_source_tx").replaceWith('<%= image_tag(url_to_avatar(@user), :id=>'nh_source_tx',:style=>"width:78px;height:78px;overflow:hidden",:alt=>"头像") %>');
-$("#nh_user_logo").replaceWith('<%= image_tag(url_to_avatar(@user), :id=>'nh_user_logo',:width =>"40",:height => "40",:alt=>"头像") %>');
+$("#nh_source_tx").replaceWith('<%= image_tag(url_to_avatar(@user), :id=>'nh_source_tx',:style=>"width:238px;height:200px;overflow:hidden",:alt=>"头像") %>');
+$("#nh_user_logo").replaceWith('<%= image_tag(url_to_avatar(@user), :id=>'nh_user_logo',:width =>"40",:height => "40", :style=>"border-radius: 50px;", :alt=>"头像") %>');
 <% elsif @course %>
 $("#nh_source_tx").replaceWith('<%= image_tag(url_to_avatar(@course), :id=>'nh_source_tx',:style=>"width:96px;height:96px;overflow:hidden",:alt=>"班级logo") %>');
 if($("#course_avatar_form").length > 0) {
diff --git a/app/views/projects/show.html.erb b/app/views/projects/show.html.erb
index 50db70d22..8d1d199ad 100644
--- a/app/views/projects/show.html.erb
+++ b/app/views/projects/show.html.erb
@@ -3,7 +3,7 @@
   <div id="project_invite_code"><%= render :partial => 'projects/invite_code' %></div>
   <div id="project_description_code" style="padding: 0 15px 10px 15px;font-size: 14px;">
   <% if @project.description.blank? %>
-      <p style="padding-top:5px"><%= @project.name %></p>
+      <p style="padding-top:5px;font-size:20px;font-weight:bold;"><%= @project.name %></p>
   <% else %>
       <p style="padding-top:5px"><%= h @project.description.html_safe %></p>
   <% end %>
diff --git a/app/views/users/change_user_email.js.erb b/app/views/users/change_user_email.js.erb
new file mode 100644
index 000000000..988c49194
--- /dev/null
+++ b/app/views/users/change_user_email.js.erb
@@ -0,0 +1,2 @@
+var htmlvalue = "<%= j (render :partial => 'account/change_user_email', :locals => {:user => @user}) %>";
+pop_box_new(htmlvalue,520,316);
\ No newline at end of file
diff --git a/app/views/users/user_manage_issues.html.erb b/app/views/users/user_manage_issues.html.erb
index 7227e02b3..c66b18948 100644
--- a/app/views/users/user_manage_issues.html.erb
+++ b/app/views/users/user_manage_issues.html.erb
@@ -216,7 +216,7 @@
     $(document).ready(function(){
        if($.browser.webkit){
             $("#issues_filter_por").css("padding-left","5px");
-            $("#issue_filter_status").css("padding-left","10px");
+            $("#issue_filter_status").css("padding-left","15px");
        }
     });
 </script>
diff --git a/app/views/welcome/_search_course_results.html.erb b/app/views/welcome/_search_course_results.html.erb
index dd4c9f405..770ec525e 100644
--- a/app/views/welcome/_search_course_results.html.erb
+++ b/app/views/welcome/_search_course_results.html.erb
@@ -11,7 +11,7 @@
                 <div class="mt5 fl"><%= image_tag("search_icon_03.png", :width=>"8", :height=>"16" ,:class=>"fl") %><span class="searchTag">班级</span></div>
                 <div class="cl"></div>
               </li>
-              <li class="fontGrey3 mb5"><%= course.try(:highlight).try(:description) ? course.highlight.description[0].html_safe : (course.description.present? ? course.description : '暂时没有该班级描述') %></li>
+              <li class="fontGrey3 mb5"><%= course.try(:highlight).try(:description) ? (h course.highlight.description[0].html_safe) : (course.description.present? ? (h course.description.html_safe) : '暂时没有该班级描述') %></li>
               <li class="f12 fontGrey2">
                 <% user = User.find(course.tea_id)%>
                 <span class="mr30">教师：<%= user.realname %></span>
diff --git a/app/views/welcome/_search_project_results.html.erb b/app/views/welcome/_search_project_results.html.erb
index 5775a939d..b63b6d9bb 100644
--- a/app/views/welcome/_search_project_results.html.erb
+++ b/app/views/welcome/_search_project_results.html.erb
@@ -11,7 +11,7 @@
                 <div class="mt5 fl"><%= image_tag("search_icon_03.png", :width=>"8", :height=>"16" ,:class=>"fl") %><span class="searchTag">项目</span></div>
                 <div class="cl"></div>
               </li>
-              <li class="fontGrey3 mb5"><%= project.try(:highlight).try(:description) ? project.highlight.description[0].html_safe : project.description%></li>
+              <li class="fontGrey3 mb5"><%= project.try(:highlight).try(:description) ? (h project.highlight.description[0].html_safe) : (h project.description.html_safe) %></li>
               <li class="f12 fontGrey2"><span class="mr30">管理人员：<%=  project.user_id ?  User.find(project.user_id).login : '无' %></span><span class="mr30">更新时间:<%= date_format_local( Project.find(project.id).updated_on) %></span></li>
             </ul>
           </li>
diff --git a/config/routes.rb b/config/routes.rb
index 4799da261..eeece5629 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -709,6 +709,7 @@ RedmineApp::Application.routes.draw do
       get 'user_import_resource'
       match 'watch_projects', :to => 'users#watch_projects', :via => :get
       get  'update_message_viewed'
+      get 'change_user_email'
       #
       # added by bai
       match 'show_score', :to => 'users#show_score', :via => :get
diff --git a/public/assets/kindeditor/kindeditor.js b/public/assets/kindeditor/kindeditor.js
index 8b3e66bab..c5f8cf99f 100644
--- a/public/assets/kindeditor/kindeditor.js
+++ b/public/assets/kindeditor/kindeditor.js
@@ -4795,7 +4795,8 @@ function _bindFocusEvent() {
 		}
 	}).blur(function(e) {
         if(self.isEmpty()) {
-            self.edit.html("<span id='hint' style='color:#999999;font-size:12px;'>" + self.placeholder + "</span>");
+            self.edit.html(self.placeholder);
+           // self.edit.html("<span id='hint' style='color:#999999;font-size:12px;'>" + self.placeholder + "</span>");
         }
 		if (self.afterBlur) {
 			self.afterBlur.call(self, e);
diff --git a/public/images/user/female.jpg b/public/images/user/female.jpg
index 499d2e5ac..3d6732929 100644
Binary files a/public/images/user/female.jpg and b/public/images/user/female.jpg differ
diff --git a/public/images/user/male.jpg b/public/images/user/male.jpg
index bd2597dd2..b60757382 100644
Binary files a/public/images/user/male.jpg and b/public/images/user/male.jpg differ
diff --git a/public/stylesheets/css/structure.css b/public/stylesheets/css/structure.css
index 4891d6416..70e12eec2 100644
--- a/public/stylesheets/css/structure.css
+++ b/public/stylesheets/css/structure.css
@@ -452,8 +452,8 @@ a.shadowbox_news_all{ display:block; width:305px; height:40px; line-height:40px;
 .user_leftinfo{ width:238px;border:1px solid #e5e5e5; background:#fff url(/images/user/user_bg_info.jpg) 0 0 no-repeat;  position:relative; }
 a.user_leftinfo_img { display:block; width:80px; height:80px; margin:15px auto;}
 .user_leftinfo_img img{ width:74px; height:74px;-webkit-border-radius:50px;-moz-border-radius:50px;-o-border-radius:50px;border-radius:50px; border:3px solid #dcdcdc; }
-.user_leftinfo_female{ display:block; width:20px; height:20px;background:url(/images/user/icons_user_leftnav.png) 5px -378px no-repeat; position:absolute; top:80px; left:160px;}
-.user_leftinfo_male{ display:block; width:20px; height:20px;background:url(/images/user/icons_user_leftnav.png) -25px -378px no-repeat; position:absolute; top:80px; left:160px;}
+.user_leftinfo_female{ display:block; width:20px; height:20px;background:url(/images/user/icons_user_leftnav.png) 5px -378px no-repeat;}
+.user_leftinfo_male{ display:block; width:20px; height:20px;background:url(/images/user/icons_user_leftnav.png) -25px -378px no-repeat;}
 .user_leftinfo_namebox{ text-align:center; height:16px; line-height:16px; }
 .user_leftinfo_name{ display: inline-block; max-width:160px; font-size:14px; font-weight:bold;  overflow:hidden;overflow:hidden;text-overflow:ellipsis;white-space:nowrap; }
 .user_leftinfo_namebox a{ color: #333;}
diff --git a/public/stylesheets/css/user.css b/public/stylesheets/css/user.css
index d08aa1f0e..6eb9432b7 100644
--- a/public/stylesheets/css/user.css
+++ b/public/stylesheets/css/user.css
@@ -87,8 +87,8 @@ a:hover.pro_new_topbtn_left{background-image: linear-gradient(#ededed, #dddddd);
 .user_leftdata_background{ width:238px;border:1px solid #e5e5e5; background:#fff url(/images/user/user_bg_info2.jpg) 0 0 no-repeat;  position:relative; }
 a.user_leftinfo_img { display:block; width:80px; height:80px; margin:15px auto;}
 .user_leftinfo_img img{ width:74px; height:74px;-webkit-border-radius:50px;-moz-border-radius:50px;-o-border-radius:50px;border-radius:50px; border:3px solid #dcdcdc; }
-.user_leftinfo_female{ display:block; width:20px; height:20px;background:url(/images/user/icons_user_leftnav.png) 5px -378px no-repeat; position:absolute; top:80px; left:160px;}
-.user_leftinfo_male{ display:block; width:20px; height:20px;background:url(/images/user/icons_user_leftnav.png) -25px -378px no-repeat; position:absolute; top:80px; left:160px;}
+.user_leftinfo_female{ display:block; width:20px; height:20px;background:url(/images/user/icons_user_leftnav.png) 5px -378px no-repeat;}
+.user_leftinfo_male{ display:block; width:20px; height:20px;background:url(/images/user/icons_user_leftnav.png) -25px -378px no-repeat;}
 .user_leftinfo_namebox{ text-align:center; height:16px; line-height:16px; }
 .user_leftinfo_name{     display: inline-block; max-width:160px; font-size:14px; font-weight:bold;  overflow:hidden;overflow:hidden;text-overflow:ellipsis;white-space:nowrap; }
 .user_cirbtn_yellow{  color:#fff; background:#ffb400; padding:0 5px;-webkit-border-radius:10px;-moz-border-radius:10px;-o-border-radius:10px;border-radius:10px; line-height:16px; }
@@ -179,3 +179,16 @@ a.user_navmorebox .user_icons_closeclass{display:block;position: absolute;top:5p
 .homepageTabPollTitle { max-width:490px;white-space: nowrap;overflow: hidden;text-overflow: ellipsis;}
 .homepageTabAvatar img{border: 3px solid #fff;-webkit-border-radius:30px;-moz-border-radius:30px;-o-border-radius:30px;border-radius:30px;}
 .homepageTabAvatar img:hover{border: 3px solid #e6e6e6;}
+/* 新版个人主页左侧信息170214byLB */
+.home-user-new-img{ width: 238px; height: 200px; border-radius:5px;border: 1px solid #ddd;}
+.home-user-new-img img{border-radius:5px;}
+.home-user-newinfo-box{ width: 218px; padding:10px; border: 1px solid #e5e5e5; background:#fff;}
+.issues_nav_tag{ background-color:#eaeaea;  padding:2px 8px;border-radius:15px; font-size:12px; display: inline-block; color: #666;}
+.home-user-newinfo-ul li{ height: 40px;}
+.border-line{ width:100%; display: block; border-top: 1px solid #e5e5e5;}
+a.home-btn-grey{ display:inline-block; width:100px; height: 28px; line-height:28px; font-size: 14px; color: #666; text-align: center; background:#fff; border:1px solid #e5e5e5; border-radius:5px; }
+a:hover.home-btn-grey{ background:#f0f0f0;}
+a.home-big-btn-grey{ display:inline-block; width:212px; height: 28px; line-height:28px; font-size: 14px; color: #666; text-align: center; background:#fff; border:1px solid #e5e5e5; border-radius:5px; }
+a:hover.home-big-btn-grey{ background:#f0f0f0;}
+
+.home-user-footerinfo li{ height: 24px; color: #888; }