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

app/controllers/users_controller.rb

@@ -109,19 +109,19 @@ class UsersController < ApplicationController
     end
     if @user.course_messages
      if params[:type].nil?
-       @user_course_messages = @user.course_messages
+       @user_course_messages = @user.course_messages.reverse
-       @user_project_messges = @user.forge_messages
+       @user_project_messges = @user.forge_messages.reverse
      else
       case params[:type]
         when 'homework'
-          @user_course_messages = @user.course_messages.select{|x| x.course_message_type == "HomeworkCommon"}
+          @user_course_messages = @user.course_messages.reverse.select{|x| x.course_message_type == "HomeworkCommon"}
           #@user_course_messages = ForgeMessage.find_by_sql("select * from course_messages where user_id='#{@user.id}' and course_message_type = 'HomeworkCommon' order by created_at desc;")
         when 'message'
-          @user_course_messages = @user.course_messages.select{|x| x.course_message_type == "Message"}
+          @user_course_messages = @user.course_messages.reverse.select{|x| x.course_message_type == "Message"}
         when 'news'
-          @user_course_messages = @user.course_messages.select{|x| x.course_message_type == "News"}
+          @user_course_messages = @user.course_messages.reverse.select{|x| x.course_message_type == "News"}
         when 'poll'
-          @user_course_messages = @user.course_messages.select{|x| x.course_message_type == "Poll"}
+          @user_course_messages = @user.course_messages.reverse.select{|x| x.course_message_type == "Poll"}
       end
      end
         respond_to do |format|

app/views/users/user_messages.html.erb

@@ -26,7 +26,7 @@
                   <li class="homepageNewsPortrait fl"><a href="javascript:void(0);"><%= image_tag(url_to_avatar(ucm.course_message.author), :width => "30", :height => "30") %></a></li>
                   <li class="homepageNewsPublisher fl"><a href="javascript:void(0);" class="newsBlue"><%= ucm.course_message.author %></a></li>
                   <li class="homepageNewsType fl">发布通知</li>
-                  <li class="homepageNewsContent fl"><a href="javascript:void(0);" class="newsGrey">
+                  <li class="homepageNewsContent fl"><a href="javascript:void(0);"  class="newsGrey">
                     <%= link_to format_activity_title(" #{ucm.course_message.title}"), {:controller => 'news', :action => 'show', :id => ucm.course_message.id} %></a></li>
                   <li class="homepageNewsTime fl"><%= time_tag(ucm.course_message.created_on).html_safe %> </li>
                 </ul>