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%> 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;}