From ea4a0050484ccf70d041d4475851957cefd6817a Mon Sep 17 00:00:00 2001
From: suntao <719450423@qq.com>
Date: Wed, 2 Sep 2015 14:31:03 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E4=BD=9C=E4=B8=9A=E7=95=8C=E9=9D=A2?=
 =?UTF-8?q?=E6=8E=92=E7=89=88=E5=BE=AE=E8=B0=83?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/public/stylesheets/courses.css b/public/stylesheets/courses.css
index bc7f62aea..833613574 100644
--- a/public/stylesheets/courses.css
+++ b/public/stylesheets/courses.css
@@ -502,7 +502,7 @@ blockquote {
 }
 a.member_search_edit {width: 43px;background: #15bccf;color: #fff;text-align: center;text-decoration: none;padding: 2px;}
 .min_search_edit {width: 150px;height: 20px;border: 1px solid #d0d0d0 !important;color: #666;}
-.r_txt_tit{max-width:510px; overflow:hidden; white-space: nowrap; text-overflow:ellipsis;color:#15bccf; float:left; color:#09658c; font-size:14px;}
+.r_txt_tit{max-width:450px; overflow:hidden; white-space: nowrap; text-overflow:ellipsis;color:#15bccf; float:left; color:#09658c; font-size:14px;}
 
 /*日历选择图*/
 img.ui-datepicker-trigger {

From 3208574a5eb2fe0efc0d1dfac9a6ebf6d738c130 Mon Sep 17 00:00:00 2001
From: cxt <pinecxt@163.com>
Date: Wed, 2 Sep 2015 14:31:46 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E4=BD=9C=E4=B8=9A=E5=92=8C=E9=A6=96?=
 =?UTF-8?q?=E9=A1=B5=E7=9A=84=E5=8A=A0=E8=BD=BD=E6=9B=B4=E5=A4=9A=E4=BC=A0?=
 =?UTF-8?q?=E9=80=92page=E5=8F=82=E6=95=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/views/users/_user_activities.html.erb    | 2 +-
 app/views/users/_user_homework_list.html.erb | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/views/users/_user_activities.html.erb b/app/views/users/_user_activities.html.erb
index 2eba84efa..06daedb42 100644
--- a/app/views/users/_user_activities.html.erb
+++ b/app/views/users/_user_activities.html.erb
@@ -61,4 +61,4 @@
     <% end %>
 <% end %>
 <input type="hidden" value="<%= page%>"/>
-<%= link_to "点击展开更多",user_activities_path(@user.id,:type => type),:id => "show_more_activities",:remote => "true",:class => "loadMore mt10 f_grey"%>
+<%= link_to "点击展开更多",user_activities_path(@user.id,:type => type, :page => page),:id => "show_more_activities",:remote => "true",:class => "loadMore mt10 f_grey"%>
diff --git a/app/views/users/_user_homework_list.html.erb b/app/views/users/_user_homework_list.html.erb
index fc6e723f2..677f0303b 100644
--- a/app/views/users/_user_homework_list.html.erb
+++ b/app/views/users/_user_homework_list.html.erb
@@ -54,4 +54,4 @@
 <% end%>
 
 <input type="hidden" value="<%= page%>" />
-<%= link_to "加载更多",user_homeworks_user_path(User.current.id),:id => "user_show_more_homework",:remote => "true",:class => "loadMore f_grey"%>
\ No newline at end of file
+<%= link_to "加载更多",user_homeworks_user_path(User.current.id, :page=> page),:id => "user_show_more_homework",:remote => "true",:class => "loadMore f_grey"%>
\ No newline at end of file