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;} <% user_activities.each do |user_activity| if user_activities %> @@ -59,4 +60,5 @@ <% end %> <% end %> <% end %> - \ No newline at end of file + +<%= 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 @@ - -
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%>