Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh

app/controllers/users_controller.rb

@@ -106,16 +106,16 @@ class UsersController < ApplicationController
       return
     end
     # 当前用户查看消息，则设置消息为已读
-    # course_querys = @user.course_messages
-    # forge_querys = @user.forge_messages
-    # user_querys = @user.user_feedback_messages
-    # forum_querys = @user.memo_messages
-    # if User.current.id == @user.id
-    #   course_querys.update_all(:viewed => true)
-    #   forge_querys.update_all(:viewed => true)
-    #   user_querys.update_all(:viewed => true)
-    #   forum_querys.update_all(:viewed => true)
-    # end
+    course_querys = @user.course_messages
+    forge_querys = @user.forge_messages
+    user_querys = @user.user_feedback_messages
+    forum_querys = @user.memo_messages
+    if User.current.id == @user.id
+      course_querys.update_all(:viewed => true)
+      forge_querys.update_all(:viewed => true)
+      user_querys.update_all(:viewed => true)
+      forum_querys.update_all(:viewed => true)
+    end
     # @new_message_count = forge_querys.count + forum_querys.count + course_querys.count + user_querys.count
     case params[:type]
       when nil

app/views/users/_user_activities.html.erb

@@ -61,7 +61,7 @@
     <% end %>
 <% end %>
 <input type="hidden" value="<%= page%>"/>
+
 <% if user_activities.count == 10%>
-    <%= 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"%>
 <% end%>
-

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"%>
+<%= link_to "加载更多",user_homeworks_user_path(User.current.id, :page=> page),:id => "user_show_more_homework",:remote => "true",:class => "loadMore f_grey"%>

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 {
@@ -770,4 +770,4 @@ a.FilesName02{ max-width:665px;overflow:hidden; white-space:nowrap; text-overflo
 .ProResultUl span { display:block; float:left;}
 .ProResultUl li{  line-height:35px;  border-bottom:1px solid #dddddd; }
 .DateBorder{border:1px solid #d9d9d9; border-left:none; padding:7px 6px 6px 6px;}
-.mb50{margin-bottom: 50px;}
+.mb50{margin-bottom: 50px;}