diff --git a/app/controllers/users_controller.rb b/app/controllers/users_controller.rb
index 724a62a67..4fa7a7dc5 100644
--- a/app/controllers/users_controller.rb
+++ b/app/controllers/users_controller.rb
@@ -109,7 +109,7 @@ class UsersController < ApplicationController
     # if User.current.id == @user.id
     #   querys.update_all(:viewed => true)
     # end
-    @new_message_count = ForgeMessage.all.count
+    @new_message_count = @user.forge_messages.count + @user.memo_messages.count + @user.course_messages.count + @user.user_feedback_messages.count
     case params[:type]
       when nil
         @user_course_messages = @user.course_messages.reverse
diff --git a/app/models/memo.rb b/app/models/memo.rb
index 7225ae524..f1f9029c1 100644
--- a/app/models/memo.rb
+++ b/app/models/memo.rb
@@ -79,7 +79,7 @@ class Memo < ActiveRecord::Base
         receivers << self.forum.creator
       end
       # 添加发帖人
-      if self.author_id != self.parent.author_id
+      if  self.forum.creator_id != self.parent.author_id
         receivers << self.parent.author
       end
     end
diff --git a/app/views/users/user_messages.html.erb b/app/views/users/user_messages.html.erb
index 03934b9aa..a703422fb 100644
--- a/app/views/users/user_messages.html.erb
+++ b/app/views/users/user_messages.html.erb
@@ -1,261 +1,228 @@
 <div id="RSide" class="fl">
-  <div class="homepageRight">
-    <div class="resources">
-      <div class="resourcesBanner">
-        <div class="bannerName">消息</div>
-        <ul class="resourcesSelect">
-          <li class="resourcesSelected"><a href="javascript:void(0);" class="resourcesIcon"></a>
-            <ul class="newsType">
-              <li><a href="javascript:void(0);" class="resourcesGrey"><%= link_to "全部",{:controller=> 'users', :action => 'user_messages', id: User.current.id, host: Setting.host_user} %></a></li>
-              <%# 课程相关消息 %>
-              <% unless @user_course_messages.nil? %>
-                  <% if @user_course_messages_count > 0 %>
-                      <li><a href="javascript:void(0);" class="resourcesGrey"><%= link_to "作业消息",{:controller=> 'users', :action => 'user_messages', id: User.current.id, host: Setting.host_user, :type => 'homework'} %></a></li>
-                  <% end %>
-                  <% if @user_course_messages_count > 0 %>
-                      <li><a href="javascript:void(0);" class="resourcesGrey"><%= link_to "课程讨论区",{:controller=> 'users', :action => 'user_messages', id: User.current.id, host: Setting.host_user, :type => 'course_message'} %></a></li>
-                  <% end %>
-                  <% if @user_course_messages_count > 0 %>
-                      <li><a href="javascript:void(0);" class="resourcesGrey"><%= link_to "发布了课程通知",{:controller=> 'users', :action => 'user_messages', id: User.current.id, host: Setting.host_user, :type => 'course_news'} %></a></li>
-                  <% end %>
-                  <% if @user_course_messages_count > 0 %>
-                      <li><a href="javascript:void(0);" class="resourcesGrey"><%= link_to "问卷调查",{:controller=> 'users', :action => 'user_messages', id: User.current.id, host: Setting.host_user, :type => 'poll'} %></a></li>
-                 <% end %>
-                  <% if @user_course_messages_count > 0 %>
-                  <li><a href="javascript:void(0);" class="resourcesGrey"><%= link_to "作品评阅",{:controller=> 'users', :action => 'user_messages', id: User.current.id, host: Setting.host_user, :type => 'works_reviewers'} %></a></li>
-                  <% end %>
-                  <% if @user_course_messages_count > 0 %>
-                  <li><a href="javascript:void(0);" class="resourcesGrey"><%= link_to "作品讨论",{:controller=> 'users', :action => 'user_messages', id: User.current.id, host: Setting.host_user, :type => 'works_reply'} %></a></li>
+<div class="homepageRight">
+<div class="resources">
+<div class="resourcesBanner">
+  <div class="bannerName">消息</div>
+  <ul class="resourcesSelect">
+    <li class="resourcesSelected"><a href="javascript:void(0);" class="resourcesIcon"></a>
+      <ul class="newsType">
+        <li><a href="javascript:void(0);" class="resourcesGrey"><%= link_to "全部",{:controller=> 'users', :action => 'user_messages', id: User.current.id, host: Setting.host_user} %></a></li>
+        <%# 课程相关消息 %>
+        <li><a href="javascript:void(0);" class="resourcesGrey"><%= link_to "作业消息",{:controller=> 'users', :action => 'user_messages', id: User.current.id, host: Setting.host_user, :type => 'homework'} %></a></li>
+        <li><a href="javascript:void(0);" class="resourcesGrey"><%= link_to "课程讨论区",{:controller=> 'users', :action => 'user_messages', id: User.current.id, host: Setting.host_user, :type => 'course_message'} %></a></li>
+        <li><a href="javascript:void(0);" class="resourcesGrey"><%= link_to "发布了课程通知",{:controller=> 'users', :action => 'user_messages', id: User.current.id, host: Setting.host_user, :type => 'course_news'} %></a></li>
+        <li><a href="javascript:void(0);" class="resourcesGrey"><%= link_to "问卷调查",{:controller=> 'users', :action => 'user_messages', id: User.current.id, host: Setting.host_user, :type => 'poll'} %></a></li>
+        <li><a href="javascript:void(0);" class="resourcesGrey"><%= link_to "作品评阅",{:controller=> 'users', :action => 'user_messages', id: User.current.id, host: Setting.host_user, :type => 'works_reviewers'} %></a></li>
+        <li><a href="javascript:void(0);" class="resourcesGrey"><%= link_to "作品讨论",{:controller=> 'users', :action => 'user_messages', id: User.current.id, host: Setting.host_user, :type => 'works_reply'} %></a></li>
+        <%# 项目相关消息 %>
+        <li><a href="javascript:void(0);" class="resourcesGrey"><%= link_to "指派给我",{:controller=> 'users', :action => 'user_messages', id: User.current.id, host: Setting.host_user, :type => 'issue'} %></a></li>
+        <li><a href="javascript:void(0);" class="resourcesGrey"><%= link_to "更新了问题",{:controller=> 'users', :action => 'user_messages', id: User.current.id, host: Setting.host_user, :type => 'issue_update'} %></a></li>
+        <li><a href="javascript:void(0);" class="resourcesGrey"><%= link_to "项目讨论区",{:controller=> 'users', :action => 'user_messages', id: User.current.id, host: Setting.host_user, :type => 'forge_message'} %></a></li>
+        <li><a href="javascript:void(0);" class="resourcesGrey"><%= link_to "发布了新闻",{:controller=> 'users', :action => 'user_messages', id: User.current.id, host: Setting.host_user, :type => 'forge_news'} %></a></li>
+        <li><a href="javascript:void(0);" class="resourcesGrey"><%= link_to "贴吧帖子",{:controller=> 'users', :action => 'user_messages', id: User.current.id, host: Setting.host_user, :type => 'forum'} %></a></li>
+        <%# 用户留言 %>
+        <li><a href="javascript:void(0);" class="resourcesGrey"><%= link_to "用户留言",{:controller=> 'users', :action => 'user_messages', id: User.current.id, host: Setting.host_user, :type => 'user_feedback'} %></a></li>
 
