From 27b8d85cc558926112a1ea94248b2f3ac2c92a33 Mon Sep 17 00:00:00 2001
From: cxt <pinecxt@163.com>
Date: Fri, 28 Aug 2015 17:36:57 +0800
Subject: [PATCH 01/42] =?UTF-8?q?=E4=B8=AA=E4=BA=BA=E4=B8=BB=E9=A1=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/views/users/_course_poll.html.erb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/views/users/_course_poll.html.erb b/app/views/users/_course_poll.html.erb
index bc0fee3a8..f0a2a8aba 100644
--- a/app/views/users/_course_poll.html.erb
+++ b/app/views/users/_course_poll.html.erb
@@ -28,7 +28,7 @@
       <div class="homepagePostSubmitContainer">
         <div class="homepagePostDeadline">发布时间：<%= format_date(activity.published_at) %></div>
       </div>
-      <div class="homepagePostIntro break_word" id="activity_description_<%= user_activity.id%>">问卷描述：<%=activity.polls_description.to_s%></div>
+      <div class="homepagePostIntro break_word" id="activity_description_<%= user_activity.id%>">问卷描述：<%=activity.polls_description.html_safe.to_s%></div>
       <div class="homepagePostSetting" id="act-<%= user_activity.id %>" style="visibility: hidden">
         <ul>
           <li class="homepagePostSettingIcon">

From 69178f1522400d6cede1316d7e223ca84dde550d Mon Sep 17 00:00:00 2001
From: cxt <pinecxt@163.com>
Date: Fri, 28 Aug 2015 17:46:21 +0800
Subject: [PATCH 02/42] =?UTF-8?q?=E4=B8=AA=E4=BA=BA=E4=B8=BB=E9=A1=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/views/users/_course_news.html.erb     | 2 +-
 app/views/users/_project_issue.html.erb   | 2 +-
 app/views/users/_project_message.html.erb | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/app/views/users/_course_news.html.erb b/app/views/users/_course_news.html.erb
index aaa8fa672..5e538c65e 100644
--- a/app/views/users/_course_news.html.erb
+++ b/app/views/users/_course_news.html.erb
@@ -38,7 +38,7 @@
     <div class="homepagePostReplyBanner">
       <% count=activity.comments_count %>
       <div class="homepagePostReplyBannerCount">回复（<%= count %>）</div>
-      <div class="homepagePostReplyBannerTime"><%= format_date(activity.updated_on) %></div>
+      <div class="homepagePostReplyBannerTime"><%#= format_date(activity.updated_on) %></div>
       <%if count>2 %>
           <div class="homepagePostReplyBannerMore"><a id="reply_btn_<%=user_activity.id%>" onclick="expand_reply('#reply_div_<%= user_activity.id %> li','#reply_btn_<%=user_activity.id%>')" data-count="<%= count %>" data-init="0" class=" replyGrey" href="javascript:void(0)" value="show_help" >点击展开更多回复(<%= count.to_s%>)</a></div>
       <% end %>
diff --git a/app/views/users/_project_issue.html.erb b/app/views/users/_project_issue.html.erb
index 61beeb48e..eb0341607 100644
--- a/app/views/users/_project_issue.html.erb
+++ b/app/views/users/_project_issue.html.erb
@@ -75,7 +75,7 @@
     <div class="homepagePostReplyBanner">
       <% count=activity.journals.count %>
       <div class="homepagePostReplyBannerCount">回复（<%= count %>）</div>
-      <div class="homepagePostReplyBannerTime"><%= format_date(activity.updated_on) %></div>
+      <div class="homepagePostReplyBannerTime"><%#= format_date(activity.updated_on) %></div>
       <% if count>2 %>
           <div class="homepagePostReplyBannerMore">
             <a id="reply_btn_<%= user_activity.id %>" onclick="expand_reply('#reply_div_<%= user_activity.id %> li','#reply_btn_<%=user_activity.id%>')" data-count="<%= count %>" data-init="0" class=" replyGrey" href="javascript:void(0)" value="show_help">点击展开更多回复(<%= count.to_s %>
diff --git a/app/views/users/_project_message.html.erb b/app/views/users/_project_message.html.erb
index d46823211..3bdbda412 100644
--- a/app/views/users/_project_message.html.erb
+++ b/app/views/users/_project_message.html.erb
@@ -56,7 +56,7 @@
             <%=count %>
         <% end %>
         )</div>
-      <div class="homepagePostReplyBannerTime"><%=format_date(activity.updated_on)%></div>
+      <div class="homepagePostReplyBannerTime"><%#=format_date(activity.updated_on)%></div>
       <%if count>2 %>
           <div class="homepagePostReplyBannerMore"><a id="reply_btn_<%=user_activity.id%>" onclick="expand_reply('#reply_div_<%= user_activity.id %> li','#reply_btn_<%=user_activity.id%>')" data-count="<%= count %>" data-init="0" class=" replyGrey" href="javascript:void(0)" value="show_help" >点击展开更多回复(<%= count.to_s%>)</a></div>
       <% end %>

From 170cdad3e3e93ab7dbd8978319ddc8f78f28c495 Mon Sep 17 00:00:00 2001
From: huang <huang.jingquan@163.com>
Date: Sat, 29 Aug 2015 09:20:04 +0800
Subject: [PATCH 03/42] =?UTF-8?q?=E8=A7=A3=E5=86=B3=E6=B6=88=E6=81=AF?=
 =?UTF-8?q?=E8=BF=87=E6=BB=A4404=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/views/users/user_messages.html.erb | 30 +++++++++++++-------------
 1 file changed, 15 insertions(+), 15 deletions(-)

diff --git a/app/views/users/user_messages.html.erb b/app/views/users/user_messages.html.erb
index 9b0534482..a0d568710 100644
--- a/app/views/users/user_messages.html.erb
+++ b/app/views/users/user_messages.html.erb
@@ -4,25 +4,25 @@
     <ul class="resourcesSelect">
       <li class="resourcesSelected"><a href="javascript:void(0);" class="resourcesIcon"></a>
         <ul class="newsType">
-          <li><%= link_to "全部",{:controller=> 'users', :action => 'user_messages', id: User.current.id, host: Setting.host_user}, :class => "resourcesGrey" %></li>
+          <li><%= link_to "全部",user_message_path(User.current), :class => "resourcesGrey" %></li>
           <%# 课程相关消息 %>
-          <li><%= link_to "作业消息",{:controller=> 'users', :action => 'user_messages', id: User.current.id, host: Setting.host_user, :type => 'homework'}, :class => "resourcesGrey" %></li>
-          <li><%= link_to "课程讨论区",{:controller=> 'users', :action => 'user_messages', id: User.current.id, host: Setting.host_user, :type => 'course_message'}, :class => "resourcesGrey"  %></li>
-          <li><%= link_to "课程通知",{:controller=> 'users', :action => 'user_messages', id: User.current.id, host: Setting.host_user, :type => 'course_news'}, :class => "resourcesGrey"  %></li>
-          <li><%= link_to "通知回复",{:controller=> 'users', :action => 'user_messages', id: User.current.id, host: Setting.host_user, :type => 'course_news_reply'}, :class => "resourcesGrey" %></li>
-          <li><%= link_to "课程问卷",{:controller=> 'users', :action => 'user_messages', id: User.current.id, host: Setting.host_user, :type => 'poll'}, :class => "resourcesGrey"  %></a></li>
-          <li><%= link_to "作品评阅",{:controller=> 'users', :action => 'user_messages', id: User.current.id, host: Setting.host_user, :type => 'works_reviewers'}, :class => "resourcesGrey"  %></li>
-          <li><%= link_to "作品讨论",{:controller=> 'users', :action => 'user_messages', id: User.current.id, host: Setting.host_user, :type => 'works_reply'}, :class => "resourcesGrey"  %></li>
+          <li><%= link_to "作业消息", user_message_path(User.current, :type => 'course_message'), :class => "homework" %></li>
+          <li><%= link_to "课程讨论区",user_message_path(User.current, :type => 'course_message'), :class => "resourcesGrey"  %></li>
+          <li><%= link_to "课程通知",user_message_path(User.current, :type => 'course_news'), :class => "resourcesGrey"  %></li>
+          <li><%= link_to "通知回复", user_message_path(User.current, :type => 'course_news_reply'), :class => "resourcesGrey" %></li>
+          <li><%= link_to "课程问卷", user_message_path(User.current, :type => 'poll'), :class => "resourcesGrey"  %></a></li>
+          <li><%= link_to "作品评阅", user_message_path(User.current, :type => 'works_reviewers'), :class => "resourcesGrey"  %></li>
+          <li><%= link_to "作品讨论", user_message_path(User.current, :type => 'works_reply'), :class => "resourcesGrey"  %></li>
           <%# 项目相关消息 %>
-          <li><%= link_to "指派问题",{:controller=> 'users', :action => 'user_messages', id: User.current.id, host: Setting.host_user, :type => 'issue'}, :class => "resourcesGrey"  %></li>
-          <li><%= link_to "问题更新",{:controller=> 'users', :action => 'user_messages', id: User.current.id, host: Setting.host_user, :type => 'issue_update'}, :class => "resourcesGrey"  %></li>
-          <li><%= link_to "项目讨论区",{:controller=> 'users', :action => 'user_messages', id: User.current.id, host: Setting.host_user, :type => 'forge_message'}, :class => "resourcesGrey"  %></li>
-          <li><%= link_to "项目新闻",{:controller=> 'users', :action => 'user_messages', id: User.current.id, host: Setting.host_user, :type => 'forge_news'}, :class => "resourcesGrey"  %></li>
-          <li><%= link_to "新闻回复",{:controller=> 'users', :action => 'user_messages', id: User.current.id, host: Setting.host_user, :type => 'forge_news_reply'}, :class => "resourcesGrey"  %></li>
+          <li><%= link_to "指派问题", user_message_path(User.current, :type => 'issue'), :class => "resourcesGrey"  %></li>
+          <li><%= link_to "问题更新", user_message_path(User.current, :type => 'issue_update'), :class => "resourcesGrey"  %></li>
+          <li><%= link_to "项目讨论区", user_message_path(User.current, :type => 'forge_message'), :class => "resourcesGrey"  %></li>
+          <li><%= link_to "项目新闻", user_message_path(User.current, :type => 'forge_news'), :class => "resourcesGrey"  %></li>
+          <li><%= link_to "新闻回复", user_message_path(User.current, :type => 'forge_news_reply'), :class => "resourcesGrey"  %></li>
           <%# 项目相关消息 %>
-          <li><%= link_to "贴吧帖子",{:controller=> 'users', :action => 'user_messages', id: User.current.id, host: Setting.host_user, :type => 'forum'}, :class => "resourcesGrey"  %></li>
+          <li><%= link_to "贴吧帖子", user_message_path(User.current, :type => 'forum'), :class => "resourcesGrey"  %></li>
           <%# 系统贴吧 %>
-          <li><%= link_to "用户留言",{:controller=> 'users', :action => 'user_messages', id: User.current.id, host: Setting.host_user, :type => 'user_feedback'}, :class => "resourcesGrey"  %></li>
+          <li><%= link_to "用户留言",user_message_path(User.current, :type => 'user_feedback'), :class => "resourcesGrey"  %></li>
 
         </ul>
       </li>

From 938d0e2bbdd6e3982a577e80bd6c601a2833002c Mon Sep 17 00:00:00 2001
From: huang <huang.jingquan@163.com>
Date: Sat, 29 Aug 2015 09:23:32 +0800
Subject: [PATCH 04/42] =?UTF-8?q?=E8=A7=A3=E5=86=B3=E6=B6=88=E6=81=AF?=
 =?UTF-8?q?=E6=8D=A2=E8=A1=8C=E6=98=BE=E7=A4=BA=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 public/stylesheets/new_user.css | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/public/stylesheets/new_user.css b/public/stylesheets/new_user.css
