From ded497a5f265a5b2082dc092337a932800eeeae7 Mon Sep 17 00:00:00 2001
From: suntao <719450423@qq.com>
Date: Tue, 1 Sep 2015 15:43:59 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E4=B8=AA=E4=BA=BA=E4=B8=BB=E9=A1=B5?=
 =?UTF-8?q?=E5=B7=A6=E4=BE=A7=E5=AF=BC=E8=88=AA=E9=85=8D=E7=BD=AE=E6=8C=89?=
 =?UTF-8?q?=E9=92=AE?=
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 caa492158..4fbcb4139 100644
--- a/public/stylesheets/new_user.css
+++ b/public/stylesheets/new_user.css
@@ -498,7 +498,7 @@ a.coursesLineGrey:hover {color:#ffffff;}
 .homepageLeftMenuMore {height:18px;}
 .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;background:url(../images/homepage_icon.png) -190px -365px no-repeat; width:15px; height:15px;}
+.homepageMenuSetting {display:inline-block; margin-left:155px;background:url(../images/homepage_icon.png) -190px -365px no-repeat; width:15px; height:15px; margin-top: 16px; margin-right: 15px;}
 .homepageMenuSetting:hover {background:url(../images/homepage_icon.png) -190px -407px no-repeat;}
 a.homepageMenuText {color:#484848; font-size:16px; margin-left:20px;}
 .homepageLeftLabelContainer {width:238px; border:1px solid #dddddd; background-color:#ffffff; margin-top:10px;}

From c01b71739a17382f95ec3deea84ce37aa38a1dc6 Mon Sep 17 00:00:00 2001
From: sw <939547590@qq.com>
Date: Tue, 1 Sep 2015 16:01:00 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E5=8A=A0=E8=BD=BD?=
 =?UTF-8?q?=E6=9B=B4=E5=A4=9A=E6=8C=89=E9=92=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/views/users/_user_activities.html.erb |  4 +++-
 app/views/users/show.html.erb             | 16 ----------------
 app/views/users/show.js.erb               |  2 +-
 3 files changed, 4 insertions(+), 18 deletions(-)

diff --git a/app/views/users/_user_activities.html.erb b/app/views/users/_user_activities.html.erb
index a5325342c..6e03bb43d 100644
--- a/app/views/users/_user_activities.html.erb
+++ b/app/views/users/_user_activities.html.erb
@@ -8,6 +8,7 @@
     span.ke-icon-emoticons{background-position:0px -671px;width:50px;height:26px;}
     span.ke-icon-emoticons:hover{background-position:-79px -671px;width:50px;height:26px;}
     div.ke-toolbar .ke-outline{border:none;}
+    .ke-inline-block{display: none;}
 </style>
 <% user_activities.each do |user_activity|
   if user_activities %>
@@ -59,4 +60,5 @@
         <% end %>
     <% end %>
 <% end %>
-<input type="hidden" value="<%= page%>" id="show_more_activities" />
\ No newline at end of file
+<input type="hidden" value="<%= page%>"/>
+<%= link_to "加载更多",user_activities_path(@user.id),:id => "show_more_activities",:remote => "true"%>
\ No newline at end of file
diff --git a/app/views/users/show.html.erb b/app/views/users/show.html.erb
index 74ca48595..76599739c 100644
--- a/app/views/users/show.html.erb
+++ b/app/views/users/show.html.erb
@@ -1,19 +1,3 @@
-<script type="text/javascript">
-    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()},
-                    function (data) {
-
-                    }
-            );
-        }
-    };
-    $(window).scroll(scrollHandler);
-</script>
-
 <input type="hidden" value="<%= @type%>" name="type" id="user_activities_type">
 <div class="resources">
   <div class="homepageRightBanner">
diff --git a/app/views/users/show.js.erb b/app/views/users/show.js.erb
index 0ce84cf0e..f870b38b9 100644
--- a/app/views/users/show.js.erb
+++ b/app/views/users/show.js.erb
@@ -1,4 +1,4 @@
 $("#show_more_activities").replaceWith("<%= escape_javascript( render :partial =>  'users/user_activities',:locals => {:user_activities => @user_activities, :page => @page} )%>");
 <% if @user_activities.count < 10%>
-$(window).off("scroll", scrollHandler);
+$("#show_more_activities").hide();
 <% end%>