+      </ul>
+    </li>
+  </ul>
+</div>
+
+<div>
+  <% if @new_message_count >0 %>
+      <%# 课程消息 %>
+      <% unless @user_course_messages.nil? %>
+          <% @user_course_messages.each do |ucm| %>
+              <% if ucm.course_message_type == "News" %>
+                  <ul class="homepageNewsList fl">
+                    <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="<%=ucm.viewed == 0?"newsBlack":"newsBlue"%>"><%= ucm.course_message.author %></a></li>
+                    <li class="<%= ucm.viewed == 0 ? "homepageNewsTypeNotRead fl":"homepageNewsType fl" %>">发布通知</li>
+                    <li class="homepageNewsContent fl">
+                      <%= link_to "#{ucm.course_message.title}", {:controller => 'news', :action => 'show', :id => ucm.course_message.id },:class =>"#{ucm.viewed == 0 ? "newsBlack" : "newsGrey"}" %></li>
+                    <li class="homepageNewsTime fl"><%= time_tag(ucm.course_message.created_on).html_safe %> </li>
+                  </ul>
               <% end %>
+              <% if ucm.course_message_type == "HomeworkCommon" %>
+                  <ul class="homepageNewsList fl">
+                    <li class="homepageNewsPortrait fl"><a href="javascript:void(0);"><%= image_tag(url_to_avatar(ucm.course_message.user), :width => "30", :height => "30") %></a></li>
+                    <li class="homepageNewsPublisher fl"><a href="javascript:void(0);" class="newsBlue"><%= ucm.course_message.user %></a></li>
+                    <li class="homepageNewsType fl">发布作业</li>
+                    <li class="homepageNewsContent fl"><a href="javascript:void(0);" class="newsGrey">
+                      <%= link_to ("#{ucm.course_message.name}"), student_work_index_path(:homework => ucm.course_message.id),:class => "newsGrey" %></a></li>
+                    <li class="homepageNewsTime fl"><%= time_tag(ucm.course_message.created_at).html_safe %> </li>
+                  </ul>
               <% end %>