index 5e5c9517b..c5a5f2f0c 100644
--- a/public/stylesheets/new_user.css
+++ b/public/stylesheets/new_user.css
@@ -531,7 +531,7 @@ a.homepageMenuText {color:#484848; font-size:16px; margin-left:20px;}
 .homepageNewsPublisher { max-width:100px; font-size:12px; color:#15bccf; display:block; padding-left:5px; overflow:hidden; white-space: nowrap; text-overflow:ellipsis; float:left; }
 .homepageNewsType {width:100px; padding-left: 5px; font-size:12px; color:#888888; display:block;}
 .homepageNewsPubType {width:215px; font-size:12px; color:#888888; display: block;}
-.homepageNewsContent {width:355px; max-width:395px; margin-right:10px; font-size:12px; color:#4b4b4b; display:block; overflow:hidden; white-space: nowrap; text-overflow:ellipsis; }
+.homepageNewsContent {width:355px; max-width:395px; margin-right:10px; font-size:12px; color:#4b4b4b; display:block; overflow:hidden; white-space: nowrap; text-overflow:ellipsis;max-height: 49px; }
 .homepageNewsTime {width:75px; font-size:12px; color:#888888; display:block; text-align:right;}
 a.homepageWhite {color:#ffffff;}
 a.homepageWhite:hover {color:#a1ebff}

From 789b62940bc0fb0e4827b6e440b2b402d5cb6647 Mon Sep 17 00:00:00 2001
From: lizanle <491823689@qq.com>
Date: Sat, 29 Aug 2015 09:33:22 +0800
Subject: [PATCH 05/42] =?UTF-8?q?=E8=B5=84=E6=BA=90=E5=90=8D=E7=A7=B0?=
 =?UTF-8?q?=E8=BF=87=E9=95=BF=E4=BC=9A=E8=A6=86=E7=9B=96=E7=9A=84=E9=97=AE?=
 =?UTF-8?q?=E9=A2=98=20=E6=90=9C=E7=B4=A2=E6=8C=89=E9=92=AE=20=E6=89=8B?=
 =?UTF-8?q?=E5=9C=A8=E4=B8=8A=E8=BE=B9=E7=9A=84=E6=97=B6=E5=80=99=E5=91=88?=
 =?UTF-8?q?=E6=89=8B=E5=9E=8B=20=E7=AD=9B=E9=80=89=E8=B5=84=E6=BA=90?=
 =?UTF-8?q?=E5=90=8E=20=20=E8=87=AA=E9=80=89=E8=B5=84=E6=BA=90=E6=B8=85?=
 =?UTF-8?q?=E9=9B=B6=E7=9A=84=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/views/users/user_resource.js.erb | 3 ++-
 public/stylesheets/new_user.css      | 5 +++--
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/app/views/users/user_resource.js.erb b/app/views/users/user_resource.js.erb
index 551c08907..3ebb308b4 100644
--- a/app/views/users/user_resource.js.erb
+++ b/app/views/users/user_resource.js.erb
@@ -1,3 +1,4 @@
 $("#search_div").html('<%= escape_javascript( render :partial =>  'resource_search_form',:locals => {:user=>@user,:type=>@type} ) %>');
 $("#resources_list").html('<%= escape_javascript( render :partial => 'resources_list' ,:locals=>{ :attachments => @attachments})%>');
-$("#pages").html('<%= pagination_links_full @atta_pages, @atta_count, :per_page_links => false, :remote => @is_remote, :flag => true %>');
\ No newline at end of file
+$("#pages").html('<%= pagination_links_full @atta_pages, @atta_count, :per_page_links => false, :remote => @is_remote, :flag => true %>');
+$("#res_count").html(0);
\ No newline at end of file
diff --git a/public/stylesheets/new_user.css b/public/stylesheets/new_user.css
index b9b24dcd8..8e8790fb5 100644
--- a/public/stylesheets/new_user.css
+++ b/public/stylesheets/new_user.css
@@ -341,10 +341,10 @@ a.uploadText {color:#ffffff; font-size:14px;}
 /*.resourcesListType {width:150px; height:40px; line-height:40px; text-align:center;}*/
 /*.resourcesListUploader {width:130px; height:40px; line-height:40px; text-align:center;}*/
 /*.resourcesListTime {width:165px; height:40px; line-height:40px; text-align:center;}*/
-.resourcesListName {width:160px; height:40px; line-height:40px; text-align:left;}
+.resourcesListName {width:180px; height:40px; line-height:40px; text-align:left;}
 .resourcesListSize {width:105px; height:40px; line-height:40px; text-align:center;}
 .resourcesListType {width:150px; height:40px; line-height:40px; text-align:center;}
-.resourcesListUploader {width:180px; height:40px; line-height:40px; text-align:center;}
+.resourcesListUploader {width:160px; height:40px; line-height:40px; text-align:center;}
 .resourcesListTime {width:95px; height:40px; line-height:40px; text-align:center;}
 /*.resourcesList {width:730px; height:39px; background-color:#ffffff; border-bottom:1px dashed #eaeaea; color:#9a9a9a; font-size:12px;}*/
 a.resourcesBlack {font-size:12px; color:#4c4c4c;white-space: nowrap;text-align: left}
@@ -404,6 +404,7 @@ a.resourcesTypeAtt {background:url(images/homepage_icon.png) -180px -49px no-rep
 /*.resourcesUploadBox:hover {background-color:#0781b4;}*/
 /* 个人主页右边部分*/
 .homepageSearchIcon {width:30px; height:32px; background:url(images/nav_icon.png) -8px 3px no-repeat; float:left;}
+input.homepageSearchIcon:hover {cursor: pointer;}
 a.homepagePostTypeQuiz {background:url(images/homepage_icon.png) -90px -124px no-repeat; padding-left:23px;}
 a.homepagePostTypeAssignment {background:url(images/homepage_icon.png) -93px -318px no-repeat; padding-left:23px;}
 a.replyGrey {color:#888888; display:inline-block;}

From 6406d5a2842c87debd77a313d769501592fafbdb Mon Sep 17 00:00:00 2001
From: huang <huang.jingquan@163.com>
Date: Sat, 29 Aug 2015 09:43:44 +0800
Subject: [PATCH 06/42] =?UTF-8?q?=E8=A7=A3=E5=86=B3=E9=82=AE=E4=BB=B6?=
 =?UTF-8?q?=E5=86=85=E5=AE=B9=E7=A9=BA=E7=9A=84=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/views/mailer/send_for_user_activities.html.erb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/views/mailer/send_for_user_activities.html.erb b/app/views/mailer/send_for_user_activities.html.erb
index 0233f7a42..6fc742c99 100644
--- a/app/views/mailer/send_for_user_activities.html.erb
+++ b/app/views/mailer/send_for_user_activities.html.erb
@@ -187,7 +187,7 @@
 
 <!--项目相关-->
 <% if @issues.first || @project_messages.first || @issues_journals.first || @wiki_contents.first || @project_news.first || @project_news_comments.first || @project_journal_messages.first ||
-        @project_news_comments.first  %>
+         @project_attachments.first %>
     <div class="wmail_main" style="padding:20px 10px 0px;">
       <h3 class="wmail_h2" style="color:#474646; "><%= l(:label_project_overview_new)%></h3>
       <% unless @issues.first.nil? || @issues_journals.first.nil? %>

From 553e35281ac1d37d98ef9437e2ad87b3ef41f2da Mon Sep 17 00:00:00 2001
From: lizanle <491823689@qq.com>
Date: Sat, 29 Aug 2015 09:44:36 +0800
Subject: [PATCH 07/42] =?UTF-8?q?=E8=B5=84=E6=BA=90=E5=BC=B9=E5=87=BA?=
 =?UTF-8?q?=E6=A1=86=E7=9A=84=E8=BE=B9=E6=A1=86=E8=89=B2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 public/stylesheets/new_user.css | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/public/stylesheets/new_user.css b/public/stylesheets/new_user.css
index 69f5489b0..4b16dcb85 100644
--- a/public/stylesheets/new_user.css
+++ b/public/stylesheets/new_user.css
@@ -412,7 +412,7 @@ a.replyGrey {color:#888888; display:inline-block;}
 a.replyGrey:hover {color:#4b4b4b;}
 
 /*上传资源弹窗*/
-.resourceUploadPopup {width:400px; height:auto; border:3px solid #269ac9; padding-left:16px; padding-bottom:16px; background-color:#ffffff; position:absolute; top:50%; left:50%; margin-left:-200px; z-index:1000;}
+.resourceUploadPopup {width:400px; height:auto; border:3px solid #269ac9 !important; padding-left:16px; padding-bottom:16px; background-color:#ffffff; position:absolute; top:50%; left:50%; margin-left:-200px; z-index:1000;}
 .uploadDialogText {font-size:16px; color:#269ac9; line-height:16px; padding-top:20px; width:140px; display:inline-block; font-weight: bold;}
 .uploadBoxContainer {height:33px; line-height:33px; margin-top:10px; position:relative}
 .uploadBox {width:100px; height:33px; line-height:33px; text-align:center; vertical-align:middle; background-color:#269ac9; border-radius:3px; float:left; margin-right:12px;}

From 51bf1cd678f0d1fb40b71e5d1d4be39c3a27c5e1 Mon Sep 17 00:00:00 2001
From: sw <939547590@qq.com>
Date: Sat, 29 Aug 2015 09:53:16 +0800
Subject: [PATCH 08/42] =?UTF-8?q?=E4=BD=9C=E4=B8=9A=E6=90=9C=E7=B4=A2?=
 =?UTF-8?q?=E6=94=AF=E6=8C=81enter=E9=94=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/views/users/_show_user_homeworks.html.erb | 8 ++++----
 config/routes.rb                              | 2 +-
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/app/views/users/_show_user_homeworks.html.erb b/app/views/users/_show_user_homeworks.html.erb
index 09413ddce..c14278de3 100644
--- a/app/views/users/_show_user_homeworks.html.erb
+++ b/app/views/users/_show_user_homeworks.html.erb
@@ -4,10 +4,10 @@
   </div>
 
   <div >
-    <form class="coursesSearchBox">
-      <input type="text" name="homework_name" placeholder="输入作业名称进行搜索" class="searchCoursesPopup" id="search_homework_name"/>
-      <a href="javascript:void(0);" class="searchIconPopup" onclick="search_homework_by_name('<%= user_search_homeworks_user_path(User.current.id)%>');"></a>
-    </form>
+    <%= form_tag user_search_homeworks_user_path(User.current.id), :multipart => true, :remote => true, :class => "coursesSearchBox" do%>
+      <input type="text" name="name" placeholder="输入作业名称进行搜索" class="searchCoursesPopup" id="search_homework_name"/>
+      <a href="javascript:void(0);" class="searchIconPopup" onclick="$(this).parent().submit();"></a>
+    <% end%>
   </div>
   <%= form_tag(user_select_homework_users_path, :multipart => true,:remote => true,:name=>"select_homework_form",:id=>'select_homework_form') do %>
       <div class="homeworkListForm mb10 " id="homework_list_form_show">
diff --git a/config/routes.rb b/config/routes.rb
index 7237787bd..be1a0a263 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -328,7 +328,7 @@ RedmineApp::Application.routes.draw do
       match 'user_visitorlist', :to => 'users#user_visitorlist', :via => :get
       match 'user_homeworks', :to => 'users#user_homeworks', :via => :get
       get 'user_import_homeworks'
-      get 'user_search_homeworks'
+      post 'user_search_homeworks'
       get 'user_import_resource'
       match 'watch_projects', :to => 'users#watch_projects', :via => :get
       #

From bc186776d80254fdaa735e5a582addacad7e836a Mon Sep 17 00:00:00 2001
From: lizanle <491823689@qq.com>
Date: Sat, 29 Aug 2015 09:56:34 +0800
Subject: [PATCH 09/42] =?UTF-8?q?=E8=B5=84=E6=BA=90=E7=A7=BB=E5=8A=A8?=
 =?UTF-8?q?=E5=BC=B9=E5=87=BA=E6=A1=86=E5=87=8F=E5=B0=91=E7=95=99=E7=99=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/views/users/_resource_share_for_project_popup.html.erb | 4 ++--
 app/views/users/_resource_share_popup.html.erb             | 4 ++--
 app/views/users/add_exist_file_to_course.js.erb            | 2 +-
 app/views/users/add_exist_file_to_project.js.erb           | 2 +-
 app/views/users/search_user_course.js.erb                  | 2 +-
 app/views/users/search_user_project.js.erb                 | 2 +-
 app/views/users/user_resource.html.erb                     | 3 +++
 public/stylesheets/new_user.css                            | 1 +
 8 files changed, 12 insertions(+), 8 deletions(-)

diff --git a/app/views/users/_resource_share_for_project_popup.html.erb b/app/views/users/_resource_share_for_project_popup.html.erb
index 4d377154e..e5d1732e4 100644
--- a/app/views/users/_resource_share_for_project_popup.html.erb
+++ b/app/views/users/_resource_share_for_project_popup.html.erb
@@ -1,6 +1,6 @@
 
 
-<div class="uploadBoxContainer">
+<div class="boxContainer">
   <div>
     <div class="sendText fl">将资源发送至</div>
     <div class="resourcesSendTo">
@@ -44,7 +44,7 @@
       <!--<a href="javascript:void(0);" class="sendSourceText">确定</a>-->
       <%= submit_tag '确定',:class=>'sendSourceText',:onfocus=>'this.blur();' %>
     </div>
-    <div class="courseSendCancel"><a href="javascript:void(0);" class="sendSourceText" onclick="closeModal();">取消</a></div>
+    <div class="courseSendCancel"><a href="javascript:void(0);" class="sendSourceText" onclick="closePopUp();">取消</a></div>
   </div>
   <div class="cl"></div>
     <% end %>
diff --git a/app/views/users/_resource_share_popup.html.erb b/app/views/users/_resource_share_popup.html.erb
index 376d674cd..2fc515b4a 100644
--- a/app/views/users/_resource_share_popup.html.erb
+++ b/app/views/users/_resource_share_popup.html.erb
@@ -1,6 +1,6 @@
 
 
-<div class="uploadBoxContainer">
+<div class="boxContainer">
   <div>
     <div class="sendText fl">将资源发送至</div>
     <div class="resourcesSendTo">
@@ -44,7 +44,7 @@
           <!--<a href="javascript:void(0);" class="sendSourceText">确定</a>-->
           <%= submit_tag '确定',:class=>'sendSourceText',:onfocus=>'this.blur();' %>
         </div>
-        <div class="courseSendCancel"><a href="javascript:void(0);" class="sendSourceText mt10" onclick="closeModal();">取消</a></div>
+        <div class="courseSendCancel"><a href="javascript:void(0);" class="sendSourceText mt10" onclick="closePopUp();">取消</a></div>
       </div>
       <div class="cl"></div>
   <% end %>
diff --git a/app/views/users/add_exist_file_to_course.js.erb b/app/views/users/add_exist_file_to_course.js.erb
index 93c572fa0..637570bfb 100644
--- a/app/views/users/add_exist_file_to_course.js.erb
+++ b/app/views/users/add_exist_file_to_course.js.erb
@@ -1,5 +1,5 @@
 <% if @flag == true%>
 alert('发送成功')
-closeModal();
+closePopUp();
 <% else%>
 <% end %>
\ No newline at end of file
diff --git a/app/views/users/add_exist_file_to_project.js.erb b/app/views/users/add_exist_file_to_project.js.erb
index 93c572fa0..637570bfb 100644
--- a/app/views/users/add_exist_file_to_project.js.erb
+++ b/app/views/users/add_exist_file_to_project.js.erb
@@ -1,5 +1,5 @@
 <% if @flag == true%>
 alert('发送成功')
-closeModal();
+closePopUp();
 <% else%>
 <% end %>
\ No newline at end of file
diff --git a/app/views/users/search_user_course.js.erb b/app/views/users/search_user_course.js.erb
index 97bde13aa..60ddd6d9c 100644
--- a/app/views/users/search_user_course.js.erb
+++ b/app/views/users/search_user_course.js.erb
@@ -12,7 +12,7 @@
 $("#ajax-modal").html('<%= escape_javascript( render :partial => 'resource_share_popup' ,:locals => {:courses=>@course,:user=>@user,:send_id=>@send_id,:send_ids=>@send_ids})%>');
 showModal('ajax-modal', '452px');
 $('#ajax-modal').siblings().remove();
-$('#ajax-modal').before("<a href='javascript:void(0)' onclick='closeModal();' style='margin-left: 435px;' class='resourceClose'></a>");
+$('#ajax-modal').before("<a href='javascript:void(0)' onclick='closePopUp();' style='margin-left: 435px;' class='resourceClose'></a>");
 $('#ajax-modal').parent().css("top","").css("left","");
 $('#ajax-modal').parent().addClass("popbox").addClass("resourceUploadPopup");
 $('#ajax-modal').css("padding-left","16px").css("padding-bottom","16px");
\ No newline at end of file
diff --git a/app/views/users/search_user_project.js.erb b/app/views/users/search_user_project.js.erb
index 37999120a..26a0f265c 100644
--- a/app/views/users/search_user_project.js.erb
+++ b/app/views/users/search_user_project.js.erb
@@ -8,7 +8,7 @@
 $("#ajax-modal").html('<%= escape_javascript( render :partial => 'resource_share_for_project_popup' ,:locals => {:projects=>@projects,:user=>@user,:send_id=>@send_id,:send_ids=>@send_ids})%>');
 showModal('ajax-modal', '452px');
 $('#ajax-modal').siblings().remove();
-$('#ajax-modal').before("<a href='javascript:void(0)' onclick='closeModal();' style='margin-left: 435px;' class='resourceClose'></a>");
+$('#ajax-modal').before("<a href='javascript:void(0)' onclick='closePopUp();' style='margin-left: 435px;' class='resourceClose'></a>");
 $('#ajax-modal').parent().css("top","").css("left","");
 $('#ajax-modal').parent().addClass("resourceUploadPopup").addClass("popbox")
 $('#ajax-modal').css("padding-left","16px").css("padding-bottom","16px");
diff --git a/app/views/users/user_resource.html.erb b/app/views/users/user_resource.html.erb
index c69062b91..901917220 100644
--- a/app/views/users/user_resource.html.erb
+++ b/app/views/users/user_resource.html.erb
@@ -30,6 +30,9 @@
     {
         hideModal($(".uploadBoxContainer"));
     }
+    function closePopUp(){
+        hideModal($(".boxContainer"));
+    }
 
     function check_files(){
         return $("#attachments_fields").children().length == 0;
diff --git a/public/stylesheets/new_user.css b/public/stylesheets/new_user.css
index 4b16dcb85..93237f697 100644
--- a/public/stylesheets/new_user.css
+++ b/public/stylesheets/new_user.css
@@ -431,6 +431,7 @@ a.uploadIcon {background:url(images/resource_icon_list.png) 8px -60px no-repeat;
 .resourceSharePopup {width:300px; height:auto; border:3px solid #269ac9; padding-left:16px; padding-bottom:16px; background-color:#ffffff; position:absolute; top:50%; left:50%; margin-left:-150px; z-index:1000;}
 .sendText {font-size:16px; color:#269ac9; line-height:16px; padding-top:20px; width:100px; display:inline-block; font-weight: bold;}
 .resourcesSendTo {float:left; height:20px; margin-top:15px;}
+.boxContainer {height:33px; line-height:33px; position:relative}
 .resourcesSendType {border:1px solid #e6e6e6; width:60px; height:24px; outline:none; font-size:14px; color:#888888;}
 .resourcePopupClose {width:20px; height:20px; display:inline-block; float:right;}
 .resourceClose {background:url(images/resource_icon_list.png) 0px -40px no-repeat; width:20px; height:20px; display:inline-block;}

From f2a909f0e5c0cdbf1ad66cd0033a3e28ac9dbb27 Mon Sep 17 00:00:00 2001
From: lizanle <491823689@qq.com>
Date: Sat, 29 Aug 2015 10:00:04 +0800
Subject: [PATCH 10/42] =?UTF-8?q?=E8=B5=84=E6=BA=90=E7=A7=BB=E5=8A=A8?=
 =?UTF-8?q?=E5=BC=B9=E5=87=BA=E6=A1=86=E6=90=9C=E7=B4=A2=E5=A4=84=E9=BC=A0?=
 =?UTF-8?q?=E6=A0=87=E6=82=AC=E6=B5=AE=E8=A6=81=E6=89=8B=E5=9E=8B=E5=85=89?=
 =?UTF-8?q?=E6=A0=87?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 public/stylesheets/new_user.css | 1 +
 1 file changed, 1 insertion(+)

diff --git a/public/stylesheets/new_user.css b/public/stylesheets/new_user.css
index 93237f697..a41e631fb 100644
--- a/public/stylesheets/new_user.css
+++ b/public/stylesheets/new_user.css
@@ -438,6 +438,7 @@ a.uploadIcon {background:url(images/resource_icon_list.png) 8px -60px no-repeat;
 .resourcesSearchBox {border:1px solid #e6e6e6; width:225px; height:25px; background-color:#ffffff; margin-top:12px; margin-bottom:15px;}
 .searchResourcePopup {border:none; outline:none; background-color:#ffffff; width:184px; height:25px; padding-left:10px; display:inline-block; float:left;}
 .searchIconPopup{width:31px; height:25px; background-color:#ffffff; background:url(images/resource_icon_list.png) -40px -18px no-repeat; display:inline-block; float:left;}
+.searchIconPopup:hover {cursor: pointer}
 .courseSend {width:260px; height:15px; line-height:15px; margin-bottom:10px;}
 .courseSendCheckbox {padding:0px; margin:0px; width:12px; height:12px; margin-right:10px; display:inline-block; margin-top:2px;}
 .sendCourseName {font-size:12px; color:#5f6060;}

From a23ec96508a456c6e30ea0d92d3df46000d9ec6d Mon Sep 17 00:00:00 2001
From: sw <939547590@qq.com>
Date: Sat, 29 Aug 2015 10:07:36 +0800
Subject: [PATCH 11/42] =?UTF-8?q?=E5=AD=A6=E6=A0=A1=E9=A6=96=E9=A1=B5?=
 =?UTF-8?q?=E6=8A=A5404?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 config/routes.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/config/routes.rb b/config/routes.rb
index be1a0a263..8451b7365 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -42,7 +42,7 @@ RedmineApp::Application.routes.draw do
 
   end
 
-  resources :school do
+  resources :school, :except => [:show] do
     collection do
 
     end

From ada04e5e635ad4286c2aa0366021a3cd1c581407 Mon Sep 17 00:00:00 2001
From: suntao <719450423@qq.com>
Date: Sat, 29 Aug 2015 10:13:32 +0800
Subject: [PATCH 12/42] =?UTF-8?q?=E4=B8=AA=E4=BA=BA=E4=B8=BB=E9=A1=B5?=
 =?UTF-8?q?=E5=A4=B4=E5=83=8F=E6=A8=A1=E5=9D=97=E6=94=B9=E5=8A=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/views/layouts/new_base_user.html.erb |  16 +++++++++-------
 public/images/avatars/User/0             | Bin 4208 -> 2756 bytes
 public/stylesheets/new_user.css          |  18 +++++++++---------
 3 files changed, 18 insertions(+), 16 deletions(-)

diff --git a/app/views/layouts/new_base_user.html.erb b/app/views/layouts/new_base_user.html.erb
index 9ab29ba8b..a34daabbb 100644
--- a/app/views/layouts/new_base_user.html.erb
+++ b/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">
-          <%= image_tag(url_to_avatar(@user),width:"206", height: "206", :id=>'nh_user_tx') %>
+        <div class="homepagePortraitImage fl" id="homepage_portrait_image">
+          <%= 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="homepageImageName hidden db">
+        <div class="fl ml15">
+          <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">
diff --git a/public/images/avatars/User/0 b/public/images/avatars/User/0
index a4cc45467b6270c6fecc02e21fe8e8836bbc9f9a..bd2597dd2a623d59dea9b37ed4452281a69496d3 100644
GIT binary patch
literal 2756
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
JwKT%?;6G!sTH^o!

literal 4208
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
GLSTY{&N-z3

diff --git a/public/stylesheets/new_user.css b/public/stylesheets/new_user.css
index 5e5c9517b..42c2d8907 100644
--- a/public/stylesheets/new_user.css
+++ b/public/stylesheets/new_user.css
@@ -491,19 +491,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;}
-.homepagePortraitImage {width:206px; height:206px; padding:2px; margin:15px 14px 10px 14px; position:relative; border:1px solid #cbcbcb;}
+.homepagePortraitContainer {width:208px; border:1px solid #dddddd; background-color:#ffffff; margin-top:15px; padding:15px;}
+.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;}
-.homepageEditProfileIcon {background:url(../images/homepage_icon.png) -11px -35px no-repeat; width:20px; height:20px; display:block;}
-.homepageImageName {font-size:16px; color:#484848; margin-left:15px;  margin-right:8px; height:25px; float:left;}
+.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) -14px -37px no-repeat; width:20px; height:20px; display:block;}
+.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;}
-.homepageImageBlock {margin:0 auto; width:78px; float:left; text-align:center; display:inline-block;}
+.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;}
 a.homepageImageNumber {font-size:12px; color:#484848; font-weight: bold;}
 a.homepageImageNumber:hover {color:#269ac9;}
 .homepageImageText {font-size:12px; color:#888888;}
@@ -531,7 +531,7 @@ a.homepageMenuText {color:#484848; font-size:16px; margin-left:20px;}
 .homepageNewsPublisher { max-width:100px; font-size:12px; color:#15bccf; display:block; padding-left:5px; overflow:hidden; white-space: nowrap; text-overflow:ellipsis; float:left; }
 .homepageNewsType {width:100px; padding-left: 5px; font-size:12px; color:#888888; display:block;}
 .homepageNewsPubType {width:215px; font-size:12px; color:#888888; display: block;}
-.homepageNewsContent {width:355px; max-width:395px; margin-right:10px; font-size:12px; color:#4b4b4b; display:block; overflow:hidden; white-space: nowrap; text-overflow:ellipsis; }
+.homepageNewsContent {width:355px; max-width:395px; margin-right:10px; font-size:12px; color:#4b4b4b; display:block; overflow:hidden; white-space: nowrap; text-overflow:ellipsis; max-height: 49px;}
 .homepageNewsTime {width:75px; font-size:12px; color:#888888; display:block; text-align:right;}
 a.homepageWhite {color:#ffffff;}
 a.homepageWhite:hover {color:#a1ebff}
@@ -858,7 +858,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;}

From c650c83f828a6cb50a7c16a14dce123948d91f0f Mon Sep 17 00:00:00 2001
From: cxt <pinecxt@163.com>
Date: Sat, 29 Aug 2015 10:16:04 +0800
Subject: [PATCH 13/42] =?UTF-8?q?=E4=B8=AA=E4=BA=BA=E4=B8=BB=E9=A1=B5?=
 =?UTF-8?q?=E6=8A=A5500=E3=80=81=E5=8A=A8=E6=80=81=E6=98=BE=E7=A4=BA?=
 =?UTF-8?q?=E9=94=99=E4=BD=8D=E7=9A=84bug=E4=BF=AE=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/controllers/users_controller.rb       |  2 +-
 app/views/users/_course_message.html.erb  |  2 +-
 app/views/users/_course_news.html.erb     |  2 +-
 app/views/users/_project_issue.html.erb   |  2 +-
 app/views/users/_project_message.html.erb |  2 +-
 app/views/users/_user_activities.html.erb | 18 +++++++++---------
 app/views/users/show.html.erb             |  6 +++---
 7 files changed, 17 insertions(+), 17 deletions(-)

diff --git a/app/controllers/users_controller.rb b/app/controllers/users_controller.rb
index 555c67d13..1f5d38e25 100644
--- a/app/controllers/users_controller.rb
+++ b/app/controllers/users_controller.rb
@@ -649,7 +649,7 @@ class UsersController < ApplicationController
           @user_activities = UserActivity.where("container_type = 'Project' and container_id in #{user_project_ids} and act_type = 'Message'").order('created_at desc').limit(10).offset(@page * 10)
         else
           @user_activities = UserActivity.where("(container_type = 'Project' and container_id in #{user_project_ids} and act_type in #{project_types}) or (container_type = 'Course' and container_id in #{user_course_ids}) and act_type in #{course_types}").order('created_at desc').limit(10).offset(@page * 10)
-  end
+     end
     else
       @user_activities = UserActivity.where("(container_type = 'Project' and container_id in #{user_project_ids} and act_type in #{project_types}) or (container_type = 'Course' and container_id in #{user_course_ids}) and act_type in #{course_types}").order('created_at desc').limit(10).offset(@page * 10)
     end
diff --git a/app/views/users/_course_message.html.erb b/app/views/users/_course_message.html.erb
index 0f0a145e3..ff7e43105 100644
--- a/app/views/users/_course_message.html.erb
+++ b/app/views/users/_course_message.html.erb
@@ -106,7 +106,7 @@
                                     ) if reply.course_destroyable_by?(User.current) %>
                                 <!--<a href="javascript:void(0);" class="replyGrey fr ml10">删除</a>-->
                               </div>
-                              <div class="homepagePostReplyContent" style="white-space: nowrap;overflow: hidden;text-overflow: ellipsis;" title="<%= reply.content.html_safe %>"><%= reply.content.html_safe %></div>
+                              <div class="homepagePostReplyContent"><%= reply.content.html_safe %></div>
                             </div>
                             <div class="cl"></div>
                           </li>
diff --git a/app/views/users/_course_news.html.erb b/app/views/users/_course_news.html.erb
index 5e538c65e..603901ae4 100644
--- a/app/views/users/_course_news.html.erb
+++ b/app/views/users/_course_news.html.erb
@@ -83,7 +83,7 @@
                                                        :data => {:confirm => l(:text_are_you_sure)}, :method => :delete, :title => l(:button_delete) %>
                       <!--<a href="javascript:void(0);" class="replyGrey fr ml10">删除</a>-->
                     </div>
-                    <div class="homepagePostReplyContent" style="white-space: nowrap;overflow: hidden;text-overflow: ellipsis;" title="<%= comment.comments.html_safe %>"><%= comment.comments.html_safe %></div>
+                    <div class="homepagePostReplyContent"><%= comment.comments.html_safe %></div>
                   </div>
                   <div class="cl"></div>
                 </li>
diff --git a/app/views/users/_project_issue.html.erb b/app/views/users/_project_issue.html.erb
index eb0341607..0ee4f30fb 100644
--- a/app/views/users/_project_issue.html.erb
+++ b/app/views/users/_project_issue.html.erb
@@ -119,7 +119,7 @@
                             <div class="homepagePostReplyContent" style="white-space: nowrap;overflow: hidden;text-overflow: ellipsis;"><%= string %></div>
                         <% end %>
                     <% else %>
-                        <div class="homepagePostReplyContent" style="white-space: nowrap;overflow: hidden;text-overflow: ellipsis;"><%= reply.notes.html_safe %></div>
+                        <div class="homepagePostReplyContent"><%= reply.notes.html_safe %></div>
                     <% end %>
                   </div>
                   <div class="cl"></div>
diff --git a/app/views/users/_project_message.html.erb b/app/views/users/_project_message.html.erb
index 3bdbda412..e60676ac6 100644
--- a/app/views/users/_project_message.html.erb
+++ b/app/views/users/_project_message.html.erb
@@ -103,7 +103,7 @@
                           ) if reply.course_destroyable_by?(User.current) %>
                       <!--<a href="javascript:void(0);" class="replyGrey fr ml10">删除</a>-->
                     </div>
-                    <div class="homepagePostReplyContent" style="white-space: nowrap;overflow: hidden;text-overflow: ellipsis;" title="<%= reply.content.html_safe %>"><%= reply.content.html_safe %></div>
+                    <div class="homepagePostReplyContent"><%= reply.content.html_safe %></div>
                   </div>
                   <div class="cl"></div>
                 </li>
diff --git a/app/views/users/_user_activities.html.erb b/app/views/users/_user_activities.html.erb
index 1cfeb7ed8..b43d0d54e 100644
--- a/app/views/users/_user_activities.html.erb
+++ b/app/views/users/_user_activities.html.erb
@@ -3,16 +3,16 @@
         <script>
             //$(function(){if($("#contentmessage<%#=topic.id %>").height()>182){$("#project_show_<%#= topic.id%>").show();}});
             //解决由于图片加载慢造成div高度不够 以至于展开按钮不显示的bug
-            $(function(){
+            /*$(function(){
                 function nh_show_btn(){
-                    if($("#activity_message_<%= user_activity.id%>").is(':hidden')){
-                        if($("#activity_description_<%= user_activity.id%>").height()>120){
-                            $("#activity_description_<%= user_activity.id%>").toggleClass("activity_description_maxHeight");
-                            $("#activity_message_<%= user_activity.id%>").show();
+                    if($("#activity_message_<%#= user_activity.id%>").is(':hidden')){
+                        if($("#activity_description_<%#= user_activity.id%>").height()>120){
+                            $("#activity_description_<%#= user_activity.id%>").toggleClass("activity_description_maxHeight");
+                            $("#activity_message_<%#= user_activity.id%>").show();
                         }
                     }
                 }
-                var div = $("#activity_description_<%= user_activity.id%>");
+                var div = $("#activity_description_<%#= user_activity.id%>");
                 var imgs = $('img',div);
                 var lens = imgs.length;
                 function nh_load_img_end(){
@@ -24,8 +24,8 @@
                     });
                 }
                 nh_show_btn();
-            });
-            function show_more_reply(contentid, id2, id3) {
+            });*/
+            /*function show_more_reply(contentid, id2, id3) {
                 $(contentid).toggleClass("activity_description_maxHeight");
                 $(contentid).toggleClass("course_description_none");
                 var information = $(id2);
@@ -41,7 +41,7 @@
                     information.attr("value", "show_more");
                     arrow.attr("src", "/images/jiantou.jpg")
                 }
-            }
+            }*/
             function expand_reply(container,btnid){
                 var target = $(container);
                 var btn = $(btnid);
diff --git a/app/views/users/show.html.erb b/app/views/users/show.html.erb
index dc56b2fcb..4af2b8165 100644
--- a/app/views/users/show.html.erb
+++ b/app/views/users/show.html.erb
@@ -1,10 +1,10 @@
 <script type="text/javascript">
-    var scrollHandler = function(){
+    var scrollHandler = function () {
         if ($(window).scrollTop() == $(document).height() - $(window).height()) {
             $.get(
                     '<%= user_activities_path(@user.id)%>',
-                    { page : $("#show_more_activities").val(),
-                    type: $("#user_activities_type").val()},
+                    { page: $("#show_more_activities").val(),
+                        type: $("#user_activities_type").val()},
                     function (data) {
 
                     }

From 2d00eb982c4250066a666a8027a8136a61484ffc Mon Sep 17 00:00:00 2001
From: sw <939547590@qq.com>
Date: Sat, 29 Aug 2015 10:31:53 +0800
Subject: [PATCH 14/42] =?UTF-8?q?=E5=8F=96=E6=B6=88=E8=B7=B3=E8=BD=AC?=
 =?UTF-8?q?=E5=88=B0=E4=B8=AA=E4=BA=BA=E4=B8=BB=E9=A1=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/views/courses/new.html.erb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/views/courses/new.html.erb b/app/views/courses/new.html.erb
index 75979d9f3..8c7a41ddc 100644
--- a/app/views/courses/new.html.erb
+++ b/app/views/courses/new.html.erb
@@ -50,7 +50,7 @@
       </li>
       <li class=" ml90" >
         <a href="javascript:void(0)" class="blue_btn fl c_white" onclick="submit_new_course();" >提交</a>
-        <a href="http://<%= Setting.host_course%>" target="_blank" class="blue_btn grey_btn fl c_white">取消</a>
+        <%= link_to "取消",user_activities_path(User.current.id),:class => "blue_btn grey_btn fl c_white"%>
         <div class="cl"></div>
       </li>
     <% end%>

From 60b429b13d2af0b195f97d825a47f2a529e15a61 Mon Sep 17 00:00:00 2001
From: lizanle <491823689@qq.com>
Date: Sat, 29 Aug 2015 10:33:04 +0800
Subject: [PATCH 15/42] =?UTF-8?q?=E5=8F=91=E9=80=81=E6=88=90=E5=8A=9F?=
 =?UTF-8?q?=E4=B8=8D=E7=BB=99=E6=8F=90=E7=A4=BA=20=E8=AF=BE=E7=A8=8B?=
 =?UTF-8?q?=E8=B5=84=E6=BA=90=E8=BF=87=E5=B0=91=E7=9A=84=E6=97=B6=E5=80=99?=
 =?UTF-8?q?=E4=B8=8D=E7=BB=99=E6=BB=9A=E5=8A=A8=E6=9D=A1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/views/users/add_exist_file_to_course.js.erb  | 1 -
 app/views/users/add_exist_file_to_project.js.erb | 1 -
 public/stylesheets/new_user.css                  | 2 +-
 3 files changed, 1 insertion(+), 3 deletions(-)

diff --git a/app/views/users/add_exist_file_to_course.js.erb b/app/views/users/add_exist_file_to_course.js.erb
index 637570bfb..08737f5ca 100644
--- a/app/views/users/add_exist_file_to_course.js.erb
+++ b/app/views/users/add_exist_file_to_course.js.erb
@@ -1,5 +1,4 @@
 <% if @flag == true%>
-alert('发送成功')
 closePopUp();
 <% else%>
 <% end %>
\ No newline at end of file
diff --git a/app/views/users/add_exist_file_to_project.js.erb b/app/views/users/add_exist_file_to_project.js.erb
index 637570bfb..08737f5ca 100644
--- a/app/views/users/add_exist_file_to_project.js.erb
+++ b/app/views/users/add_exist_file_to_project.js.erb
@@ -1,5 +1,4 @@
 <% if @flag == true%>
-alert('发送成功')
 closePopUp();
 <% else%>
 <% end %>
\ No newline at end of file
diff --git a/public/stylesheets/new_user.css b/public/stylesheets/new_user.css
index d7f79943e..57bd6685a 100644
--- a/public/stylesheets/new_user.css
+++ b/public/stylesheets/new_user.css
@@ -452,7 +452,7 @@ input.sendSourceText:hover {background-color:#297fb8;}
 /*input.sendSourceText:hover {font-size:14px; color:#ffffff;}*/
 .resourcesSendTo {float:left; height:20px; margin-top:15px;}
 .resourcesSendType {border:1px solid #e6e6e6; width:60px; height:24px; outline:none; font-size:14px; color:#888888;}
-.courseReferContainer {float:left; max-height:120px;margin-right:16px;margin-bottom:10px;    overflow:scroll; overflow-x:hidden;}
+.courseReferContainer {float:left; max-height:120px;margin-right:16px;margin-bottom:10px;    overflow:auto; overflow-x:hidden;}
 .popbox{/* width:300px; *//* height:100px; */position:fixed !important;/* z-index:100; */left:50%;top:50%;margin:-100px 0 0 -150px;  /* background:#fff; */ -moz-border-radius:5px;  /* -webkit-border-radius:5px; */  /* border-radius:5px; */ /* box-shadow:0px 0px 8px #194a81; */  /* overflow:auto; */}
 /*上传资源弹窗*/
 .resourceUploadPopup {width:400px; height:auto; border:3px solid #269ac9; padding-left:16px; padding-bottom:16px; background-color:#ffffff; position:absolute; top:50%; left:50%; margin-left:-200px; z-index:1000;}

From 878f48079d0e1964b6aa465b13066903822f7a55 Mon Sep 17 00:00:00 2001
From: lizanle <491823689@qq.com>
Date: Sat, 29 Aug 2015 10:36:55 +0800
Subject: [PATCH 16/42] =?UTF-8?q?=E5=85=A8=E9=80=89=E6=A1=86=E5=9C=A8?=
 =?UTF-8?q?=E7=BF=BB=E9=A1=B5=E5=90=8E=E4=B9=9F=E5=BA=94=E8=AF=A5=E9=87=8D?=
 =?UTF-8?q?=E7=BD=AE=E4=B8=BA=E4=B8=8D=E9=80=89?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/views/users/user_resource.js.erb | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/app/views/users/user_resource.js.erb b/app/views/users/user_resource.js.erb
index 3ebb308b4..dcb22ccf3 100644
--- a/app/views/users/user_resource.js.erb
+++ b/app/views/users/user_resource.js.erb
@@ -1,4 +1,5 @@
 $("#search_div").html('<%= escape_javascript( render :partial =>  'resource_search_form',:locals => {:user=>@user,:type=>@type} ) %>');
 $("#resources_list").html('<%= escape_javascript( render :partial => 'resources_list' ,:locals=>{ :attachments => @attachments})%>');
 $("#pages").html('<%= pagination_links_full @atta_pages, @atta_count, :per_page_links => false, :remote => @is_remote, :flag => true %>');
-$("#res_count").html(0);
\ No newline at end of file
+$("#res_count").html(0);
+$("#checkboxAll").attr('checked',false);
\ No newline at end of file

From 4d1fc0dc458042e81534e78554efd77b28f3c870 Mon Sep 17 00:00:00 2001
From: sw <939547590@qq.com>
Date: Sat, 29 Aug 2015 10:54:45 +0800
Subject: [PATCH 17/42] =?UTF-8?q?=E8=B0=83=E6=95=B4=E5=BA=95=E9=83=A8?=
 =?UTF-8?q?=E5=AF=BC=E8=88=AA=E6=A0=8F=E5=AE=BD=E5=BA=A6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 public/stylesheets/base.css   | 4 ++--
 public/stylesheets/header.css | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/public/stylesheets/base.css b/public/stylesheets/base.css
index fa1bbdd4a..7cd048dde 100644
--- a/public/stylesheets/base.css
+++ b/public/stylesheets/base.css
@@ -1,7 +1,7 @@
 /* CSS Document */
 /* 2015-06-26 */
-body,h1,h2,h3,h4,h5,h6,hr,p,blockquote,dl,dt,dd,ul,ol,li,pre,form,fieldset,legend,button,input,textarea,th,td{ margin:0; padding:0;}
-body,table,input,textarea,select,button { font-family: "微软雅黑","宋体"; font-size:12px;line-height:1.5;}
+.navContainer h1,h2,h3,h4,h5,h6,hr,p,blockquote,dl,dt,dd,ul,ol,li,pre,form,fieldset,legend,button,input,textarea,th,td{ margin:0; padding:0;}
+.navContainer body,table,input,textarea,select,button { font-family: "微软雅黑","宋体"; font-size:12px;line-height:1.5;}
 div,img,tr,td,table{ border:0;}
 table,tr,td{border:0;cellspacing:0; cellpadding:0;}
 ol,ul,li{ list-style-type:none}
diff --git a/public/stylesheets/header.css b/public/stylesheets/header.css
index 33c92809b..2ba6f0bbf 100644
--- a/public/stylesheets/header.css
+++ b/public/stylesheets/header.css
@@ -97,9 +97,9 @@ a.topnav_login_box:hover {color:#a1ebff;}
 /*底部*/
 #Footer{background-color:#ffffff;  padding-bottom:15px; color:#666666;} /*margin-bottom:10px;*/
 .footerAboutContainer {width:auto; border-bottom:1px solid #efefef;}
-.footerAbout{ width:455px; margin:0 auto;height:35px; line-height:35px;}
+.footerAbout{ width:485px; margin:0 auto;height:35px; line-height:35px;}
 .languageBox {width:55px; height:20px; margin-left:5px; outline:none; color:#666666; border:1px solid #d9d9d9;}
-.departments{ width:890px; margin:5px auto 0 auto;height:30px;line-height:30px;}
+.departments{ width:950px; margin:5px auto 0 auto;height:30px;line-height:30px;}
 .copyright{ width:375px; margin:0 auto;height:20px;line-height:20px;}
 a.f_grey {color:#666666 !important;}
 a.f_grey:hover {color:#000000 !important;}

From 189405f0a9848b259988802b7d3a0790a9f0aec0 Mon Sep 17 00:00:00 2001
From: sw <939547590@qq.com>
Date: Sat, 29 Aug 2015 10:58:45 +0800
Subject: [PATCH 18/42] =?UTF-8?q?=E8=AF=BE=E7=A8=8B=E6=90=9C=E7=B4=A2?=
 =?UTF-8?q?=E6=9C=89=E9=83=A8=E5=88=86=E6=96=87=E6=9C=AC=E9=87=8D=E5=8F=A0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 public/stylesheets/base.css | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/public/stylesheets/base.css b/public/stylesheets/base.css
index 7cd048dde..7e2376add 100644
--- a/public/stylesheets/base.css
+++ b/public/stylesheets/base.css
@@ -1,6 +1,6 @@
 /* CSS Document */
 /* 2015-06-26 */
-.navContainer h1,h2,h3,h4,h5,h6,hr,p,blockquote,dl,dt,dd,ul,ol,li,pre,form,fieldset,legend,button,input,textarea,th,td{ margin:0; padding:0;}
+.navContainer h1,h2,h3,h4,h5,h6,hr,blockquote,dl,dt,dd,ul,ol,li,pre,form,fieldset,legend,button,input,textarea,th,td{ margin:0; padding:0;}
 .navContainer body,table,input,textarea,select,button { font-family: "微软雅黑","宋体"; font-size:12px;line-height:1.5;}
 div,img,tr,td,table{ border:0;}
 table,tr,td{border:0;cellspacing:0; cellpadding:0;}

From 00ab2bcbd48a1792c4bc6bd2d3b4b0b8e3b5cd81 Mon Sep 17 00:00:00 2001
From: sw <939547590@qq.com>
Date: Sat, 29 Aug 2015 11:09:19 +0800
Subject: [PATCH 19/42] =?UTF-8?q?=E4=BD=9C=E4=B8=9A=E5=90=8D=E7=A7=B0?=
 =?UTF-8?q?=E8=BF=87=E9=95=BF=E8=B6=85=E5=87=BA=E8=BE=B9=E6=A1=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/views/users/_user_homework_list.html.erb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/views/users/_user_homework_list.html.erb b/app/views/users/_user_homework_list.html.erb
index 7998128e0..fa9b1537a 100644
--- a/app/views/users/_user_homework_list.html.erb
+++ b/app/views/users/_user_homework_list.html.erb
@@ -11,7 +11,7 @@
             TO
             <%= link_to homework_common.course.name, course_path(homework_common.course_id), :class => "newsBlue ml15"%>
           </div>
-          <div class="homepagePostTitle">
+          <div class="homepagePostTitle hidden">
             <%= link_to homework_common.name,student_work_index_path(:homework => homework_common.id),:class => "postGrey"%>
           </div>
 

From 86e9ec068f6b2831cd7d5ae566715803826fd1d0 Mon Sep 17 00:00:00 2001
From: sw <939547590@qq.com>
Date: Sat, 29 Aug 2015 11:12:18 +0800
Subject: [PATCH 20/42] =?UTF-8?q?=E6=96=B0=E5=BB=BA=E4=BD=9C=E4=B8=9A?=
 =?UTF-8?q?=E6=97=B6=EF=BC=8C=E4=BD=9C=E4=B8=9A=E6=88=AA=E6=AD=A2=E6=97=B6?=
 =?UTF-8?q?=E9=97=B4=E4=B8=BA=E7=A9=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/controllers/users_controller.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/controllers/users_controller.rb b/app/controllers/users_controller.rb
index 555c67d13..a95559554 100644
--- a/app/controllers/users_controller.rb
+++ b/app/controllers/users_controller.rb
@@ -352,7 +352,7 @@ class UsersController < ApplicationController
       homework = HomeworkCommon.new
       homework.name = params[:homework_common][:name]
       homework.description = params[:homework_common][:description]
-      homework.end_time = params[:homework_common][:end_time]
+      homework.end_time = params[:homework_common][:end_time] || Time.now
       homework.publish_time = Time.now
       homework.homework_type = 1
       homework.late_penalty = 2

From 726359885187e7d3a9e5eb9054d6365a81a5e194 Mon Sep 17 00:00:00 2001
From: sw <939547590@qq.com>
Date: Sat, 29 Aug 2015 11:17:46 +0800
Subject: [PATCH 21/42] =?UTF-8?q?=E8=AE=BF=E9=97=AE=E9=97=AE=E5=8D=B7?=
 =?UTF-8?q?=E6=8A=A5500?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/helpers/poll_helper.rb | 12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)

diff --git a/app/helpers/poll_helper.rb b/app/helpers/poll_helper.rb
index 170e1b92c..84e12f3b1 100644
--- a/app/helpers/poll_helper.rb
+++ b/app/helpers/poll_helper.rb
@@ -37,7 +37,17 @@ module PollHelper
       pv.vote_text
     end
   end
-  
+
+  #判断用户是否已经提交了问卷
+  def has_commit_poll?(poll_id,user_id)
+    pu = PollUser.find_by_poll_id_and_user_id(poll_id,user_id)
+    if pu.nil?
+      false
+    else
+      true
+    end
+  end
+
   #统计答题百分比，统计结果保留两位小数
   def statistics_result_percentage(e, t)
     e = e.to_f

From 5f3532ac14265dc1adc464d767df0950deb2d8a7 Mon Sep 17 00:00:00 2001
From: suntao <719450423@qq.com>
Date: Sat, 29 Aug 2015 11:25:49 +0800
Subject: [PATCH 22/42] =?UTF-8?q?=E5=A4=B4=E5=83=8F=E9=83=A8=E5=88=86?=
 =?UTF-8?q?=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/views/layouts/new_base_user.html.erb |   4 +++-
 public/images/homepage_icon.png          | Bin 8565 -> 10212 bytes
 public/stylesheets/new_user.css          |  10 ++++++++--
 3 files changed, 11 insertions(+), 3 deletions(-)

diff --git a/app/views/layouts/new_base_user.html.erb b/app/views/layouts/new_base_user.html.erb
index a34daabbb..7b7f4a536 100644
--- a/app/views/layouts/new_base_user.html.erb
+++ b/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>
diff --git a/public/images/homepage_icon.png b/public/images/homepage_icon.png
index 3df72965e861062e8982e5ba67a80c88604d1886..4478af0708c8fb71961a090f11331279d253e4c2 100644
GIT binary patch
literal 10212
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
Q*8>10In|ftGG_1p3%cj#3;+NC

literal 8565
zcmb7q2UJsA(`Xb>u>gWpX$BCf5eS&jOMpOV(tB^Ag^)-u>QzeUAXSReK?DKm%@U+{
z5kt!*NRuXALEwdZulKw6t^fPqdRb?ky=U*4+560ynLRTnQF=P+S1z($1ONb6G~h6O
zaytM3oSD0Dj@)xM=T0X#tXNf3tO3dy>u2ZV1W<BB**kG-c-px*={wmu2B5p0WB~vQ
zAkxqjYpSg!?SS$WwL8TT_4o89Qv(393jW@94(?7^ZhI#eq?a6Uqq!Z(jdYX)nn-Hj
z*7jC$az(-eeVhyebqpN>-5sEgKm~bjS$}CV15YQc9k;)yhZjcLUk>;OUukmxbQlEW
z{sRT;E(iQ`Q>NN_+$ty^CvHhm2@!|eVq)A<QlesDNhv8YVQ%r;V&b6N<V#9K3@j}v
zB`to3`>!96yqb@rv$Q@;?XR`SkQ~qzi}jWUf&BdZMExX0Q9dppF(?#z%0paSgp47A
z3Gl+&`HOgAcz$t!Ibj@pklt7%%8UDyqn$nK9##%W-szu@;OYH0TQAICVj>F+<ZtH<
z5)-|B`bfVJwYC3uR8P;pu`yVEr~mBte`Jg?4DfaW={sRi_k0}4FV30gbSZCX6(1)%
zEXv0ah4T0%MLky(7KL#|d2_26NO9jXL3%l&{4fH4;A?A3Yj|O>c3uun8ZbE^nS&@2
z=_n0RyG_2-AYf$`6)`bYNo8dyOhsJk4g{>CdIzec_KOyVa=7Q|<c0l3>-Zm9=zpa>
zRRvFP^2#tLAEd97qnZ!OllzZHmPY>fy-596et*$A{`bAy`LDDf@@7D%FZLfV`qvOy
zdrrH5t1TJ$Tk)N|$lC5hR%@NU#%%zAV_5^HWavM!noXT<Fh;n)q3s;bntBFp6H56U
zR(|OtmC_^hZ$Lr4yC>#Ku+7T$T6+P7+Iwd#1%Y1Es#IyBB`@z^@-k(4`I3nW{kG~>
z^fOx_8F56?VVI4N_!RY>4Bliy(tb$J2DH1C-|o8)@y7tP5mUJaiK7B6+wsr<NC56%
zw*)Ex{*0>~X_a%^b#>M|YK1Ql;gOOKLf7EcO!jq(1_|`pd^0Hx2$IpX+13(Eb?$wq
z-c(ijC-NZ&pB;HZiga_=1A=vOWCQYF#4m0NgjjnDqi?dEA^otlPrwUCangej*w~f)
zlh3vE?TT6E8heRFTD$?~oVm840@Jp>HvF59Ru3)rI7%B+I+dzZ4KoWmizBNv4|wI|
z3kN~fB03<XG5i|u(pDW_fd1qO<fc+CThtsZD+SJwsHX4+rSVfGFV|#(k2AReMuJ8~
zC-OfBo5{$l=8*Y-`g7O5@+v&>X~9cqgx)IDBeBUZTv+3a8?v#bE{KY8<Ewb$DkP=_
zRGi2>`L1P>HEOVgF;1P~Urg-T%mBw1ZzidKk>pBfTu_i7WnBCwe009~8>@P_+o1*q
zIkoT#@9td9Ht07m>Dg_$&6T^1Ge{`p>Kk-npAC*0Y3N>tmkLtwVO5ttG#oe48>;=a
z$h_IX+nJ&XSZY?-^<0~)&JR`^D`+}El(Nhg72yjqrz^b`KC*3}mDqDsNPKr>fguVX
zGxeX(Ts_@l1TT}+w}=CWOa_vr70Xb{Yc9O!F(}FmIA}-TO8-UR4Rd~fSa6Y0oQ|cs
z+3*JANQan8yx4-6X(~-`*<4+0%FtLHt=xh{7z0xNrss@Sjx1EDv$#dKwbP}jc*<1m
z{$byvT6rnB<&8~c4+<BWj|2B|(wtp!)1YhU9A5WbiI9Vx*YUbn7akiDiR1TkwM9l|
z@dmp)qt$+|E!av@79N5N?mBn5Pb4-zDbqFYbdeqb8?vkFW{%RH2nq$3J$#zLC<pR<
z%_uiav$p`EH&>cThUk(Q<K=DOQ_kU7T8$2Z>V$r(OFpc64)bu8OC)h`bGdh9u%x$)
z*&--aXE&lrixeu~R&a?jvv@-@i#I+uaR^o0+}N}P%0_kVUC*07oKpTIPT#fiot=Mj
zqjyK{x_IZN@*v|uA)dGQ@Ul@fR7X<<a$Noly&zZHSq#URsLb@H&F8L}(2w#uZ;45k
z&=cUJw^I1sJ6-C8bb9pA&m`aH>QMY`G-UJnhY6h;(;ri>6@#_Ep_aH@mU9bzxu@?#
zO7p|^<xEMcQE>(Abo@{X-X6Z3S9xLEA=Lqw->~za;eR@tVVo{$yi;KkDB{@aM{P2B
z9>1x$p;Ud#%XBa2D!*3GgXa@7>?>kvW*{+o<bB*+{~f+#!K!xmr`A2Y;3!?VB=^9~
z&J$B0nr;L@Do}fn@ohgQxk!s-puehZ`^lo)w^RPfqqN8}mN0q^k9kbiy7A6Jg$<AP
zf#LexhOyDtW)&`zdpq$JUW-8@b(Kx68_PX9$MT7x**{$nM0@d68Ag}iSd%#HRZ(3M
zmy!A}AcESn72ghz-HJU+x@K;yS-Y4(^f3?l+ES>R-?u7vwC%pNKfK;yp`2ovwZM1X
z?@$^qe6d6}(BvT<Qu}JB^c!aEj_+z}8hDuKk!tk)UV}-2uG9BdwuxbpvRS%Y;`uEt
zmhBE7FI5pmt2%Hq@vbc^kT!?k-#p-w?9kKhoQ=>7jsY*<ZIRq@e)YK?ICiWbAb)Fy
zNjbBx5IX#GWY|XDv+sh&2B~fWHzTR6jsR)2=V;%cag=Uf{<2}F$0{!s8dMV7Dq`rm
zG2`w}hBd?e4ig(=3Wlp*&MbT*(l2T*WpnK~yEqiQvlQNR2ncRsY`r?BOIJ)acL{oj
zFxw>LVpP~R`O`>;KP+~%uBjDuH+w`hWGw+BnSrp#WY8)!LzVUHI!6}0`#7_w$GO5P
z+FqyMKw$O*dwpQl8IEh>H*ifs*2o2`tOhg;aq^jaqKRTgd%B6vxD>}ywy*HfK|?l<
zxGQN5!-km~QMWKoVTp{b=y6~`#iGgA9;XD{C@uk~Z|KrZsA|GIojs>9YLXd1@BVU$
zW1}ct6O#zvI!_>e!p*pvL?A;0Dxz<vWsGy{Aa)Cye%pv@c>a`Vv)sau$z>3dIf!6f
zr)ejNf!LI5H8e7L%9oB5YDcnA3*bOh#xSs-p}O6Wb1=1G2+t<eR958Kx<6=F@+s!g
z(cX04o5$;A!0Me_Q=S1i#&m+!^~|U%t*`}slC)5hk8ffrn1^?O4w)JWKHoFfNKZ_H
zbo>Mcj^c7UPB@mgsThl?7|i0l98P4$j>!shqdHYw`t8X}0UBx9=5cubqJccma~H=Y
z!Av49XZR#;;DLVPIdo=5nLcrvDrMlfbPx1%qET%@@q9w#lOfQPdb44Jw`IHoOi0nh
zJu{)en_(HH<dAY}vS=hY<Lgr%9SPF+wOmR>@QTV~-$FR{g<)<#=le$Qdon~K_V$g#
z-st*AZM+zP=fq=L2}Z|ie3bJITP~pkm!ma4>r{Ug`zJexy3(jPNI%qYlD;f;)?`0(
zukE)<4_czB-u$Xi@`-`Fkp6ih>IEX?JoDN`+7jX2T>dpyM-eB^RETz2A0=|5J}>M+
zIdkl=ffvo~OJ`0JAi4!V{F+b$B*jY!>X~liEsMLK=cHubnT&Z6nF7N-3OjPOoEp{h
z+8N~v)waut$wzu5BcUeYR%r5_#fOg)YT&iQ8~7cqOGodv^(5X+2#9s!a{3x2NB7m(
z$!EIauba}Z&Ywg7oI+}mkMGb_Faw`xx@^D}%?QoQ?4pBFWb4q=W5U;H;9d385w)XH
zWFqVYYlJF(#vD8<6uUGwy9*3ffy;5n)q?}?Qnp@;H%@OyWQlCbMKKm|q|f;yFfHKd
z@}_#v@fW;%sZg4F&+`iq&XJ`fYwMU~HB{y8KYW=;to4n%l_v9T(oSFM)__;YSoqBZ
zHPlH_8iU*gBmk|Stj5eLpRmNrublyZ&r$LKs&lppVTn`)dB=k9Lj>~D7{;P4R*o1I
zlruk~<pUfGYQF#cF)($+zOt`cdzEnWuuIR2c5Fvme*8xap8s@(O5OB(+d8$!p{k7>
zQ#ma*N~KP_LEg`%o$&6CBIlXUb6-KuGz8bR9#mCrd8Zf**)`w8r+1c9oENFXNvl>m
zS+>?D*CI7Cc9-+>*M6sIowuefo?L?Zo<xZ91nnB!z5D!5^a$wp-J*uTx4UdYf&EJ|
zFPA#T5hUxpquqzAxm0H#2;z}ZBR{vBGWI&#5AMP;z0zcz_rv_neY!tPJ647UV_`Wt
zCPdF%|3O%_X(c4k>x+c*`kHe+{${)YPSk7J>e8_V{s#bUo(aCr%!LH8wTJ_?2VaEo
z(N8@cSuviu^Dfk7Bqma}SpMy+m!aq;jqPW!=P*b`_4iiUgpwyL{G@WVtkjzWqjGK4
z?bhQ2=uTG9T6Mc6GocQtVe-N%?Vj(US5UUm?5gEjw5K0a*dk}p`x=I<IxDG39+NeM
zR5C7qfBz#pV@Fi-g<RIM5I&NyN)}Tci*38FT|mLa<;n{sbOX%>of8|xJ&EFH*yfPo
zu(-<6lSYPP50n+UeETJ9@~ZXtKr|ezpr<sZp^=rQ#YkPWDb7&=1rGdfD5GNV3fUbQ
zNf(i`?csTkP+N!iQg7lNgv|b$7q7~e0<*r;MUMvNExQ+fHC<tjsiEU%%^X*}IZ)`p
z3Z}A{S>r<PL)WJ#e26ErNS)^Q<K1=h>(9+$N%>*EPg@osE1$2UN<(Nv*1}yx+!r%>
zG+gzK9d8X>#3PX(JvP{p_Xq?zWBK(3XpVzx<=Vl-J}OzWwt}BpyT^sK%`2pgqj3dm
zaM!enV3;$*+TK|qX~pB&EXtKURN$eQWvS9W6(a)hu>M3a3pfd&X1?Z_TjMpuIqX}p
zrg_%D-pZk!2AzpJVLSFNINGTi4pRGAKjqrKJ(n>s!gVx+V4HRcIan&Jz3xyM+se#K
zdhsEYqjy;QQ4OY+n8P(RKWsF>3d(lkGOSZG87yDa`Cgo3JokF7df==4LgLbekhkBu
z^k3)1VLl1D5V8+Fe5FL!-9T(Vs|$OFRfw|iI#1w>8AC(ErIBM<>X+-K!Wt`<HoAUn
zS1(Y`oNC43^*QIs7hGIINiA;imiNN1_PB^-Lq=!5twM_|;v+2&Y5k|ao(#>`B0lQw
zn>vQIu49WQ`7o=;w3q>NiQgdFmiG$YQ5L={_mSpke#cq2^Hch;unfleTA^higR<5p
zoC&*Rcg4b-`w()-j^5JZ-2dT5RXF*Q!CB{ZvrW_InhpN=C#q$4y@PfxBL`R%vszMJ
zwyP;#rVUQrO6e?PgtzA}d$h4n|6E5OxKP!;yM}#Lt`xS;x1AT?#Yy5G%25!5Penkl
zkQC2C<ufEkCK~s;x{%N@i~Z!UHHr&RF2Z!DytXghc>o$fzWr+d05bKm-jvrTt^0Wd
z760T}Bh{P4D0JUE8Zt-jC^%v~Ry=#_vfu!29o&iHXVz<blZ99B0qBZFft?W6)Ma7<
zq-tof`sk+35TVM&8$SQwldiES?fmyu?Y0EW{Z7iBI+af!P4Dms-Wj42j5B=F=nD~y
z6{R#CM#QVVla1d!%pdM_*`xSU3DHN2f{hjx^zEeaMp-n~M~Kl4`;jY`$4C)Qb}lEB
zleFOXV7OvHz>k%YEc=``dGFuf7<6mq2-7J32I<)K2P~iZ{!*93-y10>nG>89vmlOJ
z?IT*pgG?G^_q(7<2(4)50z^{`cc0vi^Bn&iXTY6w*%w6FwOwLa$MG?=;3*Y_V4MYK
zr@#~3R_H_AYvui9H>S%a5K+Moxz~dHFE3N#&xG3!HK<71UI>Q(?n3~P6!#$ky+m2g
z;-)L+7cA$`{VCo*#ESlxkkNp@rnb^>INbXJGawo^RWZ&xaGCP#m?Jg%Sp`@j(YXQN
zP2JSOUB&abK2V*q`L`G;1<Ue$BufH}ZGKXqP1iy{!{Ib%Eum4msc|`FNamV{c)P}i
zZ~(TixPXnNY)zz}Fw!TfyQoo~yaW_`=g|!R5|D$XAgv}AMSwRngP-L^a_2VhaoEES
zieM<hex+;{QC3v@E)%iZd;yx~y;OJnd_tE`nSK$+@^nhZ5SXYAYN~i=NiNgSVx~;;
z)R~AV#t6^t<k;wYmlOS^tl83Jn~uyzL0o3p^ZOR>?VesItqN7O<;XXMoyhiYHVL;A
z&1oj5=+p~KHkde@PHM=5nM}u_Ls}%+()YJBdUteQ`43HA9?gNV3(}BQXGN*4G%Ri<
zWij%{%7@LY=DyXtg7$gr5fZ<B1-XFO5l^1g<!wS>lZPx=zKZX5{z(6wEKgB0`Ombp
zlxJ5USc|ZZs=j>*Y2NGZ1<+BP=u>NF)%Nxuka$dsQr=C(1|xXmd?R<9VU{?uC<9kB
z=5ee~f=`Pc>JE%kBJN#q+O)Mn&Cq6Mcx1mQ8e7oZhWNG*Zug<!szL(_Tadvf#i3d%
zQLrLr08J_zye)L_c(GI*7L<LBLPZkbnuQ}P#4pA8Lp%PzfT0OIbzk6%J+u>lm~L3C
zM5oEx&gS`S`)MY@SAG$=)xufjLmcVl^NHw6vW-Tqs=VNHH`yu|-0gR*k=waDTj8yc
zSo~R^i|-3sW4Pj5X_M|@f=?IK#cF=-@12`teXkRfoFham4&gS435_4=t7OTQ$3#;+
zxZnSLvZo_)mXN5geY0qy-POfEuf@4e_UCO~Oz3a;r>t$psH0G!2v3^Gxff{8A-ANh
z0?mV-Z)-{cpA~d5ZI*%`gjkKsrP!;X<doAyhQHt_-dH9C9@3ihy<1r{ngOe6iDC0I
zjjHQ3p5lHE4(U&z@iEHM^6q<hhS#wO&wF*rRzESHw6qTn3NB$V&Rd&3+l>3jUoN$X
zz~EpqOlN(}vVcLzrb=pNLN7c7mb8Z++&wP!Yml-MoQ%6+0KKKtFm&8DhX`3J3{iQ!
z$5<f$E*BP)Z#h_*x-^@ktof}FEs8TBr%!hGf{1;Fhwe5ZSH_C$Bf)|BvoihLI@C;*
z;azQS*~_2}kY_Gu4O0%BKN#gmV>qVyL)Lr7YtE4h&?ZTCTR$)J^tVx4`!M&8ibOy3
zXidz~F(7oG+|T*4T<Lr8{h>}3gVlwhWLaYBjp_OIWZCVk`*@=EtxnBr8nSwW?%XE$
zD4AZfjwN05WS<1QX4Eok8<S5dNwG&3eldOSKPfeDgX#Hy)~o)RgOkVqIrT3997%TN
z`hoelO@4HzqwB7B%JqLnzGwb#z_pfinjT2P#mN5s<CE|5SC}TJC3nP-;YH3%L(iRJ
ze@v7|8;pLc7dP}ckE?%FCb?7PahMQKpPBwt_5K*W!zi6|d7GNeWC1CXyH~|?HD5K|
z*5j#ss%K|co8Ncg=hTf__EmTf9zC<_iw=)6JgqTiA*h^M1xFbYErNJ!ig7*Hu-v!p
zj(qF)N5{cMLyuJIDvBP)Na|}@HF(e3k0)sDBV{^QEs}c<w~9v-bTK*UywUv&)&3d!
zRA_D+s%r78=g<JQe+lG&E>rvx;a{y{TeN|-HD|(tW|R_rYyZMLJ%X2$1>$W>C2$U3
zD%2le&}fv$tCTiPe<xDbFWI>(2n|aIl3h@+MV`4(H2xC3Q4t~*f6E{W*Vi@+)RSBe
zx4e;z_<aUhK;RxWdDNgbVMPye@7m^bo<tYL?;Sx)!&?~D%lgGee!elxd=BjLsd3j1
zwju13(_H<$y;fuEplf6v&$;`L(-7bJLV4_47Ly!fBkcmZYBcK<Y#m3(b$I88lKj7x
z7KbAwIwoow3SE`b#oa!Z{2;KEg-pK2Fs$0FRC#($xt}q|fdd7m0@O0+7dCyigL4SE
zjA(M?{gU!<+}|U5SMEvtMRVIiLYcwEQqd4zH8=MnmZlKga#~8q1DFTmRcqJlQ2B~S
zn9kh9$2VPYNcBiz#FR|m_Eq!|8}EShDCb5MD&XNbJHx(tiIDc{;cZuQ;QJbXB<YJ8
z=bim-(=2AKpu|pP#f<Pycl!{Vg_;Qjn^j%Ake7vx_^6}sAU3Rtv~<x7P7<sEa~!@3
zLO|Hi=O64f_OvYAkS~^QY*fxX<XvsBy5vaY7XRpI#GikJjB-eQ7Ur-Za>;57y9K$8
zB`S~Zr>)Ps7YMW)W)cJ7`7z@*;v>cPwIl;;mqn6Kl&G0#?H6rC2S1VCz$6?;jj9W`
z&Jcw>WuivGUw!~;JWH4JLr!ST@)!w*^Ux?CP`fP?yvB@#ja$2E#-7d$iVu(n5l8_3
z0IBDYT|>;|m<eX@vBy)T1vc7kx&CV=ROURxW0J7uaoO?0W$Jvj*ojXGIEKS#yYI&&
zH=5^q2tGA0X-5<hYOr)S)wFDf7cM-O?<GPkohPd3qg7wWU8#U1_;wIh1I^t!LMj<e
z&@<v=2Ylk=<&52%>CDS%g_G&`rLF>%T+&#YU?)Mna|k<vUk-R;->CZ2>XVE{9gocy
z^`){7AzzBjct^JPvCxSZQ-etjmIsvGhBdVFsir|X?Nw7-+&bIc66%>Jy9q9jj<p$B
z-Nd$9R&ETkEkODe_8SLqqD9|fEb=j_GDPUqL=DU;93rB^X?5ZE;96tKf7ko|4gFdD
z`;S>E_FgS+X$dZ2Y(2O07I`f5w0w!`Ru0d6!li<ssyMBJyEL!!#x>7%A<#5lZ`wOJ
z2;44ROAjBdztAay;2nTek-uHI4>2o)h-D<LQFJkmSQ)t|0G4Ss0qJv!(g7JjXpUw$
zTRhpn0X>aMH})P*4^W218U*DQ>pgFkF|{X7ItP6(?n9e18}N2AZGlC{)`G(rp*{B1
zkWlv*9M#gLF#7Rcat7S|t~j7oYI=SN#P$v2^(9}^@~wlN)U^GV#;8>=jX4sA6Yq3^
z8gU$r<8FCg63kY4J+|0nweQ~U5s6U^KkJdukQFcFlxUcaq&G+`PF%PpE*ou_O><1`
zS@(F|Z)0?^X?nU+Nk#I9Vs3q3+B5X~S{X;;ZZNx9%Azwz1#7_04{&vo92Qb^YB5t=
zUB@z0nA~tfc955P=7(hU4zaB%xLP%$;mu6K@^Sb~&o|>A-aiy;v>tY(A)VJL%-%6$
zY5K8YD)<cNP#)z}=8O8*sM+q*jAB`g$A(W-DrYkZ*7gTZy6gqWB*FJ-A7USc>gFQ`
zRArR+alEM(oGEJc%?C~)CFf#Ik<T`VKzI80!A`*bkS031Lr!&}*u7HZip4^u?}txM
zzKdR{t<nX}upL}Rmp}sILmSN&`yQ~p;FXFQ)vQ^JIjg=P<Eu)JR=97{lJwA9ZCh}I
z#gA+pnHjT$-3m{>PZi#(^YX_z<ihC6)d(B~^^n8`Y=uLF$fU^NddN?rDmmukEmNCR
z-Z$~x2^)4+clFZZv>6f*Ex)Yr2qMxjp}1|(BC_LHSkct@B~d_kNZk$aHLbYpqk<yy
zm3LIWPTCg4O-qw2+!X%~w*L+N3cdeKd;S@s|7(U#t=gR%a~Ivk*We3QJXa7>|L|aa
z?p?pl0~`f_PzvcY0hFAE{6l#WZr!#w0CW+Jw2Gs&V<qx`#(diHopu+_{h)DC|9_Uu
z|6?@&IJkZd{$XW*19<W&6&eM`@cvw1o2t69rJv<kzaN>Vd|-XE|9vDyBRqe~RI>o8
zmgx=$eGz1xHWf6Rr$e3{5l&sw3VeV|maefHY2n!niBcyQ&2>m_m@@ED-)JskC*|vo
z3=))Ps@Qa+GQv%R#eO0PmY&-b?t3HA4ZM6#Fz!w<yhT*3+rj#EHkN|1^C<=I!0<&C
zw^N?&3`pakz7Te=O`6E$bem-TuJhHt3yOl?3jjUzsg(Z8jsE{b;9rEl+S3f{U)(eV
zKp>)S<|1DipBERz`}gev20DJpfW0*5MEo#4kvV|Vdu>!kiwN3G@yJy!JA?k(Gpd?d
zOW({(!=O>ehU9$0;?guNJXxIR)x{W$)U2-TT)2;%)Y#chP$R?}s?6Ycgm)4awMLH-
zBnnz2XKK1)*$q^L8?axWXR?vLH3mG_cUDOuN`P}DCe6+~-B3mJZh~`Ic5z>tDOdfG
zXw+Lc#pN+sI%+03CKm5C?kr-~%O{1`z)+0<RBD@4>L?1Jh&)sK$1sbiV%`sMc1P8;
zl6X2aQ?k7xJ1XiND^g8^U3l1pBtw6|F?b<yk#FR3WU?unmC+&I@HtC!;(0ok_}goR
z0?FwwM<Q7eeS3BzKUMR(uwzi26nwzQBIC%FfJTVz7l>vi2mK&CCR)RRi8e>#{cAUd
z2zXyYx@y^t%8sj|-g4IT?W270K825H7AF$jy8O^Pj|NI7aJ-YP(kubth@bI{M|nG%
r`d5Tczw`X>uKyoeT+nrL={CTM(mUT?hah$OM+gm79ax33?Zf{A>HvjI

diff --git a/public/stylesheets/new_user.css b/public/stylesheets/new_user.css
index 29b1e4863..5c3ac7ac7 100644
--- a/public/stylesheets/new_user.css
+++ b/public/stylesheets/new_user.css
@@ -504,6 +504,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 +521,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;}

From e5bf355a1718c042f4bd793e8b02e737034558ad Mon Sep 17 00:00:00 2001
From: sw <939547590@qq.com>
Date: Sat, 29 Aug 2015 11:28:02 +0800
Subject: [PATCH 23/42] =?UTF-8?q?=E5=AF=BC=E8=88=AA=E6=A0=8F=E6=90=9C?=
 =?UTF-8?q?=E7=B4=A2=E6=94=AF=E6=8C=81enter=E9=94=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/views/layouts/_logined_header.html.erb | 13 +++++++++++--
 app/views/layouts/_unlogin_header.html.erb | 13 +++++++++++--
 2 files changed, 22 insertions(+), 4 deletions(-)

diff --git a/app/views/layouts/_logined_header.html.erb b/app/views/layouts/_logined_header.html.erb
index e48864305..56e4bef5f 100644
--- a/app/views/layouts/_logined_header.html.erb
+++ b/app/views/layouts/_logined_header.html.erb
@@ -19,7 +19,7 @@
   </div>
   <script>
       <% type = type%>
-      $(document).ready(function (){
+      $(function (){
           if('<%= type %>' != null && '<%= type %>' == 'courses' ){
               $('input:radio[value="courses"]').attr('checked','checked');
           }
@@ -30,13 +30,22 @@
               $('input:radio[value="users"]').attr('checked','checked');
           }
       });
+
+      $(function(){
+          $("#navHomepageSearchInput").keypress(function(e){
+              if (e.keyCode == '13') {
+                  $('#type').val($('input[type=radio]:checked').val());
+                  $(this).parent().submit();
+              }
+          })
+      });
   </script>
   <div class="fl" id="navHomepageSearch">
     <!--<form class="navHomepageSearchBox">-->
     <% name = name%>
 
     <%= form_tag({controller: :welcome, action: :search },:class=>'navHomepageSearchBox', method: :get) do %>
-      <input type="text" name="q" value="<%= name.nil? ? "" : name%>" class="navHomepageSearchInput" placeholder="请输入关键词进行搜索" />
+      <input type="text" name="q" value="<%= name.nil? ? "" : name%>" id="navHomepageSearchInput" class="navHomepageSearchInput" placeholder="请输入关键词进行搜索"/>
         <input type="hidden" name="search_type" id="type" value=""/>
         <a href="javascript:void(0);" class="homepageSearchIcon" onclick="$('#type').val($('input[type=radio]:checked').val());$(this).parent().submit();"></a>
      <% end %>
diff --git a/app/views/layouts/_unlogin_header.html.erb b/app/views/layouts/_unlogin_header.html.erb
index d11fdbfb2..d6c6fbc51 100644
--- a/app/views/layouts/_unlogin_header.html.erb
+++ b/app/views/layouts/_unlogin_header.html.erb
@@ -19,7 +19,7 @@
          $(doc).parent().submit();
      }
      <% type = type%>
-     $(document).ready(function (){
+     $(function (){
          if('<%= type %>' != null && '<%= type %>' == 'courses' ){
              $('input:radio[value="courses"]').attr('checked','checked');
          }
@@ -30,13 +30,22 @@
              $('input:radio[value="users"]').attr('checked','checked');
          }
      });
+
+     $(function(){
+         $("#navHomepageSearchInput").keypress(function(e){
+             if (e.keyCode == '13') {
+                 $('#type').val($('input[type=radio]:checked').val());
+                 $(this).parent().submit();
+             }
+         })
+     });
  </script>
   <div class="fl" id="navHomepageSearch">
     <!--<form class="navHomepageSearchBox">-->
     <% name = name%>
 
     <%= form_tag({controller: :welcome, action: :search },:class=>'navHomepageSearchBox', method: :get) do %>
-      <input type="text" name="q" value="<%= name.nil? ? "" : name%>" class="navHomepageSearchInput" placeholder="请输入关键词进行搜索" />
+      <input type="text" name="q" value="<%= name.nil? ? "" : name%>" id="navHomepageSearchInput"  class="navHomepageSearchInput" placeholder="请输入关键词进行搜索" />
       <input type="hidden" name="search_type" id="type" value=""/>
       <a href="javascript:void(0);" class="homepageSearchIcon" onclick="$('#type').val($('input[type=radio]:checked').val());$(this).parent().submit();"></a>
     <% end %>

From a111b9a3fd0dd625cd2b89349ea9ba995132439f Mon Sep 17 00:00:00 2001
From: ouyangxuhua <ouyangxuhua167@163.com>
Date: Sat, 29 Aug 2015 11:29:05 +0800
Subject: [PATCH 24/42] =?UTF-8?q?=E7=94=A8=E6=88=B7=E5=85=B3=E6=B3=A8ajax?=
 =?UTF-8?q?=E5=88=B7=E6=96=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/views/users/_user_show.html.erb | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/app/views/users/_user_show.html.erb b/app/views/users/_user_show.html.erb
index 7cbb20e40..9eabb2be5 100644
--- a/app/views/users/_user_show.html.erb
+++ b/app/views/users/_user_show.html.erb
@@ -30,9 +30,13 @@
                         <a href="<%= url_for(:controller => 'my', :action => 'account') %>" class="fr gz_btn mr10 ">编辑资料</a>
                     <%else%>
                         <%if(user.watched_by?(User.current))%>
-                            <a id="user_watch_id" href="<%= watch_path(:object_type=> 'user',:object_id=>user.id,:target_id=>user.id) %>" class="fr qx_btn mr10" data-method="delete" data-remote="true" title="取消关注">取消关注</a>
+                            <a id="user_watch_id" href="javascript:void(0);">
+                              <%=link_to "取消关注", watch_path(:object_type=> 'user',:object_id=>user.id,:target_id=>user.id, :remote => "true"), :class => "fr qx_btn mr10", :method => "delete", :title => "取消关注" %>
+                            </a>
                         <% else %>
-                            <a id="user_watch_id" href="<%= watch_path(:object_type=>'user',:object_id=>user.id,:target_id=>user.id) %>" class="fr gz_btn mr10" data-method="post" data-remote="true" title="添加关注">添加关注</a>
+                            <a id="user_watch_id" href="javascript:void(0);">
+                              <%= link_to "添加关注", watch_path(:object_type=>'user',:object_id=>user.id,:target_id=>user.id, :remote => "true"), :class => "fr gz_btn mr10", :method => "post", :title => "添加关注" %>
+                            </a>
                         <% end %>
                     <% end%>
                 <% end %>

From f01b5681a5a0c6b24374ec5707f91302ff4ff1d6 Mon Sep 17 00:00:00 2001
From: sw <939547590@qq.com>
Date: Sat, 29 Aug 2015 11:33:58 +0800
Subject: [PATCH 25/42] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E9=A1=B9=E7=9B=AE?=
 =?UTF-8?q?=E3=80=81=E8=AF=BE=E7=A8=8B=E7=9A=84=E6=94=B6=E8=B5=B7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/views/layouts/new_base_user.html.erb | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/app/views/layouts/new_base_user.html.erb b/app/views/layouts/new_base_user.html.erb
index 9ab29ba8b..9561cc474 100644
--- a/app/views/layouts/new_base_user.html.erb
+++ b/app/views/layouts/new_base_user.html.erb
@@ -94,7 +94,7 @@
           <%= link_to "动态",user_activities_path(@user.id),:class => "homepageMenuText"%>
         </div>
         <div class="homepageLeftMenuBlock">
-          <a href="javascript:void(0);" class="homepageMenuText">课程</a>
+          <a href="javascript:void(0);" class="homepageMenuText" onclick="$('#homepageLeftMenuCourses').slideToggle();">课程</a>
           <% if is_current_user%>
               <% if User.current.user_extensions && User.current.user_extensions.identity == 0 && User.current.allowed_to?(:add_course, nil, :global => true)%>
                   <%=link_to image_tag("../images/menu_setting.png",width:"14px", height: "14px",class: "homepageMenuSetting"), new_course_path%>
@@ -103,20 +103,20 @@
               <% end%>
           <% end%>
         </div>
-        <div class="homepageLeftMenuCourses">
+        <div class="homepageLeftMenuCourses" id="homepageLeftMenuCourses">
           <ul>
             <% courses = @user.courses.visible.select("courses.*,(SELECT MAX(created_at)  FROM `course_activities` WHERE course_activities.course_id = courses.id) AS a").order("a desc").limit(5)%>
             <%= render :partial => 'layouts/user_courses', :locals => {:courses => courses,:user => @user, :page => 0} %>
           </ul>
         </div>
         <div class="homepageLeftMenuBlock">
-          <a href="javascript:void(0);" class="homepageMenuText">项目</a>
+          <a href="javascript:void(0);" class="homepageMenuText" onclick="$('#homepageLeftMenuForge').slideToggle();">项目</a>
 
           <% if is_current_user%>
               <%=link_to image_tag("../images/menu_setting.png",width:"14px", height: "14px",class: "homepageMenuSetting"), new_project_path%>
           <% end%>
         </div>
-        <div class="homepageLeftMenuCourses">
+        <div class="homepageLeftMenuCourses" id="homepageLeftMenuForge">
           <ul>
             <% projects = @user.projects.visible.select("projects.*,(SELECT MAX(created_at)  FROM `forge_activities` WHERE forge_activities.project_id = projects.id) AS a").order("a desc").limit(5)%>
             <%= render :partial => 'layouts/user_projects', :locals => {:projects => projects,:user => @user, :page => 0} %>

From 2b7beaeae8c2b0c9cb732d7a6ab798be7877d9ff Mon Sep 17 00:00:00 2001
From: lizanle <491823689@qq.com>
Date: Sat, 29 Aug 2015 11:35:33 +0800
Subject: [PATCH 26/42] =?UTF-8?q?=E4=B8=8A=E6=AC=A1=E7=99=BB=E5=BD=95?=
 =?UTF-8?q?=E7=9A=84=E5=9C=B0=E5=9D=80=E7=94=A8=E6=88=B7id=E5=8F=98?=
 =?UTF-8?q?=E4=B8=BA=E5=BD=93=E5=89=8D=E7=94=A8=E6=88=B7id?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/controllers/application_controller.rb | 1 +
 1 file changed, 1 insertion(+)

diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb
index 10e5e6f06..698b0de48 100644
--- a/app/controllers/application_controller.rb
+++ b/app/controllers/application_controller.rb
@@ -563,6 +563,7 @@ class ApplicationController < ActionController::Base
         uri = URI.parse(back_url)
         # do not redirect user to another host or to the login or register page
         if (uri.relative? || (uri.host == request.host)) && !uri.path.match(%r{/(login|account/register)})
+          back_url = back_url.gsub(%r{\/users\/(\d+)},"/users/"+default.id.to_s)
           redirect_to(back_url)
           return
         end

From 977f81e0318d3d4da5cd5f87d2096d36706366b3 Mon Sep 17 00:00:00 2001
From: suntao <719450423@qq.com>
Date: Sat, 29 Aug 2015 11:41:12 +0800
Subject: [PATCH 27/42] =?UTF-8?q?=E5=85=B3=E6=B3=A8=E5=92=8C=E5=8F=96?=
 =?UTF-8?q?=E6=B6=88=E5=85=B3=E6=B3=A8=EF=BC=8C=E5=AF=BC=E8=88=AA=E5=9C=86?=
 =?UTF-8?q?=E8=A7=92?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/views/layouts/_logined_header.html.erb | 2 +-
 public/stylesheets/new_user.css            | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/app/views/layouts/_logined_header.html.erb b/app/views/layouts/_logined_header.html.erb
index e48864305..70de9fd0b 100644
--- a/app/views/layouts/_logined_header.html.erb
+++ b/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"%>
diff --git a/public/stylesheets/new_user.css b/public/stylesheets/new_user.css
index 5c3ac7ac7..a56087017 100644
--- a/public/stylesheets/new_user.css
+++ b/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;}

From c5b0b4164c336e42079ff6a124793739877d9add Mon Sep 17 00:00:00 2001
From: sw <939547590@qq.com>
Date: Sat, 29 Aug 2015 11:54:28 +0800
Subject: [PATCH 28/42] =?UTF-8?q?=E8=BF=81=E7=A7=BB=E6=96=87=E4=BB=B6back?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 db/migrate/20150820025358_about_user_activities.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/db/migrate/20150820025358_about_user_activities.rb b/db/migrate/20150820025358_about_user_activities.rb
index ea98e9a32..82b58a537 100644
--- a/db/migrate/20150820025358_about_user_activities.rb
+++ b/db/migrate/20150820025358_about_user_activities.rb
@@ -32,6 +32,6 @@ class AboutUserActivities < ActiveRecord::Migration
   end
 
   def down
-
+    UserActivity.destroy_all
   end
 end

From 92298160a78d9a2c75061f3cf77066c00441e68b Mon Sep 17 00:00:00 2001
From: lizanle <491823689@qq.com>
Date: Sat, 29 Aug 2015 11:58:44 +0800
Subject: [PATCH 29/42] =?UTF-8?q?=E6=90=9C=E7=B4=A2=E5=90=8E=E7=9A=84?=
 =?UTF-8?q?=E8=B5=84=E6=BA=90=E6=80=BB=E6=95=B0=E5=9C=A8=E6=90=9C=E7=B4=A2?=
 =?UTF-8?q?=E6=A1=86=E5=8F=B3=E8=BE=B9=E5=B1=95=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/views/users/resource_search.js.erb | 3 ++-
 app/views/users/user_resource.html.erb | 6 ++++++
 app/views/users/user_resource.js.erb   | 3 ++-
 3 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/app/views/users/resource_search.js.erb b/app/views/users/resource_search.js.erb
index a956ed212..894c1d2fa 100644
--- a/app/views/users/resource_search.js.erb
+++ b/app/views/users/resource_search.js.erb
@@ -1,2 +1,3 @@
 $("#resources_list").html('<%= escape_javascript( render :partial => 'resources_list' ,:locals=>{ :attachments => @attachments})%>');
-$("#pages").html('<%= pagination_links_full @atta_pages, @atta_count, :per_page_links => false, :remote => @is_remote, :flag => true %>');
\ No newline at end of file
+$("#pages").html('<%= pagination_links_full @atta_pages, @atta_count, :per_page_links => false, :remote => @is_remote, :flag => true %>');
+$("#res_all_count").html(<%= @atta_count%>);
\ No newline at end of file
diff --git a/app/views/users/user_resource.html.erb b/app/views/users/user_resource.html.erb
index 901917220..0ddb799a8 100644
--- a/app/views/users/user_resource.html.erb
+++ b/app/views/users/user_resource.html.erb
@@ -72,6 +72,12 @@
     <div id="search_div">
       <%= render :partial =>  'resource_search_form',:locals => {:user=>@user,:type=>@type} %>
     </div>
+    <div style="
+    float: left;
+            margin-top: 7px;
+            font-size: 14px;
+            margin-left: 15px;
+    "><span style="align:center ;font-size: 14px;color: gray;">为您找到<span id="res_all_count"><%= @atta_count%></span>个资源</span></div>
   </div>
   <div class="resourcesListBanner">
     <ul class="resourcesListTab">
diff --git a/app/views/users/user_resource.js.erb b/app/views/users/user_resource.js.erb
index dcb22ccf3..bb195d4bf 100644
--- a/app/views/users/user_resource.js.erb
+++ b/app/views/users/user_resource.js.erb
@@ -2,4 +2,5 @@ $("#search_div").html('<%= escape_javascript( render :partial =>  'resource_sear
 $("#resources_list").html('<%= escape_javascript( render :partial => 'resources_list' ,:locals=>{ :attachments => @attachments})%>');
 $("#pages").html('<%= pagination_links_full @atta_pages, @atta_count, :per_page_links => false, :remote => @is_remote, :flag => true %>');
 $("#res_count").html(0);
-$("#checkboxAll").attr('checked',false);
\ No newline at end of file
+$("#checkboxAll").attr('checked',false);
+$("#res_all_count").html(<%= @atta_count%>);
\ No newline at end of file

From e455f93ee11a818188fb502570b0f7ff806cbf9f Mon Sep 17 00:00:00 2001
From: sw <939547590@qq.com>
Date: Sat, 29 Aug 2015 12:04:35 +0800
Subject: [PATCH 30/42] =?UTF-8?q?=E4=B8=8A=E4=BC=A0=E5=9B=BE=E7=89=87?=
 =?UTF-8?q?=EF=BC=9B=E6=B5=8F=E8=A7=88=E5=9B=BE=E7=89=87=E6=8C=89=E9=92=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/views/layouts/new_base_user.html.erb | 6 +++---
 public/stylesheets/new_user.css          | 2 +-
 public/stylesheets/users.css             | 1 -
 3 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/app/views/layouts/new_base_user.html.erb b/app/views/layouts/new_base_user.html.erb
index 9561cc474..2f9fd4642 100644
--- a/app/views/layouts/new_base_user.html.erb
+++ b/app/views/layouts/new_base_user.html.erb
@@ -158,10 +158,10 @@
     <div class="pro_new">
       <h3 class="box_h3 mb10">头像设置</h3>
       <div class="uppicBox">
+        <input type="button" class="uppic_btn" onclick="$('#upload_user_image').click();" value="浏览.."/>
         <%= file_field_tag 'avatar[image]',
-                           :id => nil,
-                           :class => 'uppic_btn',
-                           :style => 'width:70px;',#added by young
+                           :id => "upload_user_image",
+                           :style => 'display:none;',#added by young
                            :size => "1",
                            :multiple => false,
                            :onchange => 'addInputAvatar(this);',
diff --git a/public/stylesheets/new_user.css b/public/stylesheets/new_user.css
index 5e5c9517b..062006e56 100644
--- a/public/stylesheets/new_user.css
+++ b/public/stylesheets/new_user.css
@@ -855,7 +855,7 @@ a.box_close{background:url(../images/img_floatbox.png) -22px 0 no-repeat;}
 .uppicBox{ width:265px; height:265px; background:#f2f2f5; float:left; color:#666;  text-align:center;}
 .showpicBox{width:133px; height:250px; background:#f2f2f5; float:left; margin-left:20px; text-align:center; padding-top:15px; color:#666;}
 .mr15{ margin-right:15px;}
-.uppic_btn{border:none; width:150px; background:none; margin-bottom:5px; color:#666; margin-top:105px;}
+.uppic_btn{background: #64bdd9;color: #fff;width: 80px;height: 25px;margin-top: 105px;}
 
 /*20150820课程作业 LB*/
 .HomeWork {width:708px; background-color:#ffffff; padding:20px; border:1px solid #dddddd;}
diff --git a/public/stylesheets/users.css b/public/stylesheets/users.css
index 48d73f86a..849aa1c02 100644
--- a/public/stylesheets/users.css
+++ b/public/stylesheets/users.css
@@ -116,7 +116,6 @@ a:hover.c_lgrey{ color:#3ca5c6;}
 .uppicBox{ width:265px; height:265px; background:#f2f2f5; float:left; color:#666;  text-align:center;}
 .showpicBox{width:133px; height:250px; background:#f2f2f5; float:left; margin-left:20px; text-align:center; padding-top:15px; color:#666;}
 .mr15{ margin-right:15px;}
-.uppic_btn{border:none; width:150px; background:none; margin-bottom:5px; color:#666; margin-top:105px;}
 /* 新建作品*/
 .mr8{ margin-right:8px;}
 .mt2{ margin-top:2px;}

From 5f4b879fb78d9052d7a2db30532728389e71e72a Mon Sep 17 00:00:00 2001
From: huang <huang.jingquan@163.com>
Date: Sat, 29 Aug 2015 12:06:57 +0800
Subject: [PATCH 31/42] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=B6=88=E6=81=AF?=
 =?UTF-8?q?=E8=BF=87=E6=BB=A4=E6=9D=A1=E4=BB=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/views/users/user_messages.html.erb | 26 +++++++++++++-------------
 1 file changed, 13 insertions(+), 13 deletions(-)

diff --git a/app/views/users/user_messages.html.erb b/app/views/users/user_messages.html.erb
index a0d568710..2d23c6dd6 100644
--- a/app/views/users/user_messages.html.erb
+++ b/app/views/users/user_messages.html.erb
@@ -6,23 +6,23 @@
         <ul class="newsType">
           <li><%= link_to "全部",user_message_path(User.current), :class => "resourcesGrey" %></li>
           <%# 课程相关消息 %>
-          <li><%= link_to "作业消息", user_message_path(User.current, :type => 'course_message'), :class => "homework" %></li>
-          <li><%= link_to "课程讨论区",user_message_path(User.current, :type => 'course_message'), :class => "resourcesGrey"  %></li>
+          <li><%= link_to "作业消息", user_message_path(User.current, :type => 'homework'), :class => "resourcesGrey" %></li>
+          <li><%= link_to "课程讨论",user_message_path(User.current, :type => 'course_message'), :class => "resourcesGrey"  %></li>
           <li><%= link_to "课程通知",user_message_path(User.current, :type => 'course_news'), :class => "resourcesGrey"  %></li>
-          <li><%= link_to "通知回复", user_message_path(User.current, :type => 'course_news_reply'), :class => "resourcesGrey" %></li>
-          <li><%= link_to "课程问卷", user_message_path(User.current, :type => 'poll'), :class => "resourcesGrey"  %></a></li>
-          <li><%= link_to "作品评阅", user_message_path(User.current, :type => 'works_reviewers'), :class => "resourcesGrey"  %></li>
-          <li><%= link_to "作品讨论", user_message_path(User.current, :type => 'works_reply'), :class => "resourcesGrey"  %></li>
+          <!--<li><%#= link_to "通知回复", user_message_path(User.current, :type => 'course_news_reply'), :class => "resourcesGrey" %></li>-->
+          <!--<li><%#= link_to "课程问卷", user_message_path(User.current, :type => 'poll'), :class => "resourcesGrey"  %></a></li>-->
+          <!--<li><%#= link_to "作品评阅", user_message_path(User.current, :type => 'works_reviewers'), :class => "resourcesGrey"  %></li>-->
+          <!--<li><%#= link_to "作品讨论", user_message_path(User.current, :type => 'works_reply'), :class => "resourcesGrey"  %></li>-->
           <%# 项目相关消息 %>
-          <li><%= link_to "指派问题", user_message_path(User.current, :type => 'issue'), :class => "resourcesGrey"  %></li>
-          <li><%= link_to "问题更新", user_message_path(User.current, :type => 'issue_update'), :class => "resourcesGrey"  %></li>
-          <li><%= link_to "项目讨论区", user_message_path(User.current, :type => 'forge_message'), :class => "resourcesGrey"  %></li>
-          <li><%= link_to "项目新闻", user_message_path(User.current, :type => 'forge_news'), :class => "resourcesGrey"  %></li>
-          <li><%= link_to "新闻回复", user_message_path(User.current, :type => 'forge_news_reply'), :class => "resourcesGrey"  %></li>
+          <li><%= link_to "项目任务", user_message_path(User.current, :type => 'issue'), :class => "resourcesGrey"  %></li>
+          <!--<li><%#= link_to "问题更新", user_message_path(User.current, :type => 'issue_update'), :class => "resourcesGrey"  %></li>-->
+          <!--<li><%#= link_to "项目讨论区", user_message_path(User.current, :type => 'forge_message'), :class => "resourcesGrey"  %></li>-->
+          <!--<li><%#= link_to "项目新闻", user_message_path(User.current, :type => 'forge_news'), :class => "resourcesGrey"  %></li>-->
+          <!--<li><%#= link_to "新闻回复", user_message_path(User.current, :type => 'forge_news_reply'), :class => "resourcesGrey"  %></li>-->
           <%# 项目相关消息 %>
-          <li><%= link_to "贴吧帖子", user_message_path(User.current, :type => 'forum'), :class => "resourcesGrey"  %></li>
+          <!--<li><%#= link_to "贴吧帖子", user_message_path(User.current, :type => 'forum'), :class => "resourcesGrey"  %></li>-->
           <%# 系统贴吧 %>
-          <li><%= link_to "用户留言",user_message_path(User.current, :type => 'user_feedback'), :class => "resourcesGrey"  %></li>
+          <!--<li><%#= link_to "用户留言",user_message_path(User.current, :type => 'user_feedback'), :class => "resourcesGrey"  %></li>-->
 
         </ul>
       </li>

From ad8bd379a127ecde352ca6d2e2aab5f40c6bf2a2 Mon Sep 17 00:00:00 2001
From: lizanle <491823689@qq.com>
Date: Sat, 29 Aug 2015 12:32:00 +0800
Subject: [PATCH 32/42] =?UTF-8?q?=E7=94=A8=E6=88=B7=E8=B5=84=E6=BA=90?=
 =?UTF-8?q?=E8=BF=87=E6=BB=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/controllers/users_controller.rb    | 24 ++++++++++++++++++++++++
 app/views/users/user_resource.html.erb |  5 ++++-
 2 files changed, 28 insertions(+), 1 deletion(-)

diff --git a/app/controllers/users_controller.rb b/app/controllers/users_controller.rb
index 1f5d38e25..ac7ee616f 100644
--- a/app/controllers/users_controller.rb
+++ b/app/controllers/users_controller.rb
@@ -1004,6 +1004,12 @@ class UsersController < ApplicationController
       else
         @attachments = Attachment.where("author_id = #{params[:id]} and is_public = 1 and container_type in('Issue','Document','Message','News','StudentWorkScore','HomewCommon')").order("created_on desc")
       end
+    elsif params[:type] == "5" #附件
+      if User.current.id.to_i == params[:id].to_i
+        @attachments = Attachment.where("author_id = #{params[:id]} and container_type ='Principal'").order("created_on desc")
+      else
+        @attachments = Attachment.where("author_id = #{params[:id]} and is_public = 1 and container_type ='Principal'").order("created_on desc")
+      end
     end
     @type = params[:type] || 1
     @limit = 25
@@ -1060,6 +1066,12 @@ class UsersController < ApplicationController
       else
         @attachments = Attachment.where("author_id = #{params[:id]} and is_public = 1 and container_type in('Issue','Document','Message','News','StudentWorkScore','HomewCommon')").order("created_on desc")
       end
+    elsif params[:type] == "5" #用户资源
+      if User.current.id.to_i == params[:id].to_i
+        @attachments = Attachment.where("author_id = #{params[:id]} and container_type ='Principal'").order("created_on desc")
+      else
+        @attachments = Attachment.where("author_id = #{params[:id]} and is_public = 1 and container_type ='Principal'").order("created_on desc")
+      end
     end
     @type = params[:type]
     @limit = 25
@@ -1464,6 +1476,12 @@ class UsersController < ApplicationController
       else
         @attachments = Attachment.where("author_id = #{params[:id]} and is_public = 1 and container_type in('Issue','Document','Message','News','StudentWorkScore','HomewCommon')").order("created_on desc")
       end
+    elsif params[:type] == "5" #用户资源
+      if User.current.id.to_i == params[:id].to_i
+        @attachments = Attachment.where("author_id = #{params[:id]} and container_type = 'Principal'").order("created_on desc")
+      else
+        @attachments = Attachment.where("author_id = #{params[:id]} and is_public = 1 and container_type  = 'Principal'").order("created_on desc")
+      end
     end
     @type = params[:type]
     @limit = 25
@@ -1516,6 +1534,12 @@ class UsersController < ApplicationController
       else
         @attachments = Attachment.where("author_id = #{params[:id]} and is_public = 1 and container_type in('Issue','Document','Message','News','StudentWorkScore','HomewCommon')  and (filename like '%#{search}%')").order("created_on desc")
       end
+    elsif params[:type] == "5" #用户资源
+      if User.current.id.to_i == params[:id].to_i
+        @attachments = Attachment.where("author_id = #{params[:id]} and container_type = 'Principal' and (filename like '%#{search}%')").order("created_on desc")
+      else
+        @attachments = Attachment.where("author_id = #{params[:id]} and is_public = 1 and container_type  = 'Principal'  and (filename like '%#{search}%')").order("created_on desc")
+      end
     end
     @type = params[:type]
     @limit = 25
diff --git a/app/views/users/user_resource.html.erb b/app/views/users/user_resource.html.erb
index 0ddb799a8..819bec04d 100644
--- a/app/views/users/user_resource.html.erb
+++ b/app/views/users/user_resource.html.erb
@@ -57,6 +57,9 @@
           <li>
             <%= link_to '项目资源' ,user_resource_user_path(:id=>@user.id,:type=>3),:remote=>true,:method => 'get',:class=>'homepagePostTypeQuiz postTypeGrey' %>
           </li>
+          <li>
+            <%= link_to '用户资源' ,user_resource_user_path(:id=>@user.id,:type=>5),:remote=>true,:method => 'get',:class=>'resourcesTypeAtt resourcesGrey' %>
+          </li>
           <li>
             <%= link_to '附件' ,user_resource_user_path(:id=>@user.id,:type=>4),:remote=>true,:method => 'get',:class=>'resourcesTypeAtt resourcesGrey' %>
           </li>
@@ -66,7 +69,7 @@
   </div>
   </div>
 <div class="resources mt10" id="users_setting">
-  <div class="resourcesSearchBanner">
+  <div class="resourcesSearchBanner mt10">
     <div class="resourcesUploadBox">
       <a href="javascript:void(0);" onclick="show_upload();" class="uploadBoxIcon">上传资源</a></div>
     <div id="search_div">

From 5e25b64004c65da508087aa982d673dbcc55c964 Mon Sep 17 00:00:00 2001
From: suntao <719450423@qq.com>
Date: Sat, 29 Aug 2015 14:08:38 +0800
Subject: [PATCH 33/42] =?UTF-8?q?=E6=8F=90=E4=BA=A4=E6=8C=89=E9=92=AE?=
 =?UTF-8?q?=E5=AF=B9=E9=BD=90?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/views/layouts/new_base_user.html.erb            | 8 ++++----
 app/views/users/_course_create.html.erb             | 4 ++--
 app/views/users/_course_homework.html.erb           | 4 ++--
 app/views/users/_course_journalsformessage.html.erb | 4 ++--
 app/views/users/_project_attachment.html.erb        | 4 ++--
 app/views/users/_project_create.html.erb            | 4 ++--
 app/views/users/_project_document.html.erb          | 4 ++--
 app/views/users/_project_journal.html.erb           | 4 ++--
 app/views/users/_project_news.html.erb              | 4 ++--
 app/views/users/show_chen.erb                       | 8 ++++----
 public/stylesheets/new_user.css                     | 4 ++--
 11 files changed, 26 insertions(+), 26 deletions(-)

diff --git a/app/views/layouts/new_base_user.html.erb b/app/views/layouts/new_base_user.html.erb
index 7b7f4a536..fc3582c40 100644
--- a/app/views/layouts/new_base_user.html.erb
+++ b/app/views/layouts/new_base_user.html.erb
@@ -31,7 +31,7 @@
     <div class="homepageLeft" id="LSide">
       <div class="homepagePortraitContainer">
         <div class="homepagePortraitImage fl" id="homepage_portrait_image">
-          <%= image_tag(url_to_avatar(@user),width:"78", height: "78", :id=>'nh_user_tx') %>
+          <%= image_tag(url_to_avatar(@user),width:"90", height: "90", :id=>'nh_user_tx') %>
           <% if User.current.logged?%>
             <% if is_current_user%>
               <div id="edit_user_file_btn" class="none">
@@ -46,15 +46,15 @@
             <% end %>
           <% end%>
         </div>
-        <div class="fl ml15">
-          <p class="homepageImageName hidden db mb5">
+        <div class="fl ml10">
+          <p class="homepageImageName hidden db mb8">
             <%= @user.login %>
           </p>
           <% if (@user.user_extensions && (@user.user_extensions.identity != 2) ) %>
               <span class="<%= @user.user_extensions.gender == 1 ? 'homepageImageSexWomen' : 'homepageImageSexMan' %> "></span>
           <% end %>
           <div class="cl"></div>
-          <p class="mb8 c_dark f14">教授</p>
+          <p class="mb20 c_dark f14">教授</p>
           <%= 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>
diff --git a/app/views/users/_course_create.html.erb b/app/views/users/_course_create.html.erb
index 19a5d89d2..b86f55385 100644
--- a/app/views/users/_course_create.html.erb
+++ b/app/views/users/_course_create.html.erb
@@ -1,11 +1,11 @@
 <div class="resources mt10">
   <div class="homepagePostBrief mt10" onmouseover="$('#act-<%=user_activity.id %>').css('visibility','visible')" onmouseout="$('.homepagePostSetting').css('visibility','hidden')">
-    <div class="homepagePostPortrait mb8">
+    <div class="homepagePostPortrait">
       <a href="javascript:void(0);"><img src="images/homepageImage.jpg" width="90" height="90" alt="用户头像"/></a></div>
     <div class="homepagePostDes">
       <div class="homepagePostTo mb8"><a href="javascript:void(0);" class="newsBlue mr15">尹教授</a> TO
         <a href="javascript:void(0);" class="newsBlue ml15">分布式计算环境(课程名称)</a></div>
-      <div class="homepagePostTitle">
+      <div class="homepagePostTitle mb8">
         <a href="javascript:void(0);" class="postGrey">ckeditor值设置的默认在光标聚焦控件后应自动消失的处理（课程创建）</a></div>
       <div class="homepagePostSubmitContainer">
         <div class="homepagePostSubmit"><a href="javascript:void(0);" class="c_blue">提交（10）</a></div>
diff --git a/app/views/users/_course_homework.html.erb b/app/views/users/_course_homework.html.erb
index 88a00e8ab..10bbe4bdf 100644
--- a/app/views/users/_course_homework.html.erb
+++ b/app/views/users/_course_homework.html.erb
@@ -4,7 +4,7 @@
       <%= link_to image_tag(url_to_avatar(activity.user), :width => "90", :height => "90"), user_path(activity.user_id), :alt => "用户头像" %>
     </div>
     <div class="homepagePostDes">
-      <div class="homepagePostTo" style="word-break:break-all;">
+      <div class="homepagePostTo mb8" style="word-break:break-all;">
         <% if activity.try(:user).try(:realname) == ' ' %>
             <%= link_to activity.try(:user), user_path(activity.user_id), :class => "newsBlue mr15" %>
         <% else %>
@@ -12,7 +12,7 @@
         <% end %> TO <!--+"(课程名称)" -->
         <%= link_to activity.course.name.to_s+" | 课程作业", course_path(activity.course_id), :class => "newsBlue ml15", :style=>"word-break:break-all" %>
       </div>
-      <div class="homepagePostTitle" style="word-break:break-all;"> <!--+"(作业名称)"-->
+      <div class="homepagePostTitle mb8" style="word-break:break-all;"> <!--+"(作业名称)"-->
         <%= link_to activity.name.to_s, student_work_index_path(:homework => activity.id), :class => "postGrey", :style=>"word-break:break-all" %>
       </div>
       <div class="homepagePostSubmitContainer">
diff --git a/app/views/users/_course_journalsformessage.html.erb b/app/views/users/_course_journalsformessage.html.erb
index a72eac345..90d5d05ee 100644
--- a/app/views/users/_course_journalsformessage.html.erb
+++ b/app/views/users/_course_journalsformessage.html.erb
@@ -3,9 +3,9 @@
     <div class="homepagePostPortrait">
       <a href="javascript:void(0);"><img src="images/homepageImage.jpg" width="90" height="90" alt="用户头像"/></a></div>
     <div class="homepagePostDes">
-      <div class="homepagePostTo"><a href="javascript:void(0);" class="newsBlue mr15">尹教授</a> TO
+      <div class="homepagePostTo mb8"><a href="javascript:void(0);" class="newsBlue mr15">尹教授</a> TO
         <a href="javascript:void(0);" class="newsBlue ml15">分布式计算环境(课程名称)</a></div>
-      <div class="homepagePostTitle">
+      <div class="homepagePostTitle mb8">
         <a href="javascript:void(0);" class="postGrey">ckeditor值设置的默认在光标聚焦控件后应自动消失的处理（留言）</a></div>
       <div class="homepagePostSubmitContainer">
         <div class="homepagePostSubmit"><a href="javascript:void(0);" class="c_blue">提交（10）</a></div>
diff --git a/app/views/users/_project_attachment.html.erb b/app/views/users/_project_attachment.html.erb
index 54a7b3c17..13e6df408 100644
--- a/app/views/users/_project_attachment.html.erb
+++ b/app/views/users/_project_attachment.html.erb
@@ -3,9 +3,9 @@
     <div class="homepagePostPortrait">
       <a href="javascript:void(0);"><img src="images/homepageImage.jpg" width="90" height="90" alt="用户头像"/></a></div>
     <div class="homepagePostDes">
-      <div class="homepagePostTo"><a href="javascript:void(0);" class="newsBlue mr15">尹教授</a> TO
+      <div class="homepagePostTo mb8"><a href="javascript:void(0);" class="newsBlue mr15">尹教授</a> TO
         <a href="javascript:void(0);" class="newsBlue ml15">分布式计算环境(课程名称)</a></div>
-      <div class="homepagePostTitle">
+      <div class="homepagePostTitle mb8">
         <a href="javascript:void(0);" class="postGrey">ckeditor值设置的默认在光标聚焦控件后应自动消失的处理（项目附件）</a></div>
       <div class="homepagePostSubmitContainer">
         <div class="homepagePostSubmit"><a href="javascript:void(0);" class="c_blue">提交（10）</a></div>
diff --git a/app/views/users/_project_create.html.erb b/app/views/users/_project_create.html.erb
index 1d6943be1..b2487c444 100644
--- a/app/views/users/_project_create.html.erb
+++ b/app/views/users/_project_create.html.erb
@@ -3,9 +3,9 @@
     <div class="homepagePostPortrait">
       <a href="javascript:void(0);"><img src="images/homepageImage.jpg" width="90" height="90" alt="用户头像"/></a></div>
     <div class="homepagePostDes">
-      <div class="homepagePostTo"><a href="javascript:void(0);" class="newsBlue mr15">尹教授</a> TO
+      <div class="homepagePostTo mb8"><a href="javascript:void(0);" class="newsBlue mr15">尹教授</a> TO
         <a href="javascript:void(0);" class="newsBlue ml15">分布式计算环境(课程名称)</a></div>
-      <div class="homepagePostTitle">
+      <div class="homepagePostTitle mb8">
         <a href="javascript:void(0);" class="postGrey">ckeditor值设置的默认在光标聚焦控件后应自动消失的处理（项目创建）</a></div>
       <div class="homepagePostSubmitContainer">
         <div class="homepagePostSubmit"><a href="javascript:void(0);" class="c_blue">提交（10）</a></div>
diff --git a/app/views/users/_project_document.html.erb b/app/views/users/_project_document.html.erb
index 6e58552de..4f5d986d7 100644
--- a/app/views/users/_project_document.html.erb
+++ b/app/views/users/_project_document.html.erb
@@ -3,9 +3,9 @@
     <div class="homepagePostPortrait">
       <a href="javascript:void(0);"><img src="images/homepageImage.jpg" width="90" height="90" alt="用户头像"/></a></div>
     <div class="homepagePostDes">
-      <div class="homepagePostTo"><a href="javascript:void(0);" class="newsBlue mr15">尹教授</a> TO
+      <div class="homepagePostTo mb8"><a href="javascript:void(0);" class="newsBlue mr15">尹教授</a> TO
         <a href="javascript:void(0);" class="newsBlue ml15">分布式计算环境(课程名称)</a></div>
-      <div class="homepagePostTitle">
+      <div class="homepagePostTitle mb8">
         <a href="javascript:void(0);" class="postGrey">ckeditor值设置的默认在光标聚焦控件后应自动消失的处理（文档名称）</a></div>
       <div class="homepagePostSubmitContainer">
         <div class="homepagePostSubmit"><a href="javascript:void(0);" class="c_blue">提交（10）</a></div>
diff --git a/app/views/users/_project_journal.html.erb b/app/views/users/_project_journal.html.erb
index 7833d8675..3c1f8c61d 100644
--- a/app/views/users/_project_journal.html.erb
+++ b/app/views/users/_project_journal.html.erb
@@ -3,9 +3,9 @@
     <div class="homepagePostPortrait">
       <a href="javascript:void(0);"><img src="images/homepageImage.jpg" width="90" height="90" alt="用户头像"/></a></div>
     <div class="homepagePostDes">
-      <div class="homepagePostTo"><a href="javascript:void(0);" class="newsBlue mr15">尹教授</a> TO
+      <div class="homepagePostTo mb8"><a href="javascript:void(0);" class="newsBlue mr15">尹教授</a> TO
         <a href="javascript:void(0);" class="newsBlue ml15">分布式计算环境(课程名称)</a></div>
-      <div class="homepagePostTitle">
+      <div class="homepagePostTitle mb8">
         <a href="javascript:void(0);" class="postGrey">ckeditor值设置的默认在光标聚焦控件后应自动消失的处理（项目日志）</a></div>
       <div class="homepagePostSubmitContainer">
         <div class="homepagePostSubmit"><a href="javascript:void(0);" class="c_blue">提交（10）</a></div>
diff --git a/app/views/users/_project_news.html.erb b/app/views/users/_project_news.html.erb
index ea39cbae5..9e4dfaf24 100644
--- a/app/views/users/_project_news.html.erb
+++ b/app/views/users/_project_news.html.erb
@@ -3,9 +3,9 @@
     <div class="homepagePostPortrait">
       <a href="javascript:void(0);"><img src="images/homepageImage.jpg" width="90" height="90" alt="用户头像"/></a></div>
     <div class="homepagePostDes">
-      <div class="homepagePostTo"><a href="javascript:void(0);" class="newsBlue mr15">尹教授</a> TO
+      <div class="homepagePostTo mb8"><a href="javascript:void(0);" class="newsBlue mr15">尹教授</a> TO
         <a href="javascript:void(0);" class="newsBlue ml15">分布式计算环境(课程名称)</a></div>
-      <div class="homepagePostTitle">
+      <div class="homepagePostTitle mb8">
         <a href="javascript:void(0);" class="postGrey">ckeditor值设置的默认在光标聚焦控件后应自动消失的处理（项目新闻）</a></div>
       <div class="homepagePostSubmitContainer">
         <div class="homepagePostSubmit"><a href="javascript:void(0);" class="c_blue">提交（10）</a></div>
diff --git a/app/views/users/show_chen.erb b/app/views/users/show_chen.erb
index 74b303fad..950350202 100644
--- a/app/views/users/show_chen.erb
+++ b/app/views/users/show_chen.erb
@@ -29,9 +29,9 @@
     <div class="homepagePostPortrait">
       <a href="javascript:void(0);"><img src="images/homepageImage.jpg" width="90" height="90" alt="用户头像"/></a></div>
     <div class="homepagePostDes">
-      <div class="homepagePostTo"><a href="javascript:void(0);" class="newsBlue mr15">尹教授</a> TO
+      <div class="homepagePostTo mb8"><a href="javascript:void(0);" class="newsBlue mr15">尹教授</a> TO
         <a href="javascript:void(0);" class="newsBlue ml15">分布式计算环境(课程名称)</a></div>
-      <div class="homepagePostTitle">
+      <div class="homepagePostTitle mb8">
         <a href="javascript:void(0);" class="postGrey">ckeditor值设置的默认在光标聚焦控件后应自动消失的处理（作业名称）</a></div>
       <div class="homepagePostSubmitContainer">
         <div class="homepagePostSubmit"><a href="javascript:void(0);" class="c_blue">提交（10）</a></div>
@@ -58,9 +58,9 @@
     <div class="homepagePostPortrait">
       <a href="javascript:void(0);"><img src="images/homepageImage.jpg" width="90" height="90" alt="用户头像"/></a></div>
     <div class="homepagePostDes">
-      <div class="homepagePostTo"><a href="javascript:void(0);" class="newsBlue mr15">尹教授</a> TO
+      <div class="homepagePostTo mb8"><a href="javascript:void(0);" class="newsBlue mr15">尹教授</a> TO
         <a href="javascript:void(0);" class="newsBlue ml15">分布式计算环境(课程名称)</a></div>
-      <div class="homepagePostTitle">
+      <div class="homepagePostTitle mb8">
         <a href="javascript:void(0);" class="postGrey">ckeditor值设置的默认在光标聚焦控件后应自动消失的处理（作业名称）</a></div>
       <div class="homepagePostSubmitContainer">
         <div class="homepagePostSubmit"><a href="javascript:void(0);" class="c_blue">提交（10）</a></div>
diff --git a/public/stylesheets/new_user.css b/public/stylesheets/new_user.css
index a56087017..e432a8f48 100644
--- a/public/stylesheets/new_user.css
+++ b/public/stylesheets/new_user.css
@@ -496,13 +496,13 @@ 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:208px; border:1px solid #dddddd; background-color:#ffffff; margin-top:15px; padding:15px;}
-.homepagePortraitImage {width:78px; height:78px; position:relative; border:1px solid #cbcbcb; padding: 2px;}
+.homepagePortraitImage {width:90px; height:90px; 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: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) -14px -37px no-repeat; width:20px; height:20px; display:block;}
-.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;}
+.homepageImageName {font-size:16px; color:#484848; 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;}

From 886a00e18dc4a7e95fb4b0b076c57e26700c6701 Mon Sep 17 00:00:00 2001
From: suntao <719450423@qq.com>
Date: Sat, 29 Aug 2015 14:22:29 +0800
Subject: [PATCH 34/42] =?UTF-8?q?footer=E9=97=B4=E8=B7=9D=E8=B0=83?=
 =?UTF-8?q?=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 public/stylesheets/header.css   | 2 +-
 public/stylesheets/new_user.css | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/public/stylesheets/header.css b/public/stylesheets/header.css
index 2ba6f0bbf..6b7aa209e 100644
--- a/public/stylesheets/header.css
+++ b/public/stylesheets/header.css
@@ -97,7 +97,7 @@ a.topnav_login_box:hover {color:#a1ebff;}
 /*底部*/
 #Footer{background-color:#ffffff;  padding-bottom:15px; color:#666666;} /*margin-bottom:10px;*/
 .footerAboutContainer {width:auto; border-bottom:1px solid #efefef;}
-.footerAbout{ width:485px; margin:0 auto;height:35px; line-height:35px;}
+.footerAbout{ width:485px; margin:0 auto;height:35px; line-height:35px; padding-top: 10px;}
 .languageBox {width:55px; height:20px; margin-left:5px; outline:none; color:#666666; border:1px solid #d9d9d9;}
 .departments{ width:950px; margin:5px auto 0 auto;height:30px;line-height:30px;}
 .copyright{ width:375px; margin:0 auto;height:20px;line-height:20px;}
diff --git a/public/stylesheets/new_user.css b/public/stylesheets/new_user.css
index 3f3af2785..4933e1c18 100644
--- a/public/stylesheets/new_user.css
+++ b/public/stylesheets/new_user.css
@@ -488,7 +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;}
+.portraitRadius {border-radius: 3px;}
 .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;}
@@ -610,7 +610,7 @@ a.postOptionLink:hover {color:#ffffff; background-color:#15bccf;}
 .homepagePostReplyPublisher {font-size:12px; color:#484848; margin-bottom:12px;}
 .homepagePostReplyContent {font-size:12px; color:#484848; margin-bottom:12px;}
 .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;}
+.homepagePostAssignTo {float:left; font-size:14px; color:#269ac9; 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;}
 .postAttSize {color:#888888; font-size:12px;}
@@ -702,7 +702,7 @@ a.referenceTypeBlock {color:#888888; display:inline-block; padding:0px 20px;}
 /*底部*/
 #Footer{background-color:#ffffff;  padding-bottom:15px; color:#666666;} /*margin-bottom:10px;*/
 .footerAboutContainer {width:auto; border-bottom:1px solid #efefef;}
-.footerAbout{ width:455px; margin:0 auto;height:35px; line-height:35px;  }
+.footerAbout{ width:455px; margin:0 auto;height:35px; line-height:35px; padding-top: 10px; }
 .languageBox {width:55px; height:20px; margin-left:5px; outline:none; color:#666666; border:1px solid #d9d9d9;}
 .departments{ width:890px; margin:5px auto 0 auto;height:30px;line-height:30px;}
 .copyright{ width:375px; margin:0 auto;height:20px;line-height:20px;}

From 498775b0a87d1a7fe85a383a66aaead01cf70d5a Mon Sep 17 00:00:00 2001
From: sw <939547590@qq.com>
Date: Sat, 29 Aug 2015 14:24:54 +0800
Subject: [PATCH 35/42] =?UTF-8?q?=E7=99=BB=E5=BD=95=E7=95=8C=E9=9D=A2?=
 =?UTF-8?q?=E5=A4=9A=E4=BA=86=E4=B8=80=E4=B8=AA<=20=E6=95=99=E6=8E=88?=
 =?UTF-8?q?=E8=81=8C=E7=A7=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/views/layouts/login.html.erb         | 1 -
 app/views/layouts/new_base_user.html.erb | 4 +++-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/app/views/layouts/login.html.erb b/app/views/layouts/login.html.erb
index e7810d45a..b5dc9e75a 100644
--- a/app/views/layouts/login.html.erb
+++ b/app/views/layouts/login.html.erb
@@ -15,7 +15,6 @@
   <%= call_hook :view_layouts_base_html_head %>
   <%= yield :header_tags -%>
 </head>
-<
 <script type="text/javascript" charset="utf-8">
     $(function() {
         $(document).keyup(function (e) {
diff --git a/app/views/layouts/new_base_user.html.erb b/app/views/layouts/new_base_user.html.erb
index 777dd0da6..65323828e 100644
--- a/app/views/layouts/new_base_user.html.erb
+++ b/app/views/layouts/new_base_user.html.erb
@@ -54,7 +54,9 @@
               <span class="<%= @user.user_extensions.gender == 1 ? 'homepageImageSexWomen' : 'homepageImageSexMan' %> "></span>
           <% end %>
           <div class="cl"></div>
-          <p class="mb20 c_dark f14">教授</p>
+          <p class="mb20 c_dark f14">
+            <%= get_technical_title @user %>
+          </p>
           <%= 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>

From b30a07d651949651343856d2cc6a0d556f483b97 Mon Sep 17 00:00:00 2001
From: cxt <pinecxt@163.com>
Date: Sat, 29 Aug 2015 14:27:16 +0800
Subject: [PATCH 36/42] =?UTF-8?q?=E4=B8=AA=E4=BA=BA=E4=B8=BB=E9=A1=B5?=
 =?UTF-8?q?=E5=8A=A8=E6=80=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/views/users/_course_message.html.erb  | 2 +-
 app/views/users/_course_news.html.erb     | 2 +-
 app/views/users/_project_message.html.erb | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/app/views/users/_course_message.html.erb b/app/views/users/_course_message.html.erb
index ff7e43105..f8b5c70a1 100644
--- a/app/views/users/_course_message.html.erb
+++ b/app/views/users/_course_message.html.erb
@@ -96,7 +96,7 @@
                                     <%= link_to reply.try(:author).try(:realname), user_path(reply.author_id), :class => "newsBlue mr10 f14" %>
                                 <% end %>
                                 <%= format_date(reply.created_on) %>
-                                <%= link_to(
+                                <%#= link_to(
                                             l(:button_delete),
                                             {:controller => 'messages', :action => 'destroy', :id => reply.id, :board_id => reply.board_id, :is_board => 'false'},
                                             :method => :post,
diff --git a/app/views/users/_course_news.html.erb b/app/views/users/_course_news.html.erb
index 603901ae4..15fc74386 100644
--- a/app/views/users/_course_news.html.erb
+++ b/app/views/users/_course_news.html.erb
@@ -79,7 +79,7 @@
                           <%= link_to comment.try(:author).try(:realname), user_path(comment.author_id), :class => "newsBlue mr10 f14" %>
                       <% end %>
                       <%= format_date(comment.created_on) %>
-                      <%= link_to_if_authorized_course l(:button_delete), {:controller => 'comments', :action => 'destroy', :id => activity, :comment_id => comment},
+                      <%#= link_to_if_authorized_course l(:button_delete), {:controller => 'comments', :action => 'destroy', :id => activity, :comment_id => comment},
                                                        :data => {:confirm => l(:text_are_you_sure)}, :method => :delete, :title => l(:button_delete) %>
                       <!--<a href="javascript:void(0);" class="replyGrey fr ml10">删除</a>-->
                     </div>
diff --git a/app/views/users/_project_message.html.erb b/app/views/users/_project_message.html.erb
index e60676ac6..89f149303 100644
--- a/app/views/users/_project_message.html.erb
+++ b/app/views/users/_project_message.html.erb
@@ -93,7 +93,7 @@
                           <%= link_to reply.try(:author).try(:realname), user_path(reply.author_id), :class => "newsBlue mr10 f14" %>
                       <% end %>
                       <%= format_date(reply.created_on) %>
-                      <%= link_to(
+                      <%#= link_to(
                                   l(:button_delete),
                                   {:controller => 'messages', :action => 'destroy', :id => reply.id, :board_id => reply.board_id, :is_board => 'false'},
                                   :method => :post,

From a2ec65a0c95d4f7235b053bd6a758fd0aeb23ee8 Mon Sep 17 00:00:00 2001
From: sw <939547590@qq.com>
Date: Sat, 29 Aug 2015 14:34:59 +0800
Subject: [PATCH 37/42] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E5=85=B3=E6=B3=A8?=
 =?UTF-8?q?=E4=B8=8E=E5=8F=96=E6=B6=88=E5=85=B3=E6=B3=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/views/layouts/_user_watch_btn.html.erb | 14 +++++++++-----
 app/views/layouts/new_base_user.html.erb   |  8 +-------
 2 files changed, 10 insertions(+), 12 deletions(-)

diff --git a/app/views/layouts/_user_watch_btn.html.erb b/app/views/layouts/_user_watch_btn.html.erb
index 5f9c550b7..aeb8ee08f 100644
--- a/app/views/layouts/_user_watch_btn.html.erb
+++ b/app/views/layouts/_user_watch_btn.html.erb
@@ -1,7 +1,11 @@
 <% if User.current.logged?%>
-    <%if(target.watched_by?(User.current))%>
-        <%= link_to "",watch_path(:object_type=> 'user',:object_id=>target.id,:target_id=>target.id),:class => "homepageFollow", :method => "delete",:remote => "true", :title => "取消关注"%>
-    <% else %>
-        <%= link_to "",watch_path(:object_type=> 'user',:object_id=>target.id,:target_id=>target.id),:class => "homepageFollowCancel", :method => "post",:remote => "true", :title => "添加关注"%>
-    <% end %>
+    <% if User.current == target%>
+        <%= link_to("编辑资料", my_account_path, :class => "fl UsersEditBtn")%>
+    <% else%>
+        <%if(target.watched_by?(User.current))%>
+            <%= link_to "取消关注",watch_path(:object_type=> 'user',:object_id=>target.id,:target_id=>target.id),:class => "UsersApBtn", :method => "delete",:remote => "true", :title => "取消关注"%>
+        <% else %>
+            <%= link_to "添加关注",watch_path(:object_type=> 'user',:object_id=>target.id,:target_id=>target.id),:class => "UsersAttBtn", :method => "post",:remote => "true", :title => "添加关注"%>
+        <% end %>
+    <% end%>
 <% end %>
\ No newline at end of file
diff --git a/app/views/layouts/new_base_user.html.erb b/app/views/layouts/new_base_user.html.erb
index 65323828e..6d049cee3 100644
--- a/app/views/layouts/new_base_user.html.erb
+++ b/app/views/layouts/new_base_user.html.erb
@@ -39,10 +39,6 @@
                   <a href="<%= url_for(:controller => 'my', :action => 'clear_user_avatar_temp') %>" data-remote="true" class="homepageEditProfileIcon"></a>
                 </div>
               </div>
-            <% else %>
-              <div id="watch_user_btn" class="none">
-                <%= render :partial => 'layouts/user_watch_btn', :locals => {:target => @user} %>
-              </div>
             <% end %>
           <% end%>
         </div>
@@ -57,9 +53,7 @@
           <p class="mb20 c_dark f14">
             <%= get_technical_title @user %>
           </p>
-          <%= 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>
+          <%= render :partial => 'layouts/user_watch_btn', :locals => {:target => @user} %>
         </div>
         <div class="cl"></div>
         <div>

From b65243ba6200de1c1758f11c04e1cff2b1504156 Mon Sep 17 00:00:00 2001
From: sw <939547590@qq.com>
Date: Sat, 29 Aug 2015 14:37:53 +0800
Subject: [PATCH 38/42] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E5=85=B3=E6=B3=A8?=
 =?UTF-8?q?=E3=80=81=E5=8F=96=E6=B6=88=E5=85=B3=E6=B3=A8js=E5=88=B7?=
 =?UTF-8?q?=E6=96=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/views/layouts/new_base_user.html.erb | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/app/views/layouts/new_base_user.html.erb b/app/views/layouts/new_base_user.html.erb
index 6d049cee3..5176032e5 100644
--- a/app/views/layouts/new_base_user.html.erb
+++ b/app/views/layouts/new_base_user.html.erb
@@ -53,7 +53,9 @@
           <p class="mb20 c_dark f14">
             <%= get_technical_title @user %>
           </p>
-          <%= render :partial => 'layouts/user_watch_btn', :locals => {:target => @user} %>
+          <div id="watch_user_btn">
+            <%= render :partial => 'layouts/user_watch_btn', :locals => {:target => @user} %>
+          </div>
         </div>
         <div class="cl"></div>
         <div>

From 0d8624a642e6400855e8cf162f27d5a23554c033 Mon Sep 17 00:00:00 2001
From: suntao <719450423@qq.com>
Date: Sat, 29 Aug 2015 14:43:28 +0800
Subject: [PATCH 39/42] =?UTF-8?q?=E9=A2=9C=E8=89=B2=E6=9B=B4=E6=96=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 public/stylesheets/new_user.css | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/public/stylesheets/new_user.css b/public/stylesheets/new_user.css
index 4933e1c18..2fa219423 100644
--- a/public/stylesheets/new_user.css
+++ b/public/stylesheets/new_user.css
@@ -456,7 +456,7 @@ input.sendSourceText:hover {background-color:#297fb8;}
 .popbox{/* width:300px; *//* height:100px; */position:fixed !important;/* z-index:100; */left:50%;top:50%;margin:-100px 0 0 -150px;  /* background:#fff; */ -moz-border-radius:5px;  /* -webkit-border-radius:5px; */  /* border-radius:5px; */ /* box-shadow:0px 0px 8px #194a81; */  /* overflow:auto; */}
 /*上传资源弹窗*/
 .resourceUploadPopup {width:400px; height:auto; border:3px solid #269ac9; padding-left:16px; padding-bottom:16px; background-color:#ffffff; position:absolute; top:50%; left:50%; margin-left:-200px; z-index:1000;}
-.uploadText {font-size:16px; color:#15bccf; line-height:16px; padding-top:20px; width:140px; display:inline-block;}
+.uploadText {font-size:16px; color:#269ac9; line-height:16px; padding-top:20px; width:140px; display:inline-block;}
 .uploadBoxContainer {height:33px; line-height:33px; margin-top:10px; position:relative;}
 .uploadBox {width:100px; height:33px; line-height:33px; text-align:center; vertical-align:middle; background-color:#269ac9; border-radius:3px; float:left; margin-right:12px;}
 .uploadBox:hover {background-color:#297fb8;}
@@ -538,7 +538,7 @@ a.homepageMenuText {color:#484848; font-size:16px; margin-left:20px;}
 .newsReadSetting {width:700px; background-color:#f6f6f6; border-bottom:1px solid #eeeeee; margin:10px auto; height:39px; line-height:39px; vertical-align:middle; font-size:14px; color:#7a7a7a; padding-left:10px;}
 .homepageNewsList {width:710px; height:49px; line-height:49px; vertical-align:middle; border-bottom:1px dashed #eaeaea; margin-left:10px;}
 .homepageNewsPortrait {width:40px; display:block; margin-top:7px;}
-.homepageNewsPublisher { max-width:100px; font-size:12px; color:#15bccf; display:block; padding-left:5px; overflow:hidden; white-space: nowrap; text-overflow:ellipsis; float:left; }
+.homepageNewsPublisher { max-width:100px; font-size:12px; color:#269ac9; display:block; padding-left:5px; overflow:hidden; white-space: nowrap; text-overflow:ellipsis; float:left; }
 .homepageNewsType {width:100px; padding-left: 5px; font-size:12px; color:#888888; display:block;}
 .homepageNewsPubType {width:215px; font-size:12px; color:#888888; display: block;}
 .homepageNewsContent {width:355px; max-width:395px; margin-right:10px; font-size:12px; color:#4b4b4b; display:block; overflow:hidden; white-space: nowrap; text-overflow:ellipsis;max-height: 49px; }
@@ -589,7 +589,7 @@ a.postTypeGrey:hover {color:#269ac9;}
 .homepagePostReplyInputContainer {width:670px; margin:0px auto;}
 .homepagePostReplyInput {width:663px; height:45px; max-width:663px; max-height:45px; border:1px solid #d9d9d9; outline:none; margin:20px auto 10px auto;}
 .homepagePostReplyEmotion {background:url(../images/homepage_icon.png) -90px -88px no-repeat; width:50px; height:24px; float:left; padding-left:30px;}
-.homepagePostReplySubmit {float:right; width:45px; height:24px; text-align:center; line-height:24px; vertical-align:middle; font-size:12px; color:#ffffff; background-color:#15bccf;}
+.homepagePostReplySubmit {float:right; width:45px; height:24px; text-align:center; line-height:24px; vertical-align:middle; font-size:12px; color:#ffffff; background-color:#269ac9;}
 .homepagePostReplySubmit:hover {background-color:#329cbd;}
 a.postReplySubmit {color:#ffffff; display:block;}
 .homepagePostReplyCancel {float:right; width:45px; height:24px; text-align:center; line-height:24px; vertical-align:middle; font-size:12px; color:#888888; background-color:#cecece; margin-left:8px;}
@@ -604,7 +604,7 @@ a.postReplyCancel:hover {color:#ffffff;}
 .homepagePostSettiongText {width:85px; line-height:2; font-size:12px; color:#616060; background-color:#ffffff; border:1px solid #eaeaea; border-radius:3px; position:absolute; left:-68px; top:20px; padding:5px 0px; display:none;}
 .homepagePostSettingIcon:hover {background:url(../images/homepage_icon.png) -93px -44px no-repeat;}
 a.postOptionLink {color:#616060; display:block; width:55px; padding:0px 15px;}
-a.postOptionLink:hover {color:#ffffff; background-color:#15bccf;}
+a.postOptionLink:hover {color:#ffffff; background-color:#269ac9;}
 .homepagePostReplyPortrait {float:left; width:60px;}
 .homepagePostReplyDes {float:left; width:595px; margin-left:15px;}
 .homepagePostReplyPublisher {font-size:12px; color:#484848; margin-bottom:12px;}
@@ -865,7 +865,8 @@ a.box_close{background:url(../images/img_floatbox.png) -22px 0 no-repeat;}
 .uppicBox{ width:265px; height:265px; background:#f2f2f5; float:left; color:#666;  text-align:center;}
 .showpicBox{width:133px; height:250px; background:#f2f2f5; float:left; margin-left:20px; text-align:center; padding-top:15px; color:#666;}
 .mr15{ margin-right:15px;}
-.uppic_btn{background: #64bdd9;color: #fff;width: 80px;height: 25px;margin-top: 105px;}
+.uppic_btn{background: #64bdd9;color: #fff; padding:2px 10px; cursor:pointer; margin-top: 105px; outline: none; border: none;}
+.uppic_btn:hover {background-color: #329cbd;}
 
 /*20150820课程作业 LB*/
 .HomeWork {width:708px; background-color:#ffffff; padding:10px 20px 20px 20px; border:1px solid #dddddd;}

From c0daebd75ccbba5383affa172dcf7967c403a995 Mon Sep 17 00:00:00 2001
From: sw <939547590@qq.com>
Date: Sat, 29 Aug 2015 14:46:30 +0800
Subject: [PATCH 40/42] =?UTF-8?q?=E4=B8=8A=E4=BC=A0=E5=9B=BE=E7=89=87js?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/views/layouts/new_base_user.html.erb | 2 +-
 app/views/my/save_user_avatar.js.erb     | 2 +-
 app/views/watchers/_set_watcher.js.erb   | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/app/views/layouts/new_base_user.html.erb b/app/views/layouts/new_base_user.html.erb
index 5176032e5..32813b58d 100644
--- a/app/views/layouts/new_base_user.html.erb
+++ b/app/views/layouts/new_base_user.html.erb
@@ -53,7 +53,7 @@
           <p class="mb20 c_dark f14">
             <%= get_technical_title @user %>
           </p>
-          <div id="watch_user_btn">
+          <div id="watch_user_btn_div">
             <%= render :partial => 'layouts/user_watch_btn', :locals => {:target => @user} %>
           </div>
         </div>
diff --git a/app/views/my/save_user_avatar.js.erb b/app/views/my/save_user_avatar.js.erb
index fb3d94231..03608a768 100644
--- a/app/views/my/save_user_avatar.js.erb
+++ b/app/views/my/save_user_avatar.js.erb
@@ -1,3 +1,3 @@
-$("#nh_user_tx").replaceWith('<%= image_tag(url_to_avatar(@user), :id=>'nh_user_tx',:style=>"width:214px;height:214px;overflow:hidden",:alt=>"头像") %>');
+$("#nh_user_tx").replaceWith('<%= image_tag(url_to_avatar(@user), :id=>'nh_user_tx',:style=>"width:90px;height:90px;overflow:hidden",:alt=>"头像") %>');
 $("#nh_user_logo").replaceWith('<%= image_tag(url_to_avatar(@user), :id=>'nh_user_logo',:width =>"40",:height => "40",:alt=>"头像") %>');
 hideModal();
\ No newline at end of file
diff --git a/app/views/watchers/_set_watcher.js.erb b/app/views/watchers/_set_watcher.js.erb
index 1365468cc..d875a38c4 100644
--- a/app/views/watchers/_set_watcher.js.erb
+++ b/app/views/watchers/_set_watcher.js.erb
@@ -1,7 +1,7 @@
 <% if( params[:object_type] == 'user') %>
   //点击头像下面的添加关注按钮
   <% if( params[:target_id] == params[:object_id] ) %>
-    $("#watch_user_btn").html("<%= escape_javascript render(:partial => "layouts/user_watch_btn", :locals => {:target => watched.first}) %>");
+    $("#watch_user_btn_div").html("<%= escape_javascript render(:partial => "layouts/user_watch_btn", :locals => {:target => watched.first}) %>");
     $("#user_fans_number").html("<%= watched.first.watcher_users.count.to_s%>");
   //在当前用户的粉丝、关注页面
   <% elsif( params[:target_id] == User.current.id.to_s )%>

From 17e9b2d29305788bd8f4de8d888fe68daf5cd742 Mon Sep 17 00:00:00 2001
From: sw <939547590@qq.com>
Date: Sat, 29 Aug 2015 14:48:47 +0800
Subject: [PATCH 41/42] =?UTF-8?q?=E7=BC=96=E8=BE=91=E4=B8=AA=E4=BA=BA?=
 =?UTF-8?q?=E7=AE=80=E4=BB=8B=E6=96=87=E6=9C=AC=E6=A1=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 public/stylesheets/new_user.css | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/public/stylesheets/new_user.css b/public/stylesheets/new_user.css
index 2fa219423..190cc7984 100644
--- a/public/stylesheets/new_user.css
+++ b/public/stylesheets/new_user.css
@@ -511,7 +511,7 @@ a.UsersAttBtn{ display:block; width:55px; height:20px; border:1px solid #d3d3d3;
 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;;}
+.homepageSignatureTextarea {width:207px; height:80px; max-width:207px; max-height:80px; border:1px solid #d9d9d9; outline:none; margin:0px 0px 12px 0px;}
 .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;}
 a.homepageImageNumber {font-size:12px; color:#484848; font-weight: bold;}

From 250d7a48dc9bd678be42b4441ca2cc8932aececa Mon Sep 17 00:00:00 2001
From: cxt <pinecxt@163.com>
Date: Sat, 29 Aug 2015 14:49:50 +0800
Subject: [PATCH 42/42] =?UTF-8?q?=E4=B8=BB=E9=A1=B5=E5=8A=A8=E6=80=81?=
 =?UTF-8?q?=E9=A1=B5=E9=9D=A2=E7=9A=84=E5=88=B7=E6=96=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/views/users/show.html.erb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/views/users/show.html.erb b/app/views/users/show.html.erb
index 4af2b8165..91a35e711 100644
--- a/app/views/users/show.html.erb
+++ b/app/views/users/show.html.erb
@@ -55,4 +55,4 @@
   </div>
 </div>
 
-<%= render :partial => 'users/user_activities', :locals => {:user_activities => @user_activities,:page => @page} %>
\ No newline at end of file
+<%= render :partial => 'users/user_activities', :locals => {:user_activities => @user_activities,:page => 0} %>
\ No newline at end of file