From cccc0577c7a79794c0d9f5e621ff7c75a1cd2156 Mon Sep 17 00:00:00 2001
From: cxt <pinecxt@163.com>
Date: Wed, 26 Aug 2015 08:51:39 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E4=B8=AA=E4=BA=BA=E5=8A=A8=E6=80=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/views/users/show.html.erb   | 4 +++-
 public/stylesheets/new_user.css | 2 +-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/app/views/users/show.html.erb b/app/views/users/show.html.erb
index e650130ff..d0e8351ee 100644
--- a/app/views/users/show.html.erb
+++ b/app/views/users/show.html.erb
@@ -3,7 +3,8 @@
         if ($(window).scrollTop() == $(document).height() - $(window).height()) {
             $.get(
                     '<%= user_activities_path(@user.id)%>',
-                    { page : $("#show_more_activities").val()},
+                    { page : $("#show_more_activities").val(),
+                    type: $("#user_activities_type").val()},
                     function (data) {
 
                     }
@@ -13,6 +14,7 @@
     $(window).scroll(scrollHandler);
 </script>
 
+<input type="hidden" value="<%= @type%>" id="user_activities_type">
 <div class="resources">
   <div class="homepageRightBanner">
     <div class="NewsBannerName">最新动态</div>
diff --git a/public/stylesheets/new_user.css b/public/stylesheets/new_user.css
index a526b0266..fb16d39c5 100644
--- a/public/stylesheets/new_user.css
+++ b/public/stylesheets/new_user.css
@@ -578,7 +578,7 @@ a.postOptionLink:hover {color:#ffffff; background-color:#15bccf;}
 .homepagePostReplyDes {float:left; width:595px; margin-left:15px;}
 .homepagePostReplyPublisher {font-size:12px; color:#484848; margin-bottom:12px;}
 .homepagePostReplyContent {font-size:12px; color:#484848; margin-bottom:12px;}
-.homepagePostProjectState {width:42px; height:20px; line-height:20px; border-radius:1px; background-color:#28be6c; color:#ffffff; text-align:center; vertical-align:middle; font-size:12px; display:inline-block; margin-left:5px;}
+.homepagePostProjectState {width:52px; height:20px; line-height:20px; border-radius:1px; background-color:#28be6c; color:#ffffff; text-align:center; vertical-align:middle; font-size:12px; display:inline-block; margin-left:5px;}
 .homepagePostAssignTo {float:left; font-size:14px; color:#15bccf; height:30px; line-height:30px; vertical-align:middle;}
 .homepagePostFileAtt {height:22px; line-height:22px; vertical-align:middle; background:url(../images/homepage_icon.png) -85px -150px no-repeat; padding-left:35px; font-size:14px; margin-right:25px;}
 .homepagePostImageAtt {height:22px; line-height:22px; vertical-align:middle; background:url(../images/homepage_icon.png) -86px -195px no-repeat; padding-left:35px; font-size:14px; margin-right:25px;}

From cf12ee877ed4eedfe6a60b8c8715441dc63ef883 Mon Sep 17 00:00:00 2001
From: lizanle <491823689@qq.com>
Date: Wed, 26 Aug 2015 09:11:03 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E7=BC=96=E8=BE=91=E8=B5=84=E6=96=99?=
 =?UTF-8?q?=E7=9A=84=E6=97=B6=E5=80=99=E4=B8=AA=E4=BA=BA=E8=AF=B4=E6=98=8E?=
 =?UTF-8?q?=E9=9A=90=E8=97=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/controllers/my_controller.rb | 2 +-
 app/views/my/account.html.erb    | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/app/controllers/my_controller.rb b/app/controllers/my_controller.rb
index 1839dd1fd..4124472e1 100644
--- a/app/controllers/my_controller.rb
+++ b/app/controllers/my_controller.rb
@@ -137,7 +137,7 @@ class MyController < ApplicationController
         @se.identity = params[:identity].to_i if params[:identity]
         @se.technical_title = params[:technical_title] if params[:technical_title]
         @se.student_id = params[:no] if params[:no]
-        @se.brief_introduction = params[:brief_introduction]
+       # @se.brief_introduction = params[:brief_introduction]
         @se.description = params[:description]
 
         if @user.save && @se.save
diff --git a/app/views/my/account.html.erb b/app/views/my/account.html.erb
index c23266afd..23fc1a3ad 100644
--- a/app/views/my/account.html.erb
+++ b/app/views/my/account.html.erb
@@ -30,7 +30,7 @@
           <li nhname="tag" nh_tag_0="true" nh_tag_1="true" nh_tag_3="true" style="display:none;">工作单位&nbsp;:&nbsp;</li>
           <li>地区&nbsp;:&nbsp;</li>
           <li>邮件通知&nbsp;:&nbsp;</li>
-          <li>个人签名&nbsp;:&nbsp;</li>
+          <!--<li>个人签名&nbsp;:&nbsp;</li>-->
           <li>个人简介&nbsp;:&nbsp;</li>
           <li>&nbsp;&nbsp;</li>
         </ul>
@@ -141,7 +141,7 @@
             <%= select_tag( 'user[mail_notification]', options_for_select( user_mail_notification_options(@user), @user.mail_notification) ) %>
             <label>不要发送对我自己提交的修改的通知<%= check_box_tag 'no_self_notified', 1, @user.pref[:no_self_notified],:style=>"height:14px;" %></label>
           </li>
-          <li><input name="brief_introduction" class="w450" type="text" maxlength="255" value="<%= (@user.user_extensions.nil?) ? '' : @user.user_extensions.brief_introduction %>"></li>
+          <!--<li><input name="brief_introduction" class="w450" type="text" maxlength="255" value="<%#= (@user.user_extensions.nil?) ? '' : @user.user_extensions.brief_introduction %>"></li>-->
           <li style="height:auto;"><textarea name="description" class="w450 h200" maxlength="255" style="resize:none;"><%= (@user.user_extensions.nil?) ? '' : @user.user_extensions.description %></textarea></li>
           <li style="display:none;"><%= f.select :language, :Chinese => :zh, :English => :en %></li>
           <li class="ml2">