-              <%# 项目相关消息 %>
-              <% unless @user_forge_messages.nil? %>
-                  <% if @user_forge_messages_count > 0 %>
-                      <li><a href="javascript:void(0);" class="resourcesGrey"><%= link_to "指派给我",{:controller=> 'users', :action => 'user_messages', id: User.current.id, host: Setting.host_user, :type => 'issue'} %></a></li>
-                  <% end %>
-                  <% if @user_forge_messages_count > 0 %>
-                      <li><a href="javascript:void(0);" class="resourcesGrey"><%= link_to "更新了问题",{:controller=> 'users', :action => 'user_messages', id: User.current.id, host: Setting.host_user, :type => 'issue_update'} %></a></li>
-                  <% end %>
-                  <% if @user_forge_messages_count > 0 %>
-                      <li><a href="javascript:void(0);" class="resourcesGrey"><%= link_to "项目讨论区",{:controller=> 'users', :action => 'user_messages', id: User.current.id, host: Setting.host_user, :type => 'forge_message'} %></a></li>
-                  <% end %>
-                  <% if @user_forge_messages_count > 0 %>
-                      <li><a href="javascript:void(0);" class="resourcesGrey"><%= link_to "发布了新闻",{:controller=> 'users', :action => 'user_messages', id: User.current.id, host: Setting.host_user, :type => 'forge_news'} %></a></li>
-                  <% end %>
+              <% if ucm.course_message_type == "Poll" %>
+                  <ul class="homepageNewsList fl">
+                    <li class="homepageNewsPortrait fl"><a href="javascript:void(0);"><%= image_tag(url_to_avatar(ucm.course_message.user), :width => "30", :height => "30") %></a></li>
+                    <li class="homepageNewsPublisher fl"><a href="javascript:void(0);" class="<%=ucm.viewed == 0?"newsBlack":"newsBlue"%>"><%= ucm.course_message.user %></a></li>
+                    <li class="<%= ucm.viewed == 0 ? "homepageNewsTypeNotRead fl":"homepageNewsType fl" %>">发布问卷</li>
+                    <li class="homepageNewsContent fl"><a href="javascript:void(0);" class="newsGrey">
+                      <%= link_to format_activity_title(" #{ucm.course_message.polls_name}"), poll_index_path(:polls_type => "Course", :polls_group_id => ucm.course_id),:class=>"#{ucm.viewed==0?"newsBlack":"newsGrey"}" %></a></li>
+                    <li class="homepageNewsTime fl"><%= time_tag(ucm.course_message.created_at).html_safe %> </li>
+                  </ul>
               <% end %>
-              <%# 公共贴吧 %>
-              <% unless @user_memo_messages.nil? %>
-                  <% if @user_memo_messages_count > 0 %>
-                      <li><a href="javascript:void(0);" class="resourcesGrey"><%= link_to "贴吧帖子",{:controller=> 'users', :action => 'user_messages', id: User.current.id, host: Setting.host_user, :type => 'forum'} %></a></li>
-                  <% end %>
+              <% if ucm.course_message_type == "Message" %>
+                  <ul class="homepageNewsList fl">
+                    <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="<%=ucm.viewed == 0?"newsBlack":"newsBlue"%>"><%= ucm.course_message.author %></a></li>
+                    <% if ucm.course_message.parent_id.nil? %>
+                        <li class="<%= ucm.viewed == 0 ? "homepageNewsTypeNotRead fl":"homepageNewsType fl" %>">发布帖子</li>
+                        <li class="homepageNewsContent fl"><a href="javascript:void(0);" class="newsGrey">
+                          <%=link_to ucm.course_message.subject, course_boards_path(ucm.course_message.course,:parent_id => ucm.course_message.parent_id ? ucm.course_message.parent_id : ucm.course_message.id, :topic_id => ucm.course_message.id),:class=>"#{ucm.viewed==0?"newsBlack":"newsGrey"}" %></a></li>
+                        <li class="homepageNewsTime fl"><%= time_tag(ucm.course_message.created_on).html_safe %> </li>
+                    <% else %>
+                        <li class="<%= ucm.viewed == 0 ? "homepageNewsTypeNotRead fl":"homepageNewsType fl" %>">回复帖子</li>
+                        <li class="homepageNewsContent fl"><a href="javascript:void(0);" class="newsGrey">
+                          <%=link_to ucm.course_message.subject, course_boards_path(ucm.course_message.course,:parent_id => ucm.course_message.parent_id ? ucm.course_message.parent_id : ucm.course_message.id, :topic_id => ucm.course_message.id),:class=>"#{ucm.viewed==0?"newsBlack":"newsGrey"}" %> </a></li>
+                        <li class="homepageNewsTime fl"><%= time_tag(ucm.course_message.created_on).html_safe %> </li>
+                    <% end %>
+                  </ul>
               <% end %>
-              <%# 用户留言 %>
-              <% unless @user_feedback_messages.nil? %>
-                  <% if @user_feedback_messages_count > 0 %>
-                    <li><a href="javascript:void(0);" class="resourcesGrey"><%= link_to "用户留言",{:controller=> 'users', :action => 'user_messages', id: User.current.id, host: Setting.host_user, :type => 'user_feedback'} %></a></li>
-                  <% end %>
+              <% if ucm.course_message_type == "StudentWorksScore" %>
+                  <ul class="homepageNewsList fl">
+                    <li class="homepageNewsPortrait fl"><a href="javascript:void(0);"><%= image_tag(url_to_avatar(ucm.course_message.user), :width => "30", :height => "30") %></a></li>
+                    <li class="homepageNewsPublisher fl"><a href="javascript:void(0);" class="newsBlue"><%= ucm.course_message.user %></a></li>
+                    <li class="homepageNewsType fl">评阅了作品</li>
+                    <li class="homepageNewsContent fl"><a href="javascript:void(0);" class="newsGrey">
+                      <%= link_to ucm.course_message.comment, student_work_index_path(:homework => ucm.course_message.student_work.homework_common_id),:class=>"newsGrey" %></a></li>
+                    <li class="homepageNewsTime fl"><%= time_tag(ucm.course_message.created_at).html_safe %> </li>
+                  </ul>
               <% end %>
-            </ul>
-          </li>
-        </ul>
-      </div>
-
-      <div>
-        <% if @new_message_count >0 %>
-            <%# 课程消息 %>
-            <% unless @user_course_messages.nil? %>
-                <% @user_course_messages.each do |ucm| %>
-                    <% if ucm.course_message_type == "News" %>
-                        <ul class="homepageNewsList fl">
-                          <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="<%=ucm.viewed == 0?"newsBlack":"newsBlue"%>"><%= ucm.course_message.author %></a></li>
-                          <li class="<%= ucm.viewed == 0 ? "homepageNewsTypeNotRead fl":"homepageNewsType fl" %>">发布通知</li>
-                          <li class="homepageNewsContent fl">
-                            <%= link_to "#{ucm.course_message.title}", {:controller => 'news', :action => 'show', :id => ucm.course_message.id },:class =>"#{ucm.viewed == 0 ? "newsBlack" : "newsGrey"}" %></li>
-                          <li class="homepageNewsTime fl"><%= time_tag(ucm.course_message.created_on).html_safe %> </li>
-                        </ul>
-                    <% end %>
-                    <% if ucm.course_message_type == "HomeworkCommon" %>
-                        <ul class="homepageNewsList fl">
-                          <li class="homepageNewsPortrait fl"><a href="javascript:void(0);"><%= image_tag(url_to_avatar(ucm.course_message.user), :width => "30", :height => "30") %></a></li>
-                          <li class="homepageNewsPublisher fl"><a href="javascript:void(0);" class="<%=ucm.viewed == 0?"newsBlack":"newsBlue"%>"><%= ucm.course_message.user %></a></li>
-                          <li class="<%= ucm.viewed == 0 ? "homepageNewsTypeNotRead fl":"homepageNewsType fl" %>">发布作业</li>
-                          <li class="homepageNewsContent fl"><a href="javascript:void(0);" class="newsGrey">
-                            <%= link_to ("#{ucm.course_message.name}"), student_work_index_path(:homework => ucm.course_message.id),:class => "#{ucm.viewed == 0?"newsBlack":"newsGrey"}" %></a></li>
-                          <li class="homepageNewsTime fl"><%= time_tag(ucm.course_message.created_at).html_safe %> </li>
-                        </ul>
-                    <% end %>
-                    <% if ucm.course_message_type == "Poll" %>
-                        <ul class="homepageNewsList fl">
-                          <li class="homepageNewsPortrait fl"><a href="javascript:void(0);"><%= image_tag(url_to_avatar(ucm.course_message.user), :width => "30", :height => "30") %></a></li>
-                          <li class="homepageNewsPublisher fl"><a href="javascript:void(0);" class="<%=ucm.viewed == 0?"newsBlack":"newsBlue"%>"><%= ucm.course_message.user %></a></li>
-                          <li class="<%= ucm.viewed == 0 ? "homepageNewsTypeNotRead fl":"homepageNewsType fl" %>">发布问卷</li>
-                          <li class="homepageNewsContent fl"><a href="javascript:void(0);" class="newsGrey">
-                            <%= link_to format_activity_title(" #{ucm.course_message.polls_name}"), poll_index_path(:polls_type => "Course", :polls_group_id => ucm.course_id),:class=>"#{ucm.viewed==0?"newsBlack":"newsGrey"}" %></a></li>
-                          <li class="homepageNewsTime fl"><%= time_tag(ucm.course_message.created_at).html_safe %> </li>
-                        </ul>
-                    <% end %>
-                    <% if ucm.course_message_type == "Message" %>
-                        <ul class="homepageNewsList fl">
-                          <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="<%=ucm.viewed == 0?"newsBlack":"newsBlue"%>"><%= ucm.course_message.author %></a></li>
-                          <% if ucm.course_message.parent_id.nil? %>
-                              <li class="<%= ucm.viewed == 0 ? "homepageNewsTypeNotRead fl":"homepageNewsType fl" %>">发布帖子</li>
-                              <li class="homepageNewsContent fl"><a href="javascript:void(0);" class="newsGrey">
-                                <%=link_to ucm.course_message.subject, course_boards_path(ucm.course_message.course,:parent_id => ucm.course_message.parent_id ? ucm.course_message.parent_id : ucm.course_message.id, :topic_id => ucm.course_message.id),:class=>"#{ucm.viewed==0?"newsBlack":"newsGrey"}" %></a></li>
-                              <li class="homepageNewsTime fl"><%= time_tag(ucm.course_message.created_on).html_safe %> </li>
-                          <% else %>
-                              <li class="<%= ucm.viewed == 0 ? "homepageNewsTypeNotRead fl":"homepageNewsType fl" %>">回复帖子</li>
-                              <li class="homepageNewsContent fl"><a href="javascript:void(0);" class="newsGrey">
-                                <%=link_to ucm.course_message.subject, course_boards_path(ucm.course_message.course,:parent_id => ucm.course_message.parent_id ? ucm.course_message.parent_id : ucm.course_message.id, :topic_id => ucm.course_message.id),:class=>"#{ucm.viewed==0?"newsBlack":"newsGrey"}" %> </a></li>
-                              <li class="homepageNewsTime fl"><%= time_tag(ucm.course_message.created_on).html_safe %> </li>
-                          <% end %>
-                        </ul>
-                    <% end %>
-                    <% if ucm.course_message_type == "StudentWorksScore" %>
-                        <ul class="homepageNewsList fl">
-                          <li class="homepageNewsPortrait fl"><a href="javascript:void(0);"><%= image_tag(url_to_avatar(ucm.course_message.user), :width => "30", :height => "30") %></a></li>
-                          <li class="homepageNewsPublisher fl"><a href="javascript:void(0);" class="<%=ucm.viewed == 0?"newsBlack":"newsBlue"%>"><%= ucm.course_message.user %></a></li>
-                          <li class="<%= ucm.viewed == 0 ? "homepageNewsTypeNotRead fl":"homepageNewsType fl" %>">作品评阅</li>
-                          <li class="homepageNewsContent fl"><a href="javascript:void(0);" class="newsGrey">
-                            <%= link_to ucm.course_message.comment, student_work_path(ucm.course_message.id),:class=>"#{ucm.viewed==0?"newsBlack":"newsGrey"}" %> %></a></li>
-                          <li class="homepageNewsTime fl"><%= time_tag(ucm.course_message.created_at).html_safe %> </li>
-                        </ul>
-                    <% end %>
-                    <% if ucm.course_message_type == "JournalsForMessage" %>
-                        <ul class="homepageNewsList fl">
-                          <li class="homepageNewsPortrait fl"><a href="javascript:void(0);"><%= image_tag(url_to_avatar(ucm.course_message.user), :width => "30", :height => "30") %></a></li>
-                          <li class="homepageNewsPublisher fl"><a href="javascript:void(0);" class="<%=ucm.viewed == 0?"newsBlack":"newsBlue"%>"><%= ucm.course_message.user %></a></li>
-                          <li class="<%= ucm.viewed == 0 ? "homepageNewsTypeNotRead fl":"homepageNewsType fl" %>">作品讨论</li>
-                          <li class="homepageNewsContent fl"><a href="javascript:void(0);" class="newsGrey">
-                            <%= link_to ucm.course_message.notes, student_work_path(ucm.course_message.id),:class=>"#{ucm.viewed==0?"newsBlack":"newsGrey"}" %></a></li>
-                          <li class="homepageNewsTime fl"><%= time_tag(ucm.course_message.created_on).html_safe %> </li>
-                        </ul>
-                    <% end %>
-                    <div class="cl"></div>
-                <% end %>
-            <% end %>
-            <!--项目消息-->
-            <% unless @user_forge_messages.nil? %>
-                <% @user_forge_messages.each do |ufm| %>
-                    <% if ufm.forge_message_type == "Issue" %>
-                        <ul class="homepageNewsList fl">
-                          <li class="homepageNewsPortrait fl">
-                            <a href="javascript:void(0);"><%= image_tag(url_to_avatar(ufm.forge_message.author), :width => "30", :height => "30") %></a>
-                          </li>
-                          <li class="homepageNewsPublisher fl">
-                            <a href="javascript:void(0);" class="<%= ufm.viewed == 0 ? "newsBlack" : "newsBlue" %>"><%= ufm.forge_message.author %></a>
-                          </li>
-                          <li class="<%= ufm.viewed == 0 ? "homepageNewsTypeNotRead fl" : "homepageNewsType fl" %>">发了问题给我</li>
-                          <li class="homepageNewsContent fl"><a href="javascript:void(0);" class="newsGrey">
-                            <%= link_to ("#{ufm.forge_message.subject}"), issue_path(:id => ufm.forge_message.id), :class => "#{ufm.viewed == 0 ? "newsBlack" : "newsGrey"}" %></a>
-                          </li>
-                          <li class="homepageNewsTime fl"><%= time_tag(ufm.forge_message.created_on).html_safe %> </li>
-                        </ul>
-                    <% end %>
-                    <% if ufm.forge_message_type == "Journal" %>
-                        <ul class="homepageNewsList fl">
-                          <li class="homepageNewsPortrait fl">
-                            <a href="javascript:void(0);"><%= image_tag(url_to_avatar(ufm.forge_message.user), :width => "30", :height => "30") %></a>
-                          </li>
-                          <li class="homepageNewsPublisher fl">
-                            <a href="javascript:void(0);" class="<%= ufm.viewed == 0 ? "newsBlack" : "newsBlue" %>"><%= ufm.forge_message.user %></a>
-                          </li>
-                          <li class="<%= ufm.viewed == 0 ? "homepageNewsTypeNotRead fl" : "homepageNewsType fl" %>">
-                            <%= ufm.forge_message.notes.empty? ? "更新了问题状态" : "在问题中留言了" %></li>
-                          <li class="homepageNewsContent fl"><a href="javascript:void(0);" class="newsGrey">
-                            <%= link_to ("#{ufm.forge_message.notes.empty? ? ufm.forge_message.issue.subject : ufm.forge_message.notes }"), issue_path(:id => ufm.forge_message.journalized_id), :class => "#{ufm.viewed == 0 ? "newsBlack" : "newsGrey"}" %></a>
-                          </li>
-                          <li class="homepageNewsTime fl"><%= time_tag(ufm.forge_message.created_on).html_safe %> </li>
-                        </ul>
-                    <% end %>
-                    <% if ufm.forge_message_type == "Message" %>
-                        <ul class="homepageNewsList fl">
-                          <li class="homepageNewsPortrait fl"><a href="javascript:void(0);"><%= image_tag(url_to_avatar(ufm.forge_message.author), :width => "30", :height => "30") %></a></li>
-                          <li class="homepageNewsPublisher fl"><a href="javascript:void(0);" class="<%=ufm.viewed == 0?"newsBlack":"newsBlue"%>"><%= ufm.forge_message.author %></a></li>
-                          <% if ufm.forge_message.parent_id.nil? %>
-                              <li class="<%= ufm.viewed == 0 ? "homepageNewsTypeNotRead fl":"homepageNewsType fl" %>">发布帖子</li>
-                              <li class="homepageNewsContent fl"><a href="javascript:void(0);" class="newsGrey">
-                                <%=link_to ufm.forge_message.subject, project_boards_path(ufm.forge_message.project,:parent_id => ufm.forge_message.parent_id ? ufm.forge_message.parent_id : ufm.forge_message.id, :topic_id => ufm.forge_message.id),:class=>"#{ufm.viewed==0?"newsBlack":"newsGrey"}" %></a></li>
-                              <li class="homepageNewsTime fl"><%= time_tag(ufm.forge_message.created_on).html_safe %> </li>
-                          <% else %>
-                              <li class="<%= ufm.viewed == 0 ? "homepageNewsTypeNotRead fl":"homepageNewsType fl" %>">回复帖子</li>
-                              <li class="homepageNewsContent fl"><a href="javascript:void(0);" class="newsGrey">
-                                <%=link_to ufm.forge_message.subject, project_boards_path(ufm.forge_message.project,:parent_id => ufm.forge_message.parent_id ? ufm.forge_message.parent_id : ufm.forge_message.id, :topic_id => ufm.forge_message.id),:class=>"#{ufm.viewed==0?"newsBlack":"newsGrey"}" %> </a></li>
-                              <li class="homepageNewsTime fl"><%= time_tag(ufm.forge_message.created_on).html_safe %> </li>
-                          <% end %>
-                        </ul>
-                    <% end %>
-                    <% if ufm.forge_message_type == "News" %>
-                        <ul class="homepageNewsList fl">
-                          <li class="homepageNewsPortrait fl">
-                            <a href="javascript:void(0);"><%= image_tag(url_to_avatar(ufm.forge_message.author), :width => "30", :height => "30") %></a>
-                          </li>
-                          <li class="homepageNewsPublisher fl">
-                            <a href="javascript:void(0);" class="<%= ufm.viewed == 0 ? "newsBlack" : "newsBlue" %>"><%= ufm.forge_message.author %></a>
-                          </li>
-                          <li class="<%= ufm.viewed == 0 ? "homepageNewsTypeNotRead fl" : "homepageNewsType fl" %>">发布了项目消息</li>
-                          <li class="homepageNewsContent fl"><a href="javascript:void(0);" class="newsGrey">
-                            <%= link_to ("#{ufm.forge_message.title}"), {:controller => 'news', :action => 'show', :id => ufm.forge_message.id}, :class => "#{ufm.viewed == 0 ? "newsBlack" : "newsGrey"}" %></a>
-                          </li>
-                          <li class="homepageNewsTime fl"><%= time_tag(ufm.forge_message.created_on).html_safe %> </li>
-                        </ul>
-                    <% end %>
-                <% end %>
-            <% end %>
-            <%# 公共贴吧　%>
-            <% unless @user_memo_messages.nil? %>
-                <% @user_memo_messages.each do |urm| %>
-                    <% if urm.memo_type == "forum" %>
-                        <ul class="homepageNewsList fl">
-                          <li class="homepageNewsPortrait fl">
-                            <a href="javascript:void(0);"><%= image_tag(url_to_avatar(urm.memo.author), :width => "30", :height => "30") %></a>
-                          </li>
-                          <li class="homepageNewsPublisher fl">
-                            <a href="javascript:void(0);" class="newsBlue"><%= urm.memo.author %></a>
-                          </li>
-                          <li class="homepageNewsType fl" >回复了贴吧帖子</li>
-                          <li class="homepageNewsContent fl"><a href="javascript:void(0);" class="newsGrey">
-                            <%= link_to urm.memo.subject, forum_memo_path(urm.memo.forum_id, urm.memo.parent_id ? urm.memo.parent_id: urm.memo.id),:class => "newsGrey" %></a>
-                          </li>
-                          <li class="homepageNewsTime fl"><%= time_tag(urm.memo.created_at).html_safe %> </li>
-                        </ul>
+              <% if ucm.course_message_type == "JournalsForMessage" %>
+                  <ul class="homepageNewsList fl">
+                    <li class="homepageNewsPortrait fl"><a href="javascript:void(0);"><%= image_tag(url_to_avatar(ucm.course_message.user), :width => "30", :height => "30") %></a></li>
+                    <li class="homepageNewsPublisher fl"><a href="javascript:void(0);" class="newsBlue"><%= ucm.course_message.user %></a></li>
+                    <li class="homepageNewsType fl">回复了作品</li>
+                    <li class="homepageNewsContent fl"><a href="javascript:void(0);" class="newsGrey">
+                      <%= link_to ucm.course_message.notes, student_work_index_path(:homework => ucm.course_message.jour.student_work.homework_common_id),:class=>"newsGrey" %></a></li>
+                    <li class="homepageNewsTime fl"><%= time_tag(ucm.course_message.created_on).html_safe %> </li>
+                  </ul>
+              <% end %>
+              <div class="cl"></div>
+          <% end %>
+      <% end %>
+      <!--项目消息-->
+      <% unless @user_forge_messages.nil? %>
+          <% @user_forge_messages.each do |ufm| %>
+              <% if ufm.forge_message_type == "Issue" %>
+                  <ul class="homepageNewsList fl">
+                    <li class="homepageNewsPortrait fl">
+                      <a href="javascript:void(0);"><%= image_tag(url_to_avatar(ufm.forge_message.author), :width => "30", :height => "30") %></a>
+                    </li>
+                    <li class="homepageNewsPublisher fl">
+                      <a href="javascript:void(0);" class="<%= ufm.viewed == 0 ? "newsBlack" : "newsBlue" %>"><%= ufm.forge_message.author %></a>
+                    </li>
+                    <li class="<%= ufm.viewed == 0 ? "homepageNewsTypeNotRead fl" : "homepageNewsType fl" %>">指派问题给我</li>
+                    <li class="homepageNewsContent fl"><a href="javascript:void(0);" class="newsGrey">
+                      <%= link_to ("#{ufm.forge_message.subject}"), issue_path(:id => ufm.forge_message.id), :class => "#{ufm.viewed == 0 ? "newsBlack" : "newsGrey"}" %></a>
+                    </li>
+                    <li class="homepageNewsTime fl"><%= time_tag(ufm.forge_message.created_on).html_safe %> </li>
+                  </ul>
+              <% end %>
+              <% if ufm.forge_message_type == "Journal" %>
+                  <ul class="homepageNewsList fl">
+                    <li class="homepageNewsPortrait fl">
+                      <a href="javascript:void(0);"><%= image_tag(url_to_avatar(ufm.forge_message.user), :width => "30", :height => "30") %></a>
+                    </li>
+                    <li class="homepageNewsPublisher fl">
+                      <a href="javascript:void(0);" class="<%= ufm.viewed == 0 ? "newsBlack" : "newsBlue" %>"><%= ufm.forge_message.user %></a>
+                    </li>
+                    <li class="<%= ufm.viewed == 0 ? "homepageNewsTypeNotRead fl" : "homepageNewsType fl" %>">
+                      <%= ufm.forge_message.notes.empty? ? "更新了问题状态" : "在问题中留言了" %></li>
+                    <li class="homepageNewsContent fl"><a href="javascript:void(0);" class="newsGrey">
+                      <%= link_to ("#{ufm.forge_message.notes.empty? ? ufm.forge_message.issue.subject : ufm.forge_message.notes }"), issue_path(:id => ufm.forge_message.journalized_id), :class => "#{ufm.viewed == 0 ? "newsBlack" : "newsGrey"}" %></a>
+                    </li>
+                    <li class="homepageNewsTime fl"><%= time_tag(ufm.forge_message.created_on).html_safe %> </li>
+                  </ul>
+              <% end %>
+              <% if ufm.forge_message_type == "Message" %>
+                  <ul class="homepageNewsList fl">
+                    <li class="homepageNewsPortrait fl"><a href="javascript:void(0);"><%= image_tag(url_to_avatar(ufm.forge_message.author), :width => "30", :height => "30") %></a></li>
+                    <li class="homepageNewsPublisher fl"><a href="javascript:void(0);" class="<%=ufm.viewed == 0?"newsBlack":"newsBlue"%>"><%= ufm.forge_message.author %></a></li>
+                    <% if ufm.forge_message.parent_id.nil? %>
+                        <li class="<%= ufm.viewed == 0 ? "homepageNewsTypeNotRead fl":"homepageNewsType fl" %>">发布帖子</li>
+                        <li class="homepageNewsContent fl"><a href="javascript:void(0);" class="newsGrey">
+                          <%=link_to ufm.forge_message.subject, project_boards_path(ufm.forge_message.project,:parent_id => ufm.forge_message.parent_id ? ufm.forge_message.parent_id : ufm.forge_message.id, :topic_id => ufm.forge_message.id),:class=>"#{ufm.viewed==0?"newsBlack":"newsGrey"}" %></a></li>
+                        <li class="homepageNewsTime fl"><%= time_tag(ufm.forge_message.created_on).html_safe %> </li>
+                    <% else %>
+                        <li class="<%= ufm.viewed == 0 ? "homepageNewsTypeNotRead fl":"homepageNewsType fl" %>">回复帖子</li>
+                        <li class="homepageNewsContent fl"><a href="javascript:void(0);" class="newsGrey">
+                          <%=link_to ufm.forge_message.subject, project_boards_path(ufm.forge_message.project,:parent_id => ufm.forge_message.parent_id ? ufm.forge_message.parent_id : ufm.forge_message.id, :topic_id => ufm.forge_message.id),:class=>"#{ufm.viewed==0?"newsBlack":"newsGrey"}" %> </a></li>
+                        <li class="homepageNewsTime fl"><%= time_tag(ufm.forge_message.created_on).html_safe %> </li>
                     <% end %>
-                <% end %>
-            <% end %>
-            <%# 用户留言消息 %>
-            <% unless @user_feedback_messages.nil? %>
-                <% @user_feedback_messages.each do |ufm| %>
-                    <% if ufm.journals_for_message_type == "Principal" %>
-                        <ul class="homepageNewsList fl">
-                          <li class="homepageNewsPortrait fl">
-                            <a href="javascript:void(0);"><%= image_tag(url_to_avatar(ufm.journals_for_message.user), :width => "30", :height => "30") %></a>
-                          </li>
-                          <li class="homepageNewsPublisher fl">
-                            <a href="javascript:void(0);" class="newsBlue"><%= ufm.journals_for_message.user %></a>
-                          </li>
-                          <% if ufm.journals_for_message.reply_id == 0 %>
+                  </ul>
+              <% end %>
+              <% if ufm.forge_message_type == "News" %>
+                  <ul class="homepageNewsList fl">
+                    <li class="homepageNewsPortrait fl">
+                      <a href="javascript:void(0);"><%= image_tag(url_to_avatar(ufm.forge_message.author), :width => "30", :height => "30") %></a>
+                    </li>
+                    <li class="homepageNewsPublisher fl">
+                      <a href="javascript:void(0);" class="newsBlue"><%= ufm.forge_message.author %></a>
+                    </li>
+                    <li class="homepageNewsType fl">发布了项目消息</li>
+                    <li class="homepageNewsContent fl"><a href="javascript:void(0);" class="newsGrey">
+                      <%= link_to ("#{ufm.forge_message.title}"), {:controller => 'news', :action => 'show', :id => ufm.forge_message.id}, :class => "newsGrey" %></a>
+                    </li>
+                    <li class="homepageNewsTime fl"><%= time_tag(ufm.forge_message.created_on).html_safe %> </li>
+                  </ul>
+              <% end %>
+          <% end %>
+      <% end %>
+      <%# 公共贴吧　%>
+      <% unless @user_memo_messages.nil? %>
+          <% @user_memo_messages.each do |urm| %>
+              <% if urm.memo_type == "Memo" %>
+                  <ul class="homepageNewsList fl">
+                    <li class="homepageNewsPortrait fl">
+                      <a href="javascript:void(0);"><%= image_tag(url_to_avatar(urm.memo.author), :width => "30", :height => "30") %></a>
+                    </li>
+                    <li class="homepageNewsPublisher fl">
+                      <a href="javascript:void(0);" class="newsBlue"><%= urm.memo.author %></a>
+                    </li>
+                    <li class="homepageNewsType fl" >回复了贴吧帖子</li>
+                    <li class="homepageNewsContent fl"><a href="javascript:void(0);" class="newsGrey">
+                      <%= link_to urm.memo.content, forum_memo_path(urm.memo.forum_id, urm.memo.parent_id ? urm.memo.parent_id: urm.memo.id),:class => "newsGrey" %></a>
+                    </li>
+                    <li class="homepageNewsTime fl"><%= time_tag(urm.memo.created_at).html_safe %> </li>
+                  </ul>
+              <% end %>
+          <% end %>
+      <% end %>
+      <%# 用户留言消息 %>
+      <% unless @user_feedback_messages.nil? %>
+          <% @user_feedback_messages.each do |ufm| %>
+              <% if ufm.journals_for_message_type == "Principal" %>
+                  <ul class="homepageNewsList fl">
+                    <li class="homepageNewsPortrait fl">
+                      <a href="javascript:void(0);"><%= image_tag(url_to_avatar(ufm.journals_for_message.user), :width => "30", :height => "30") %></a>
+                    </li>
+                    <li class="homepageNewsPublisher fl">
+                      <a href="javascript:void(0);" class="newsBlue"><%= ufm.journals_for_message.user %></a>
+                    </li>
+                    <% if ufm.journals_for_message.reply_id == 0 %>
 
-                              <li class="homepageNewsType fl">给你留言了</li>
-                              <li class="homepageNewsContent fl"><a href="javascript:void(0);" class="newsGrey">
-                                <%= link_to ufm.journals_for_message.notes, feedback_path(ufm.journals_for_message.jour_id), :class => "newsGrey" %></a>
-                              </li>
-                          <% else %>
-                              <li class="homepageNewsType fl">回复了你的留言</li>
-                              <li class="homepageNewsContent fl"><a href="javascript:void(0);" class="newsGrey">
-                                <%= link_to ufm.journals_for_message.notes, feedback_path(ufm.journals_for_message.parent.user_id),:class => "newsGrey" %></a>
-                              </li>
-                         <% end %>
-                          <li class="homepageNewsTime fl"><%= time_tag(ufm.journals_for_message.created_on).html_safe %> </li>
-                        </ul>
+                        <li class="homepageNewsType fl">给你留言了</li>
+                        <li class="homepageNewsContent fl"><a href="javascript:void(0);" class="newsGrey">
+                          <%= link_to ufm.journals_for_message.notes, feedback_path(ufm.journals_for_message.jour_id), :class => "newsGrey" %></a>
+                        </li>
+                    <% else %>
+                        <li class="homepageNewsType fl">回复了你的留言</li>
+                        <li class="homepageNewsContent fl"><a href="javascript:void(0);" class="newsGrey">
+                          <%= link_to ufm.journals_for_message.notes, feedback_path(ufm.journals_for_message.parent.user_id),:class => "newsGrey" %></a>
+                        </li>
                     <% end %>
-                <% end %>
-            <% end %>
-        <% else %>
-            <div class="flash notice">暂无消息！</div>
-        <% end %>
-      </div>
-    </div>
-  </div>
+                    <li class="homepageNewsTime fl"><%= time_tag(ufm.journals_for_message.created_on).html_safe %> </li>
+                  </ul>
+              <% end %>
+          <% end %>
+      <% end %>
+  <% else %>
+      <div class="flash notice">暂无消息！</div>
+  <% end %>
+</div>
+</div>
+</div>
 </div>