From d5a0133b0ba68f022d863e9939ce1226c2163f3d Mon Sep 17 00:00:00 2001
From: huang <huang.jingquan@163.com>
Date: Thu, 12 Jan 2017 16:19:11 +0800
Subject: [PATCH] =?UTF-8?q?=E4=B8=AA=E4=BA=BA=E4=B8=BB=E9=A1=B5=E9=83=A8?=
 =?UTF-8?q?=E5=88=86=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/controllers/users_controller.rb           |    2 +
 app/models/message_all.rb                     |    1 +
 app/views/layouts/_logined_header.html.erb    |    5 +-
 app/views/users/_new_user_message.html.erb    |   38 +-
 app/views/users/_user_at_message.html.erb     |   61 +-
 .../users/_user_message_applied.html.erb      |  102 +-
 .../users/_user_message_contest.html.erb      |    5 +-
 app/views/users/_user_message_course.html.erb | 1656 ++++++++---------
 app/views/users/_user_message_forge.html.erb  |  386 ++--
 app/views/users/_user_message_forum.html.erb  |    3 +-
 app/views/users/_user_message_org.html.erb    |   87 +-
 app/views/users/_user_message_system.html.erb |   38 +-
 .../_user_message_userfeedaback.html.erb      |   67 +-
 13 files changed, 1228 insertions(+), 1223 deletions(-)

diff --git a/app/controllers/users_controller.rb b/app/controllers/users_controller.rb
index 85879d5fb..9fa9e608f 100644
--- a/app/controllers/users_controller.rb
+++ b/app/controllers/users_controller.rb
@@ -1994,7 +1994,9 @@ end
       # 自己的主页显示消息
       # 系统消息为管理员发送，我的消息中包含有系统消息
       @message_alls = []
+      @system_messages
       messages = MessageAll.where("(user_id =? and message_type !=?) or message_type =?" , @user.id, "SystemMessage", "SystemMessage").includes(:message).order("created_at desc")
+
       messages.each do |message_all|
         mess = message_all.message
         unless (message_all.message_type == 'CourseMessage' && mess && mess.course && mess.course.is_delete == 1)
diff --git a/app/models/message_all.rb b/app/models/message_all.rb
index 6e0276875..836d24b9f 100644
--- a/app/models/message_all.rb
+++ b/app/models/message_all.rb
@@ -1,5 +1,6 @@
 class MessageAll < ActiveRecord::Base
   attr_accessible :message_id, :message_type, :user_id
+  belongs_to :user
   # 虚拟关联---项目消息表/课程消息表/用户留言消息表/贴吧消息表
   belongs_to :message ,:polymorphic => true
 end
diff --git a/app/views/layouts/_logined_header.html.erb b/app/views/layouts/_logined_header.html.erb
index 71c943867..503a569f5 100644
--- a/app/views/layouts/_logined_header.html.erb
+++ b/app/views/layouts/_logined_header.html.erb
@@ -99,8 +99,9 @@
 
   <div class="navHomepageNews" id="user_messages">
     <%= link_to "", user_message_path(User.current), :class => "homepageNewsIcon", :target => "_Blank", :title => "您的所有消息" %>
-    <% if User.current.count_new_message.to_i > 0 %>
-        <div ><%= link_to User.current.count_new_message , user_message_path(User.current), :class => "newsActive", :target => "_Blank" %></div>
+    <% new_message_count = User.current.count_new_message.to_i %>
+    <% if new_message_count > 0 %>
+        <div ><%= link_to new_message_count, user_message_path(User.current), :class => "newsActive", :target => "_Blank" %></div>
     <% end %>
     <%#= link_to User.current.count_new_message, user_message_path(User.current), :class => "homepageNewsIcon" %>
     <div class="shadowbox_news undis" id="user_messages_list">
diff --git a/app/views/users/_new_user_message.html.erb b/app/views/users/_new_user_message.html.erb
index a5c94df12..6b8bb9f03 100644
--- a/app/views/users/_new_user_message.html.erb
+++ b/app/views/users/_new_user_message.html.erb
@@ -1,28 +1,46 @@
 <% message_alls.each do |ma| %>
     <%# 系统消息 %>
-    <%= render :partial => 'users/user_message_system', :locals => {:ma => ma}  %>
+    <% if ma.class == SystemMessage && many_days_ago(ma.created_at, 30) %>
+        <%= render :partial => 'users/user_message_system', :locals => {:ma => ma}  %>
+    <% end %>
 
-    <%= render :partial => 'users/user_at_message', :locals => {:ma => ma}  %>
+    <% if ma.class == AtMessage && ma.at_valid? && ma.at_message %>
+        <%= render :partial => 'users/user_at_message', :locals => {:ma => ma}  %>
+    <% end %>
 
     <%# 课程消息 %>
-    <%= render :partial => 'users/user_message_course', :locals => {:ma => ma}  %>
+    <% if ma.class == CourseMessage %>
+        <%= render :partial => 'users/user_message_course', :locals => {:ma => ma}  %>
+    <% end %>
 
     <!--项目消息-->
-    <%= render :partial => 'users/user_message_forge', :locals => {:ma => ma}  %>
+    <% if ma.class == ForgeMessage %>
+        <%= render :partial => 'users/user_message_forge', :locals => {:ma => ma}  %>
+    <% end %>
 
     <%# 竞赛消息 %>
-    <%= render :partial => 'users/user_message_contest', :locals => {:ma => ma}  %>
+    <% if ma.class == ContestMessage %>
+        <%= render :partial => 'users/user_message_contest', :locals => {:ma => ma}  %>
+    <% end %>
 
     <!--公共贴吧-->
-    <%= render :partial => 'users/user_message_forum', :locals => {:ma => ma}  %>
+    <% if ma.class == MemoMessage %>
+        <%= render :partial => 'users/user_message_forum', :locals => {:ma => ma}  %>
+    <% end %>
 
     <!--用户留言-->
-    <%= render :partial => 'users/user_message_userfeedaback', :locals => {:ma => ma}  %>
-
-    <%= render :partial => 'users/user_message_org', :locals => {:ma => ma} %>
+    <% if ma.class == UserFeedbackMessage %>
+        <%= render :partial => 'users/user_message_userfeedaback', :locals => {:ma => ma}  %>
+    <% end %>
 
+    <% if ma.class == OrgMessage %>
+        <%= render :partial => 'users/user_message_org', :locals => {:ma => ma} %>
+    <% end %>
+    
     <%# 申请类消息 %>
-    <%= render :partial => 'users/user_message_applied', :locals => {:ma => ma} %>
+    <% if ma.class == AppliedMessage %>
+        <%= render :partial => 'users/user_message_applied', :locals => {:ma => ma} %>
+    <% end %>
 <% end %>
 
 <ul class="pages" style="width: auto;display: table;margin-left: auto;margin-right: auto; padding-top: 10px">
diff --git a/app/views/users/_user_at_message.html.erb b/app/views/users/_user_at_message.html.erb
index 912526b1e..61e8ee1d3 100644
--- a/app/views/users/_user_at_message.html.erb
+++ b/app/views/users/_user_at_message.html.erb
@@ -1,34 +1,33 @@
-<% if ma.class == AtMessage && ma.at_valid? && ma.at_message %>
-    <ul class="homepageNewsList fl">
-      <div class="longMessageWidth">
-        <li class="homepageNewsPortrait fl">
-          <%= link_to image_tag(url_to_avatar(ma.author), :width => "30", :height => "30"), user_path(ma.author) %>
-        </li>
-        <li class="homepageNewsPubType fl">
+
+<ul class="homepageNewsList fl">
+  <div class="longMessageWidth">
+    <li class="homepageNewsPortrait fl">
+      <%= link_to image_tag(url_to_avatar(ma.author), :width => "30", :height => "30"), user_path(ma.author) %>
+    </li>
+    <li class="homepageNewsPubType fl">
             <span class="newsBlue homepageNewsPublisher">
               <%= link_to  ma.author.show_name,  user_path(ma.author), :class => "newsBlue homepageNewsPublisher", :target => '_blank' %>
             </span><span class="homepageNewsType fl">提到了你：</span>
-        </li>
-        <li class="messageInformationContents">
-          <% if ma.at_message_type == "Message" && !ma.at_message.course.nil? %>
-              <%= link_to ma.subject.html_safe, course_boards_path(ma.at_message.course,
-                                                                   :parent_id => ma.at_message.parent_id ? ma.at_message.parent_id : ma.at_message.id,
-                                                                   :topic_id => ma.at_message.id),
-                          :title => "#{ma.subject.html_safe}",
-                          :class =>"#{ma.viewed? ? "newsGrey" : "newsBlack"}" %>
-          <% elsif ma.at_message_type == "Message" && !ma.at_message.project.nil? %>
-              <%= link_to ma.subject.html_safe, project_boards_path(ma.at_message.project,
-                                                                    :parent_id => ma.at_message.parent_id ? ma.at_message.parent_id : ma.at_message.id,
-                                                                    :topic_id => ma.at_message.id),
-                          :title => "#{ma.subject.html_safe}",
-                          :class =>"#{ma.viewed? ? "newsGrey" : "newsBlack"}" %>
-          <% else %>
-              <%= link_to ma.subject.html_safe, ma.url,
-                          :class =>"#{ma.viewed? ? "newsGrey" : "newsBlack"}",
-                          :title => "#{ma.subject.html_safe}" %>
-          <% end %>
-        </li>
-      </div>
-      <li class="homepageNewsTime fr"><%= time_tag(ma.created_at).html_safe %> </li>
-    </ul>
-<% end %>
\ No newline at end of file
+    </li>
+    <li class="messageInformationContents">
+      <% if ma.at_message_type == "Message" && !ma.at_message.course.nil? %>
+          <%= link_to ma.subject.html_safe, course_boards_path(ma.at_message.course,
+                                                               :parent_id => ma.at_message.parent_id ? ma.at_message.parent_id : ma.at_message.id,
+                                                               :topic_id => ma.at_message.id),
+                      :title => "#{ma.subject.html_safe}",
+                      :class =>"#{ma.viewed? ? "newsGrey" : "newsBlack"}" %>
+      <% elsif ma.at_message_type == "Message" && !ma.at_message.project.nil? %>
+          <%= link_to ma.subject.html_safe, project_boards_path(ma.at_message.project,
+                                                                :parent_id => ma.at_message.parent_id ? ma.at_message.parent_id : ma.at_message.id,
+                                                                :topic_id => ma.at_message.id),
+                      :title => "#{ma.subject.html_safe}",
+                      :class =>"#{ma.viewed? ? "newsGrey" : "newsBlack"}" %>
+      <% else %>
+          <%= link_to ma.subject.html_safe, ma.url,
+                      :class =>"#{ma.viewed? ? "newsGrey" : "newsBlack"}",
+                      :title => "#{ma.subject.html_safe}" %>
+      <% end %>
+    </li>
+  </div>
+  <li class="homepageNewsTime fr"><%= time_tag(ma.created_at).html_safe %> </li>
+</ul>
diff --git a/app/views/users/_user_message_applied.html.erb b/app/views/users/_user_message_applied.html.erb
index 5450a33d1..edfa43692 100644
--- a/app/views/users/_user_message_applied.html.erb
+++ b/app/views/users/_user_message_applied.html.erb
@@ -1,54 +1,52 @@
-<% if ma.class == AppliedMessage %>
-    <!-- 申请添加单位 -->
-    <% if ma.applied_type == "ApplyAddSchools" %>
-        <ul class="homepageNewsList fl">
-          <div class="longMessageWidth">
-            <li class="homepageNewsPortrait fl">
-              <% if ma.status == 0 %>
-                  <% applied_user = User.find(ma.applied_user_id) %>
-                  <%= link_to image_tag(url_to_avatar(applied_user), :width => "30", :height => "30"), user_path(applied_user), :target => '_blank' %>
-              <% else %>
-                  <%= image_tag("/images/trustie_logo1.png", width: "30px", height: "30px", class: "mt3") %>
-              <% end %>
-            </li>
-            <li class="homepageNewsPubType fl">
-              <%= render :partial => "users/user_message_applied_schools", :locals =>{:ma => ma} %>
-            </li>
-            <li class = "messageInformationContents">
-              <%= render :partial => "users/user_message_applied_school_action", :locals =>{:ma => ma} %>
-            </li>
+<!-- 申请添加单位 -->
+<% if ma.applied_type == "ApplyAddSchools" %>
+    <ul class="homepageNewsList fl">
+      <div class="longMessageWidth">
+        <li class="homepageNewsPortrait fl">
+          <% if ma.status == 0 %>
+              <% applied_user = User.find(ma.applied_user_id) %>
+              <%= link_to image_tag(url_to_avatar(applied_user), :width => "30", :height => "30"), user_path(applied_user), :target => '_blank' %>
+          <% else %>
+              <%= image_tag("/images/trustie_logo1.png", width: "30px", height: "30px", class: "mt3") %>
+          <% end %>
+        </li>
+        <li class="homepageNewsPubType fl">
+          <%= render :partial => "users/user_message_applied_schools", :locals =>{:ma => ma} %>
+        </li>
+        <li class = "messageInformationContents">
+          <%= render :partial => "users/user_message_applied_school_action", :locals =>{:ma => ma} %>
+        </li>
 
-          </div>
-          <li class="homepageNewsTime fr"><%= time_tag(ma.created_at).html_safe %> </li>
-        </ul>
-        <!-- 申请加入项目 -->
-    <% elsif ma && ma.applied_type == "AppliedProject" %>
-        <ul class="homepageNewsList fl" id="applied_project_<%= ma.id %>">
-          <%= render :partial => "users/applied_project_content", :locals =>{:ma => ma} %>
-        </ul>
+      </div>
+      <li class="homepageNewsTime fr"><%= time_tag(ma.created_at).html_safe %> </li>
+    </ul>
+    <!-- 申请加入项目 -->
+<% elsif ma && ma.applied_type == "AppliedProject" %>
+    <ul class="homepageNewsList fl" id="applied_project_<%= ma.id %>">
+      <%= render :partial => "users/applied_project_content", :locals =>{:ma => ma} %>
+    </ul>
     <!-- 匿评成绩申诉 -->
-    <% elsif ma && ma.applied_type == "StudentWorksScoresAppeal" %>
-        <ul class="homepageNewsList fl">
-          <div class="longMessageWidth">
-            <% applied_user = User.find(ma.applied_user_id) %>
-          <li class="homepageNewsPortrait fl">
-            <%= link_to image_tag(url_to_avatar(applied_user), :width => "30", :height => "30"), user_path(applied_user), :target => '_blank' %>
-          </li>
-          <li class="homepageNewsPubType fl">
-            <%=link_to applied_user.show_name, user_path(applied_user), :class => "newsBlue homepageNewsPublisher", :target => '_blank' %>
-            <span class="<%= ma.viewed == 0 ? "homepageNewsTypeNotRead fl" : "homepageNewsType fl" %>">申诉匿评成绩：</span>
-          </li>
-          <li class="messageInformationContents fl">
-            <% homework = ma.applied.student_works_score.student_work.homework_common %>
-            <%= link_to homework.name, student_work_index_path(:homework => homework.id, :show_work_id => ma.applied.student_works_score.student_work_id, :tab => 2), :class => "#{ma.viewed == 0 ? "newsBlack" : "newsGrey"}", :target => '_blank' %>
-          </li>
-          </div>
-          <li class="homepageNewsTime fr"><%= time_tag(ma.created_at).html_safe %>
-          </li>
-        </ul>
-    <% elsif ma && ma.applied_type == "AppliedContest" %>
-        <ul class="homepageNewsList fl" id="contest_message_join_<%=ma.id %>">
-          <%= render :partial => 'join_contest_applied_message', :locals => {:ma => ma} %>
-        </ul>
-    <% end %>
-<% end %>
\ No newline at end of file
+<% elsif ma && ma.applied_type == "StudentWorksScoresAppeal" %>
+    <ul class="homepageNewsList fl">
+      <div class="longMessageWidth">
+        <% applied_user = User.find(ma.applied_user_id) %>
+        <li class="homepageNewsPortrait fl">
+          <%= link_to image_tag(url_to_avatar(applied_user), :width => "30", :height => "30"), user_path(applied_user), :target => '_blank' %>
+        </li>
+        <li class="homepageNewsPubType fl">
+          <%=link_to applied_user.show_name, user_path(applied_user), :class => "newsBlue homepageNewsPublisher", :target => '_blank' %>
+          <span class="<%= ma.viewed == 0 ? "homepageNewsTypeNotRead fl" : "homepageNewsType fl" %>">申诉匿评成绩：</span>
+        </li>
+        <li class="messageInformationContents fl">
+          <% homework = ma.applied.student_works_score.student_work.homework_common %>
+          <%= link_to homework.name, student_work_index_path(:homework => homework.id, :show_work_id => ma.applied.student_works_score.student_work_id, :tab => 2), :class => "#{ma.viewed == 0 ? "newsBlack" : "newsGrey"}", :target => '_blank' %>
+        </li>
+      </div>
+      <li class="homepageNewsTime fr"><%= time_tag(ma.created_at).html_safe %>
+      </li>
+    </ul>
+<% elsif ma && ma.applied_type == "AppliedContest" %>
+    <ul class="homepageNewsList fl" id="contest_message_join_<%=ma.id %>">
+      <%= render :partial => 'join_contest_applied_message', :locals => {:ma => ma} %>
+    </ul>
+<% end %>
diff --git a/app/views/users/_user_message_contest.html.erb b/app/views/users/_user_message_contest.html.erb
index 9cb1e3fe1..0d93fb38a 100644
--- a/app/views/users/_user_message_contest.html.erb
+++ b/app/views/users/_user_message_contest.html.erb
@@ -1,4 +1,4 @@
-<% if ma.class == ContestMessage %>
+
   <% if ma.contest_message_type == "ContestRequestDealResult" %>
     <ul class="homepageNewsList fl">
       <div class="longMessageWidth">
@@ -297,5 +297,4 @@
           </div>
           <li class="homepageNewsTime fr"><%= time_tag(ma.created_at).html_safe %> </li>
         </ul>
-    <% end %>
-<% end %>
\ No newline at end of file
+    <% end %>
\ No newline at end of file
diff --git a/app/views/users/_user_message_course.html.erb b/app/views/users/_user_message_course.html.erb
index 845a2feb5..5d90c461c 100644
--- a/app/views/users/_user_message_course.html.erb
+++ b/app/views/users/_user_message_course.html.erb
@@ -1,480 +1,456 @@
-<% if ma.class == CourseMessage %>
-    <% if ma.course_message_type == "News" && ma.course_message %>
-        <ul class="homepageNewsList fl">
-          <div class="longMessageWidth">
-            <li class="homepageNewsPortrait fl">
-              <%=link_to image_tag(url_to_avatar(ma.course_message.author), :width => "30", :height => "30"),user_path(ma.course_message.author), :target => '_blank' %>
-            </li>
-            <li class="homepageNewsPubType fl">
-              <%=link_to ma.course_message.author.try(:show_name), user_path(ma.course_message.author), :class => "newsBlue homepageNewsPublisher", :target => '_blank' %>
-              <span class="homepageNewsType fl">发布了通知：</span>
-            </li>
-            <li class="messageInformationContents">
-              <%= link_to ma.course_message.title, {:controller => 'news', :action => 'show', :id => ma.course_message.id },
+<% if ma.course_message_type == "News" && ma.course_message %>
+    <ul class="homepageNewsList fl">
+      <div class="longMessageWidth">
+        <li class="homepageNewsPortrait fl">
+          <%=link_to image_tag(url_to_avatar(ma.course_message.author), :width => "30", :height => "30"),user_path(ma.course_message.author), :target => '_blank' %>
+        </li>
+        <li class="homepageNewsPubType fl">
+          <%=link_to ma.course_message.author.try(:show_name), user_path(ma.course_message.author), :class => "newsBlue homepageNewsPublisher", :target => '_blank' %>
+          <span class="homepageNewsType fl">发布了通知：</span>
+        </li>
+        <li class="messageInformationContents">
+          <%= link_to ma.course_message.title, {:controller => 'news', :action => 'show', :id => ma.course_message.id },
+                      :class =>"#{ma.viewed == 0 ? "newsBlack" : "newsGrey"}",
+                      :target => '_blank',
+                      :title => "#{ma.course_message.title}"
+          %>
+        </li>
+      </div>
+      <div  style="display: none" class="message_title_red system_message_style">
+        <p><strong>标题：</strong><%= ma.course_message.title %></p>
+        <% unless ma.course_message.description.nil? %>
+            <div class="fl"><strong>内容：</strong></div>
+            <div class="ml36"><%= ma.course_message.description.html_safe %></div>
+        <% end %>
+      </div>
+      <li class="homepageNewsTime fr"><%= time_tag(ma.created_at).html_safe %> </li>
+    </ul>
+<% end %>
+
+<% if ma.course_message_type == "Comment" && ma.course_message %>
+    <ul class="homepageNewsList fl">
+      <div class="longMessageWidth">
+        <li class="homepageNewsPortrait fl">
+          <%=link_to image_tag(url_to_avatar(ma.course_message.author), :width => "30", :height => "30"), user_path(ma.course_message.author), :target => '_blank' %>
+        </li>
+        <li class="homepageNewsPubType fl">
+          <%=link_to User.find(ma.course_message.author_id).show_name, user_path(ma.course_message.author), :class => "newsBlue homepageNewsPublisher", :target => '_blank' %>
+          <span class="homepageNewsType fl">评论了通知：</span>
+        </li>
+        <li class="messageInformationContents">
+          <%= link_to  ma.course_message.commented.title, {:controller => 'news', :action => 'show', :id => ma.course_message.commented.id },
+                       :class =>"#{ma.viewed == 0 ? "newsBlack" : "newsGrey"}" ,
+                       :target => '_blank',
+                       :title => "#{ma.course_message.commented.title}"
+          %>
+        </li>
+      </div>
+      <div  style="display: none" class="message_title_red system_message_style">
+        <p><strong>评论对象：</strong><%= ma.course_message.commented.title %></p>
+        <% unless ma.course_message.comments.nil? %>
+            <div class="fl"><strong>评论内容：</strong></div>
+            <div class="ml60"><%= ma.course_message.comments.html_safe %></div>
+        <% end %>
+      </div>
+      <li class="homepageNewsTime fr"><%= time_tag(ma.created_at).html_safe %> </li>
+    </ul>
+<% end %>
+<% if ma.course_message_type == "HomeworkCommon" && ma.status.nil? && ma.course_message %>
+    <ul class="homepageNewsList fl">
+      <div class="longMessageWidth">
+        <li class="homepageNewsPortrait fl">
+          <%=link_to image_tag(url_to_avatar(ma.course_message.user), :width => "30", :height => "30"), user_path(ma.course_message.user), :target => '_blank' %>
+        </li>
+        <li class="homepageNewsPubType fl">
+          <%=link_to ma.course_message.user.lastname + ma.course_message.user.firstname + "老师", user_path(ma.course_message.user), :class => "newsBlue homepageNewsPublisher", :target => '_blank' %>
+          <span class="homepageNewsType fl">发布了班级作业：</span>
+        </li>
+        <li class="messageInformationContents">
+          <% if !User.current.allowed_to?(:as_teacher, ma.course_message.course) && cur_user_works_for_homework(ma.course_message).nil? %>
+              <%= link_to "作业标题：" + ma.course_message.name, new_student_work_path(:homework => ma.course_message.id),
                           :class =>"#{ma.viewed == 0 ? "newsBlack" : "newsGrey"}",
                           :target => '_blank',
-                          :title => "#{ma.course_message.title}"
+                          :title => "作业标题：#{ma.course_message.name}"
               %>
-            </li>
-          </div>
-          <div  style="display: none" class="message_title_red system_message_style">
-            <p><strong>标题：</strong><%= ma.course_message.title %></p>
-            <% unless ma.course_message.description.nil? %>
-                <div class="fl"><strong>内容：</strong></div>
-                <div class="ml36"><%= ma.course_message.description.html_safe %></div>
-            <% end %>
-          </div>
-          <li class="homepageNewsTime fr"><%= time_tag(ma.created_at).html_safe %> </li>
-        </ul>
-    <% end %>
-
-    <% if ma.course_message_type == "Comment" && ma.course_message %>
-        <ul class="homepageNewsList fl">
-          <div class="longMessageWidth">
-            <li class="homepageNewsPortrait fl">
-              <%=link_to image_tag(url_to_avatar(ma.course_message.author), :width => "30", :height => "30"), user_path(ma.course_message.author), :target => '_blank' %>
-            </li>
-            <li class="homepageNewsPubType fl">
-              <%=link_to User.find(ma.course_message.author_id).show_name, user_path(ma.course_message.author), :class => "newsBlue homepageNewsPublisher", :target => '_blank' %>
-              <span class="homepageNewsType fl">评论了通知：</span>
-            </li>
-            <li class="messageInformationContents">
-              <%= link_to  ma.course_message.commented.title, {:controller => 'news', :action => 'show', :id => ma.course_message.commented.id },
-                           :class =>"#{ma.viewed == 0 ? "newsBlack" : "newsGrey"}" ,
-                           :target => '_blank',
-                           :title => "#{ma.course_message.commented.title}"
-              %>
-            </li>
-          </div>
-          <div  style="display: none" class="message_title_red system_message_style">
-            <p><strong>评论对象：</strong><%= ma.course_message.commented.title %></p>
-            <% unless ma.course_message.comments.nil? %>
-                <div class="fl"><strong>评论内容：</strong></div>
-                <div class="ml60"><%= ma.course_message.comments.html_safe %></div>
-            <% end %>
-          </div>
-          <li class="homepageNewsTime fr"><%= time_tag(ma.created_at).html_safe %> </li>
-        </ul>
-    <% end %>
-    <% if ma.course_message_type == "HomeworkCommon" && ma.status.nil? && ma.course_message %>
-        <ul class="homepageNewsList fl">
-          <div class="longMessageWidth">
-            <li class="homepageNewsPortrait fl">
-              <%=link_to image_tag(url_to_avatar(ma.course_message.user), :width => "30", :height => "30"), user_path(ma.course_message.user), :target => '_blank' %>
-            </li>
-            <li class="homepageNewsPubType fl">
-              <%=link_to ma.course_message.user.lastname + ma.course_message.user.firstname + "老师", user_path(ma.course_message.user), :class => "newsBlue homepageNewsPublisher", :target => '_blank' %>
-              <span class="homepageNewsType fl">发布了班级作业：</span>
-            </li>
-            <li class="messageInformationContents">
-              <% if !User.current.allowed_to?(:as_teacher, ma.course_message.course) && cur_user_works_for_homework(ma.course_message).nil? %>
-                  <%= link_to "作业标题：" + ma.course_message.name, new_student_work_path(:homework => ma.course_message.id),
-                              :class =>"#{ma.viewed == 0 ? "newsBlack" : "newsGrey"}",
-                              :target => '_blank',
-                              :title => "作业标题：#{ma.course_message.name}"
-                  %>
-                  <!--:onmouseover =>"message_titile_show($(this),event)",-->
-                  <!--:onmouseout => "message_titile_hide($(this))" %>-->
-              <% else %>
-                  <%= link_to "作业标题：" + ma.course_message.name, student_work_index_path(:homework => ma.course_message.id),
-                              :class => "#{ma.viewed == 0 ? "newsBlack" : "newsGrey"}",
-                              :target => '_blank',
-                              :title => "作业标题：#{ma.course_message.name}"
-                  %>
-                  <!--:onmouseover => "message_titile_show($(this),event)",-->
-                  <!--:onmouseout => "message_titile_hide($(this))" %>-->
-              <% end %>
-            </li>
-          </div>
-          <div  style="display: none" class="message_title_red system_message_style">
-            <% if User.current.allowed_to?(:as_teacher,ma.course_message.course) %>
-                <p>
-                  <%= User.current.lastname + User.current.firstname %>老师您好！
-                  <%= User.current.eql?(ma.course_message.user)?"您":(ma.course_message.user.show_name + "老师")%>刚刚发布了一个作业：
-                </p>
-                <ul class="ul_normal_color">
-                  <li>班级名称：<%= ma.course_message.course.name %>
-                    (<%= ma.course_message.course.time.to_s + '年'+ ma.course_message.course.term %>)</li>
-                  <li>作业标题：<span style="color:Red"><%= ma.course_message.name %></span></li>
-                  <li>发布时间：<span style="color:Red;"><%= DateTime.parse(ma.course_message.created_at.to_s).strftime('%Y-%m-%d %H:%M').to_s %></span></li>
-                  <li>提交截止：<span style="color:Red;"><%= ma.course_message.end_time %>&nbsp;23:59</span></li>
-                  <li>匿评开始：<span style="color:Red;"><%= ma.course_message.homework_detail_manual.evaluation_start %>&nbsp;23:59</span></li>
-                  <li>匿评关闭：<span style="color:Red;"><%= ma.course_message.homework_detail_manual.evaluation_end %>&nbsp;23:59</span></li>
-                  <li>迟交扣分：<span style="color:Red;"><%= ma.course_message.late_penalty %>分</span></li>
-                  <li>缺评扣分：<span style="color:Red;"><%= ma.course_message.homework_detail_manual.absence_penalty %>分</span></li>
-                </ul>
-                <p>
-                  您可以修改作业内容、评分规则、匿评过程等，谢谢！
-                </p>
-            <% else %>
-                <p><%= User.current.lastname + User.current.firstname %>同学您好！<%= ma.course_message.user.lastname + ma.course_message.user.firstname %>老师刚刚发布了一个作业：</p>
-                <ul class="ul_normal_color">
-                  <li>班级名称：<%= ma.course_message.course.name %>
-                    (<%= ma.course_message.course.time.to_s + '年'+ ma.course_message.course.term %>)</li>
-                  <li>作业标题：<span style="color:Red;"><%= ma.course_message.name %></span></li>
-                  <li>提交截止：<span style="color:Red;"><%= ma.course_message.end_time %>&nbsp;&nbsp;23:59</span></li>
-                  <li>匿评开始：<span style="color:Red;"><%= ma.course_message.homework_detail_manual.evaluation_start %>&nbsp;&nbsp;23:59</span></li>
-                  <li>匿评关闭：<span style="color:Red;"><%= ma.course_message.homework_detail_manual.evaluation_end %>&nbsp;&nbsp;23:59</span></li>
-                  <li>迟交扣分：<span style="color:Red;"><%= ma.course_message.late_penalty %>分</span></li>
-                  <li>缺评扣分：<span style="color:Red;"><%= ma.course_message.homework_detail_manual.absence_penalty %>分</span></li>
-                </ul>
-                <p>
-                  请抓紧时间提交您的作品，谢谢！
-                </p>
-            <% end %>
-          </div>
-          <li class="homepageNewsTime fr"><%= time_tag(ma.created_at).html_safe %> </li>
-        </ul>
-    <% end %>
-    <% if ma.course_message_type == "HomeworkCommon" && ma.status == 1 && ma.course_message %>
-        <ul class="homepageNewsList fl">
-          <div class="shortMessageWidth">
-            <li class="homepageNewsPortrait fl">
-              <%=link_to image_tag(url_to_avatar(ma.course_message.user), :width => "30", :height => "30"), user_path(ma.course_message.user), :target => '_blank' %>
-            </li>
-            <li class="homepageNewsPubType fl">
-              <%=link_to ma.course_message.user.lastname + ma.course_message.user.firstname + '老师',
-                         user_path(ma.course_message.user),
-                         :class => "newsBlue homepageNewsPublisher",
-                         :title => "#{ma.course_message.user.lastname + ma.course_message.user.firstname}老师",
-                         :target => '_blank' %>
-              <span class="homepageNewsType fl">发布的作业：</span></li>
-            <li class="messageInformationContents">
+              <!--:onmouseover =>"message_titile_show($(this),event)",-->
+              <!--:onmouseout => "message_titile_hide($(this))" %>-->
+          <% else %>
               <%= link_to "作业标题：" + ma.course_message.name, student_work_index_path(:homework => ma.course_message.id),
                           :class => "#{ma.viewed == 0 ? "newsBlack" : "newsGrey"}",
                           :target => '_blank',
                           :title => "作业标题：#{ma.course_message.name}"
               %>
-            </li>
-          </div>
-          <div style="display: none" class="message_title_red system_message_style">
-            <% if !User.current.allowed_to?(:as_teacher,ma.course_message.course) %>
-                <p>
-                  <%= User.current.lastname + User.current.firstname %>同学您好！
-                  <%= ma.course_message.user.lastname + ma.course_message.user.firstname %>老师发布的作业截止日期快到了：
-                </p>
-                <ul class="ul_normal_color">
-                  <li>班级名称：<%= ma.course_message.course.name %>(<%= ma.course_message.course.time.to_s + '年'+ ma.course_message.course.term %>)</li>
-                  <li>作业标题：<span style="color:Red;"><%= ma.course_message.name %></span></li>
-                  <li>提交截止：<span style="color:Red;"><%= ma.course_message.end_time %>&nbsp;&nbsp;23:59</span></li>
-                  <li>匿评开始：<span style="color:Red;"><%= ma.course_message.homework_detail_manual.evaluation_start %>&nbsp;&nbsp;23:59</span></li>
-                  <li>匿评关闭：<span style="color:Red;"><%= ma.course_message.homework_detail_manual.evaluation_end %>&nbsp;&nbsp;23:59</span></li>
-                  <li>迟交扣分：<span style="color:Red;"><%= ma.course_message.late_penalty %>分</span></li>
-                  <li>缺评扣分：<span style="color:Red;"><%= ma.course_message.homework_detail_manual.absence_penalty %>分</span></li>
-                  <p>请抓紧时间提交您的作品，谢谢！</p>
-                </ul>
-            <% end %>
-          </div>
-          <li class="messageOperateContents fl" title="截止时间快到啦">截止时间快到啦</li>
-          <li class="homepageNewsTime fr"><%= time_tag(ma.created_at).html_safe %> </li>
-        </ul>
-    <% end %>
-    <!--作品开启匿评 待整合：时间紧-->
-    <% if ma.course_message_type == "HomeworkCommon" && ma.status == 2 && ma.course_message %>
-        <ul class="homepageNewsList fl">
-          <div class="longMessageWidth">
-            <li class="homepageNewsPortrait fl">
-              <%= link_to image_tag(url_to_avatar(ma.course_message.user), :width => "30", :height => "30"), user_path(ma.course_message.user), :target => '_blank' %>
-            </li>
-            <li class="homepageNewsPubType fl">
-              <%= link_to ma.course_message.user.show_name + "老师",
-                          user_path(ma.course_message.user), :class => "newsBlue homepageNewsPublisher", :target => '_blank' %>
-              <span class="homepageNewsType fl">启动了作业匿评：</span>
-            </li>
-            <li class="messageInformationContents">
-              <%= link_to "作业标题：" + ma.course_message.name, student_work_index_path(:homework => ma.course_message.id), :class => "#{ma.viewed == 0 ? "newsBlack" : "newsGrey"}",
-                          :onmouseover => "message_titile_show($(this),event)",
-                          :onmouseout => "message_titile_hide($(this))", :target => '_blank' %>
-            </li>
-          </div>
-          <div style="display: none" class="message_title_red system_message_style">
+              <!--:onmouseover => "message_titile_show($(this),event)",-->
+              <!--:onmouseout => "message_titile_hide($(this))" %>-->
+          <% end %>
+        </li>
+      </div>
+      <div  style="display: none" class="message_title_red system_message_style">
+        <% if User.current.allowed_to?(:as_teacher,ma.course_message.course) %>
             <p>
-              <%= User.current.lastname + User.current.firstname %><%= User.current.allowed_to?(:as_teacher,ma.course_message.course) ? '老师' : '同学' %>您好！
-              <%= User.current.eql?(ma.course_message.user)?"您":(ma.course_message.user.lastname + ma.course_message.user.firstname+"老师") %>开启了匿评，作业详情如下：
+              <%= User.current.lastname + User.current.firstname %>老师您好！
+              <%= User.current.eql?(ma.course_message.user)?"您":(ma.course_message.user.show_name + "老师")%>刚刚发布了一个作业：
+            </p>
+            <ul class="ul_normal_color">
+              <li>班级名称：<%= ma.course_message.course.name %>
+                (<%= ma.course_message.course.time.to_s + '年'+ ma.course_message.course.term %>)</li>
+              <li>作业标题：<span style="color:Red"><%= ma.course_message.name %></span></li>
+              <li>发布时间：<span style="color:Red;"><%= DateTime.parse(ma.course_message.created_at.to_s).strftime('%Y-%m-%d %H:%M').to_s %></span></li>
+              <li>提交截止：<span style="color:Red;"><%= ma.course_message.end_time %>&nbsp;23:59</span></li>
+              <li>匿评开始：<span style="color:Red;"><%= ma.course_message.homework_detail_manual.evaluation_start %>&nbsp;23:59</span></li>
+              <li>匿评关闭：<span style="color:Red;"><%= ma.course_message.homework_detail_manual.evaluation_end %>&nbsp;23:59</span></li>
+              <li>迟交扣分：<span style="color:Red;"><%= ma.course_message.late_penalty %>分</span></li>
+              <li>缺评扣分：<span style="color:Red;"><%= ma.course_message.homework_detail_manual.absence_penalty %>分</span></li>
+            </ul>
+            <p>
+              您可以修改作业内容、评分规则、匿评过程等，谢谢！
+            </p>
+        <% else %>
+            <p><%= User.current.lastname + User.current.firstname %>同学您好！<%= ma.course_message.user.lastname + ma.course_message.user.firstname %>老师刚刚发布了一个作业：</p>
+            <ul class="ul_normal_color">
+              <li>班级名称：<%= ma.course_message.course.name %>
+                (<%= ma.course_message.course.time.to_s + '年'+ ma.course_message.course.term %>)</li>
+              <li>作业标题：<span style="color:Red;"><%= ma.course_message.name %></span></li>
+              <li>提交截止：<span style="color:Red;"><%= ma.course_message.end_time %>&nbsp;&nbsp;23:59</span></li>
+              <li>匿评开始：<span style="color:Red;"><%= ma.course_message.homework_detail_manual.evaluation_start %>&nbsp;&nbsp;23:59</span></li>
+              <li>匿评关闭：<span style="color:Red;"><%= ma.course_message.homework_detail_manual.evaluation_end %>&nbsp;&nbsp;23:59</span></li>
+              <li>迟交扣分：<span style="color:Red;"><%= ma.course_message.late_penalty %>分</span></li>
+              <li>缺评扣分：<span style="color:Red;"><%= ma.course_message.homework_detail_manual.absence_penalty %>分</span></li>
+            </ul>
+            <p>
+              请抓紧时间提交您的作品，谢谢！
+            </p>
+        <% end %>
+      </div>
+      <li class="homepageNewsTime fr"><%= time_tag(ma.created_at).html_safe %> </li>
+    </ul>
+<% end %>
+<% if ma.course_message_type == "HomeworkCommon" && ma.status == 1 && ma.course_message %>
+    <ul class="homepageNewsList fl">
+      <div class="shortMessageWidth">
+        <li class="homepageNewsPortrait fl">
+          <%=link_to image_tag(url_to_avatar(ma.course_message.user), :width => "30", :height => "30"), user_path(ma.course_message.user), :target => '_blank' %>
+        </li>
+        <li class="homepageNewsPubType fl">
+          <%=link_to ma.course_message.user.lastname + ma.course_message.user.firstname + '老师',
+                     user_path(ma.course_message.user),
+                     :class => "newsBlue homepageNewsPublisher",
+                     :title => "#{ma.course_message.user.lastname + ma.course_message.user.firstname}老师",
+                     :target => '_blank' %>
+          <span class="homepageNewsType fl">发布的作业：</span></li>
+        <li class="messageInformationContents">
+          <%= link_to "作业标题：" + ma.course_message.name, student_work_index_path(:homework => ma.course_message.id),
+                      :class => "#{ma.viewed == 0 ? "newsBlack" : "newsGrey"}",
+                      :target => '_blank',
+                      :title => "作业标题：#{ma.course_message.name}"
+          %>
+        </li>
+      </div>
+      <div style="display: none" class="message_title_red system_message_style">
+        <% if !User.current.allowed_to?(:as_teacher,ma.course_message.course) %>
+            <p>
+              <%= User.current.lastname + User.current.firstname %>同学您好！
+              <%= ma.course_message.user.lastname + ma.course_message.user.firstname %>老师发布的作业截止日期快到了：
             </p>
             <ul class="ul_normal_color">
               <li>班级名称：<%= ma.course_message.course.name %>(<%= ma.course_message.course.time.to_s + '年'+ ma.course_message.course.term %>)</li>
               <li>作业标题：<span style="color:Red;"><%= ma.course_message.name %></span></li>
+              <li>提交截止：<span style="color:Red;"><%= ma.course_message.end_time %>&nbsp;&nbsp;23:59</span></li>
+              <li>匿评开始：<span style="color:Red;"><%= ma.course_message.homework_detail_manual.evaluation_start %>&nbsp;&nbsp;23:59</span></li>
+              <li>匿评关闭：<span style="color:Red;"><%= ma.course_message.homework_detail_manual.evaluation_end %>&nbsp;&nbsp;23:59</span></li>
+              <li>迟交扣分：<span style="color:Red;"><%= ma.course_message.late_penalty %>分</span></li>
               <li>缺评扣分：<span style="color:Red;"><%= ma.course_message.homework_detail_manual.absence_penalty %>分</span></li>
-              <li>匿评截止：<span style="color:Red;"><%= ma.course_message.homework_detail_manual.evaluation_end %>&nbsp;&nbsp;23:59</span></li>
+              <p>请抓紧时间提交您的作品，谢谢！</p>
             </ul>
-            <% unless User.current.allowed_to?(:as_teacher, ma.course_message.course)%>
-                <p>请您尽早完成匿评，如果您在截止日期前未完成匿评，您的最终成绩将被扣除<%= ma.course_message.homework_detail_manual.absence_penalty %>分乘以缺评份数。</p>
-                <p>例如，您缺评了两份作品，则您的最终成绩将被扣除 <%= ma.course_message.homework_detail_manual.absence_penalty %> * 2 = <%= ma.course_message.homework_detail_manual.absence_penalty * 2 %>分</p>
-            <% end%>
-          </div>
-          <li class="homepageNewsTime fr"><%= time_tag(ma.created_at).html_safe %> </li>
+        <% end %>
+      </div>
+      <li class="messageOperateContents fl" title="截止时间快到啦">截止时间快到啦</li>
+      <li class="homepageNewsTime fr"><%= time_tag(ma.created_at).html_safe %> </li>
+    </ul>
+<% end %>
+<!--作品开启匿评 待整合：时间紧-->
+<% if ma.course_message_type == "HomeworkCommon" && ma.status == 2 && ma.course_message %>
+    <ul class="homepageNewsList fl">
+      <div class="longMessageWidth">
+        <li class="homepageNewsPortrait fl">
+          <%= link_to image_tag(url_to_avatar(ma.course_message.user), :width => "30", :height => "30"), user_path(ma.course_message.user), :target => '_blank' %>
+        </li>
+        <li class="homepageNewsPubType fl">
+          <%= link_to ma.course_message.user.show_name + "老师",
+                      user_path(ma.course_message.user), :class => "newsBlue homepageNewsPublisher", :target => '_blank' %>
+          <span class="homepageNewsType fl">启动了作业匿评：</span>
+        </li>
+        <li class="messageInformationContents">
+          <%= link_to "作业标题：" + ma.course_message.name, student_work_index_path(:homework => ma.course_message.id), :class => "#{ma.viewed == 0 ? "newsBlack" : "newsGrey"}",
+                      :onmouseover => "message_titile_show($(this),event)",
+                      :onmouseout => "message_titile_hide($(this))", :target => '_blank' %>
+        </li>
+      </div>
+      <div style="display: none" class="message_title_red system_message_style">
+        <p>
+          <%= User.current.lastname + User.current.firstname %><%= User.current.allowed_to?(:as_teacher,ma.course_message.course) ? '老师' : '同学' %>您好！
+          <%= User.current.eql?(ma.course_message.user)?"您":(ma.course_message.user.lastname + ma.course_message.user.firstname+"老师") %>开启了匿评，作业详情如下：
+        </p>
+        <ul class="ul_normal_color">
+          <li>班级名称：<%= ma.course_message.course.name %>(<%= ma.course_message.course.time.to_s + '年'+ ma.course_message.course.term %>)</li>
+          <li>作业标题：<span style="color:Red;"><%= ma.course_message.name %></span></li>
+          <li>缺评扣分：<span style="color:Red;"><%= ma.course_message.homework_detail_manual.absence_penalty %>分</span></li>
+          <li>匿评截止：<span style="color:Red;"><%= ma.course_message.homework_detail_manual.evaluation_end %>&nbsp;&nbsp;23:59</span></li>
         </ul>
-    <% end %>
-    <!--作品关闭匿评-->
-    <% if ma.course_message_type == "HomeworkCommon" && ma.status == 3 && ma.course_message %>
-        <ul class="homepageNewsList fl">
-          <div class="longMessageWidth">
-            <li class="homepageNewsPortrait fl">
-              <%= link_to image_tag(url_to_avatar(ma.course_message.user), :width => "30", :height => "30"), user_path(ma.course_message.user), :target => '_blank' %>
-            </li>
-            <li class="homepageNewsPubType fl">
-              <%=link_to ma.course_message.user.lastname + ma.course_message.user.firstname + "老师",
-                         user_path(ma.course_message.user), :class => "newsBlue homepageNewsPublisher", :target => '_blank' %>
-              <span class="homepageNewsType fl">关闭了作业匿评：</span></li>
-            <li class="messageInformationContents">
-              <%= link_to "作业标题：" + ma.course_message.name, student_work_index_path(:homework => ma.course_message.id), :class =>"#{ma.viewed == 0 ? "newsBlack" : "newsGrey"}", :target => '_blank' %>
-              <!--:onmouseover =>"message_titile_show($(this),event)",-->
-              <!--:onmouseout => "message_titile_hide($(this))"%>-->
-            </li>
-          </div>
-          <div  style="display: none" class="message_title_red system_message_style">
-            <p>
-              <%= User.current.lastname + User.current.firstname %><%= User.current.allowed_to?(:as_teacher,ma.course_message.course) ? '老师':'同学'%>您好！
-              该作业已经关闭了匿评。作业信息如下：
-            </p>
-            <ul class="ul_grey">
-              <li>班级名称：<%= ma.course_message.course.name %>(<%= ma.course_message.course.time.to_s + '年'+ ma.course_message.course.term %>)</li>
-              <li>作业标题：<%= ma.course_message.name %></li>
-            </ul>
-            <p></p>
-            <p class="c_red">注：缺省情况下，系统将在作业提交截止日期后14天自动关闭匿评。</p>
-            <p></p>
-            <% if User.current.allowed_to?(:as_teacher,ma.course_message.course)%>
-                <p>祝您的教学活动高效、顺利、愉快！</p>
-            <% end %>
-          </div>
-          <li class="homepageNewsTime fr"><%= time_tag(ma.created_at).html_safe %> </li>
+        <% unless User.current.allowed_to?(:as_teacher, ma.course_message.course)%>
+            <p>请您尽早完成匿评，如果您在截止日期前未完成匿评，您的最终成绩将被扣除<%= ma.course_message.homework_detail_manual.absence_penalty %>分乘以缺评份数。</p>
+            <p>例如，您缺评了两份作品，则您的最终成绩将被扣除 <%= ma.course_message.homework_detail_manual.absence_penalty %> * 2 = <%= ma.course_message.homework_detail_manual.absence_penalty * 2 %>分</p>
+        <% end%>
+      </div>
+      <li class="homepageNewsTime fr"><%= time_tag(ma.created_at).html_safe %> </li>
+    </ul>
+<% end %>
+<!--作品关闭匿评-->
+<% if ma.course_message_type == "HomeworkCommon" && ma.status == 3 && ma.course_message %>
+    <ul class="homepageNewsList fl">
+      <div class="longMessageWidth">
+        <li class="homepageNewsPortrait fl">
+          <%= link_to image_tag(url_to_avatar(ma.course_message.user), :width => "30", :height => "30"), user_path(ma.course_message.user), :target => '_blank' %>
+        </li>
+        <li class="homepageNewsPubType fl">
+          <%=link_to ma.course_message.user.lastname + ma.course_message.user.firstname + "老师",
+                     user_path(ma.course_message.user), :class => "newsBlue homepageNewsPublisher", :target => '_blank' %>
+          <span class="homepageNewsType fl">关闭了作业匿评：</span></li>
+        <li class="messageInformationContents">
+          <%= link_to "作业标题：" + ma.course_message.name, student_work_index_path(:homework => ma.course_message.id), :class =>"#{ma.viewed == 0 ? "newsBlack" : "newsGrey"}", :target => '_blank' %>
+          <!--:onmouseover =>"message_titile_show($(this),event)",-->
+          <!--:onmouseout => "message_titile_hide($(this))"%>-->
+        </li>
+      </div>
+      <div  style="display: none" class="message_title_red system_message_style">
+        <p>
+          <%= User.current.lastname + User.current.firstname %><%= User.current.allowed_to?(:as_teacher,ma.course_message.course) ? '老师':'同学'%>您好！
+          该作业已经关闭了匿评。作业信息如下：
+        </p>
+        <ul class="ul_grey">
+          <li>班级名称：<%= ma.course_message.course.name %>(<%= ma.course_message.course.time.to_s + '年'+ ma.course_message.course.term %>)</li>
+          <li>作业标题：<%= ma.course_message.name %></li>
         </ul>
-    <% end %>
+        <p></p>
+        <p class="c_red">注：缺省情况下，系统将在作业提交截止日期后14天自动关闭匿评。</p>
+        <p></p>
+        <% if User.current.allowed_to?(:as_teacher,ma.course_message.course)%>
+            <p>祝您的教学活动高效、顺利、愉快！</p>
+        <% end %>
+      </div>
+      <li class="homepageNewsTime fr"><%= time_tag(ma.created_at).html_safe %> </li>
+    </ul>
+<% end %>
 
-    <% if ma.course_message_type == "HomeworkCommon" && ma.status == 4 && ma.course_message %>
-        <ul class="homepageNewsList fl">
-          <div class="longMessageWidth">
-            <li class="homepageNewsPortrait fl">
-              <%= link_to image_tag(url_to_avatar(ma.course_message.user), :width => "30", :height => "30"), user_path(ma.course_message.user), :target => '_blank' %>
+<% if ma.course_message_type == "HomeworkCommon" && ma.status == 4 && ma.course_message %>
+    <ul class="homepageNewsList fl">
+      <div class="longMessageWidth">
+        <li class="homepageNewsPortrait fl">
+          <%= link_to image_tag(url_to_avatar(ma.course_message.user), :width => "30", :height => "30"), user_path(ma.course_message.user), :target => '_blank' %>
+        </li>
+        <li class="homepageNewsPubType fl">
+          <%= link_to ma.course_message.user.lastname + ma.course_message.user.firstname + "老师",
+                      user_path(ma.course_message.user), :class => "newsBlue homepageNewsPublisher", :target => '_blank' %>
+          <span class="homepageNewsType fl">启动作业匿评失败：</span>
+        </li>
+        <li class="messageInformationContents">
+          <%= link_to truncate(ma.course_message.name,:length=>25)+'(失败原因：提交作品的人数低于2人)', student_work_index_path(:homework => ma.course_message.id),
+                      :class => "#{ma.viewed == 0 ? "c_red" : "newsGrey "}",
+                      :target => '_blank',
+                      :title => "#{truncate(ma.course_message.name,:length=>25)}(失败原因：提交作品的人数低于2人)"
+          %>
+          <!--:onmouseover => "message_titile_show($(this),event)",-->
+          <!--:onmouseout => "message_titile_hide($(this))" %>-->
+        </li>
+      </div>
+      <div style="display: none" class="message_title_red system_message_style">
+        <p>
+          <%= User.current.lastname + User.current.firstname %><%= User.current.allowed_to?(:as_teacher, ma.course_message.course) ? '老师':'同学'%>您好！
+          <%= User.current.eql?(ma.course_message.user) ?"您":(ma.course_message.user.lastname + ma.course_message.user.firstname + "老师") %>启动作业匿评失败啦
+
+        </p>
+        <ul class="ul_normal_color">
+          <li>班级名称：<%= ma.course_message.course.name %>(<%= ma.course_message.course.time.to_s + '年' + ma.course_message.course.term %>)</li>
+          <li>作业标题：<span style="color:Red;"><%= ma.course_message.name %></span></li>
+          <li>提交截止：<span style="color:Red;"><%= ma.course_message.end_time%>&nbsp;&nbsp;23:59</span></li>
+        </ul>
+      </div>
+      <li class="homepageNewsTime fr"><%= time_tag(ma.created_at).html_safe %> </li>
+    </ul>
+<% end %>
+<% if ma.course_message_type == "HomeworkCommon" && ma.status == 5 %>
+    <ul class="homepageNewsList fl" id="course_message_homework_<%= ma.id %>">
+      <%= render :partial => 'apply_homework_course_message', :locals => {:ma => ma} %>
+    </ul>
+<% end %>
+<!--资源申请-->
+<% if ma.course_message_type == "ApplyResource" && ma.status == 0 && ma.course_message %>
+    <ul class="homepageNewsList fl" id="apply_resource_message_<%= ma.id %>">
+      <%= render :partial => 'apply_resource_course_message', :locals => {:ma => ma} %>
+    </ul>
+<% end %>
+<!--资源申请回复-->
+<% if ma.course_message_type == "ApplyResource" && ma.status == 1 && ma.course_message %>
+    <ul class="homepageNewsList fl" id="apply_resource_message_<%= ma.id %>">
+      <%= render :partial => 'apply_resource_course_message_reply', :locals => {:ma => ma} %>
+    </ul>
+<% end %>
+<% if ma.course_message_type == "HomeworkCommon" && ma.status == 6 && ma.course_message %>
+    <ul class="homepageNewsList fl">
+      <div class="longMessageWidth">
+        <li class="homepageNewsPortrait fl">
+          <div class="navHomepageLogo fl">
+            <%= image_tag(url_to_avatar(User.find(ma.apply_user_id)), width: "30px", height: "30px", class: "mt3") %>
+          </div>
+        </li>
+        <li class="homepageNewsPubType fl">
+          <%= link_to ma.course_message.user.try(:show_name),
+                      user_path(ma.course_message.user), :class => "newsBlue homepageNewsPublisher", :target => '_blank' %>
+          <span class="homepageNewsType fl"><%= ma.apply_result == 1 ? '同意' : '拒绝'%>引用作业：</span>
+        </li>
+        <li class="messageInformationContents">
+          <% link_str = ma.apply_result == 1 ?
+                  '您申请引用作业"'+HomeworkCommon.find(ma.course_message_id).name+'"的申请已通过'
+          :
+                  '您申请引用作业"'+HomeworkCommon.find(ma.course_message_id).name+'"的申请被拒绝' %>
+          <% if User.current.member_of_course?(ma.course_message.course) || User.current.admin? || (ma.course_message.is_open == 1 && ma.course_message.course.is_public == 1) %>
+              <%= link_to link_str, student_work_index_path(:homework => ma.course_message.id), :title => link_str,:class => "#{ma.viewed == 0 ? "newsBlack" : "newsGrey "}", :target => '_blank' %>
+          <% else %>
+              <span title='<%= link_str %>' style="color:#4b4b4b; cursor: default;" class="<%= ma.viewed == 0 ? 'newsBlack' : 'newsGrey'%>"><%= link_str %></span>
+          <% end %>
+          <!--:onmouseover => "message_titile_show($(this),event)",-->
+          <!--:onmouseout => "message_titile_hide($(this))" %>-->
+        </li>
+      </div>
+      <li class="homepageNewsTime fr"><%= time_tag(ma.created_at).html_safe %> </li>
+    </ul>
+<% end %>
+<% if ma.course_message_type == "Poll" && ma.course_message %>
+    <ul class="homepageNewsList fl">
+      <div class="longMessageWidth">
+        <li class="homepageNewsPortrait fl">
+          <%= link_to image_tag(url_to_avatar(ma.course_message.user), :width => "30", :height => "30"), user_path(ma.course_message.user), :target => '_blank' %>
+        </li>
+        <li class="homepageNewsPubType fl">
+          <%= link_to ma.course_message.user.try(:show_name), user_path(ma.course_message.user), :class => "newsBlue homepageNewsPublisher", :target => '_blank' %>
+          <span class="homepageNewsType fl">发布了问卷：</span>
+        </li>
+        <li class="messageInformationContents">
+          <%= link_to format_activity_title(" #{ma.course_message.polls_name.nil? ? "未命名问卷" : ma.course_message.polls_name}"), poll_path(ma.course_message.id),
+                      :class=>"#{ma.viewed==0?"newsBlack":"newsGrey"}", :target => '_blank' %>
+          <!--:onmouseover =>"message_titile_show($(this),event)",-->
+          <!--:onmouseout => "message_titile_hide($(this))" %>-->
+        </li>
+      </div>
+      <div  style="display: none" class="message_title_red system_message_style">
+        <%= ma.course_message.polls_name %>
+      </div>
+      <li class="homepageNewsTime fr"><%= time_tag(ma.created_at).html_safe %> </li>
+    </ul>
+<% end %>
+<% if ma.course_message_type == "Message" && !ma.nil? && !ma.course_message.nil? %>
+    <ul class="homepageNewsList fl">
+      <div class="longMessageWidth">
+        <li class="homepageNewsPortrait fl">
+          <%=link_to image_tag(url_to_avatar(ma.course_message.author), :width => "30", :height => "30"), user_path(ma.course_message.author), :target => '_blank' %>
+        </li>
+        <li class="homepageNewsPubType fl">
+          <%=link_to ma.course_message.author.try(:show_name), user_path(ma.course_message.author), :class => "newsBlue homepageNewsPublisher", :target => '_blank' %>
+          <span class="homepageNewsType fl">
+            <%= ma.course_message.parent_id.nil? ? "发布了班级帖子：" : "评论了班级帖子：" %></span></li>
+        <% if ma.course_message.parent_id.nil? %>
+            <li class="messageInformationContents">
+              <%= link_to ma.course_message.subject, board_message_path(ma.course_message.board_id, ma.course_message.id),
+                          :class => "#{ma.viewed==0 ? "newsBlack" : "newsGrey"}",
+                          :target => '_blank',
+                          :title => "#{ma.course_message.subject}"
+              %>
+              <!--:onmouseover =>"message_titile_show($(this),event)",-->
+              <!--:onmouseout => "message_titile_hide($(this))" %>-->
             </li>
-            <li class="homepageNewsPubType fl">
+            <div  style="display: none" class="message_title_red system_message_style" >
+              <p><strong>主题：</strong><%= ma.course_message.subject %></p>
+              <% unless ma.course_message.content.nil? %>
+                  <div class="fl"><strong>内容：</strong></div>
+                  <div class="ml36"><%= ma.course_message.content.html_safe %></div>
+              <% end %>
+            </div>
+        <% else %>
+            <li class="messageInformationContents">
+              <%= link_to message_content(ma.course_message.content), board_message_path(ma.course_message.board_id, ma.course_message.parent_id),
+                          :class => "#{ma.viewed==0 ? "newsBlack" : "newsGrey"}", :target => '_blank' %>
+              <!--:onmouseover =>"message_titile_show($(this),event)",-->
+              <!--:onmouseout => "message_titile_hide($(this))" %>-->
+            </li>
+            <div  style="display: none" class="message_title_red system_message_style" >
+              <p><strong>主题：</strong><%= ma.course_message.subject %></p>
+              <% unless ma.course_message.content.nil? %>
+                  <div class="fl"><strong>内容：</strong></div>
+                  <div class="ml36"><%= ma.course_message.content.html_safe %></div>
+              <% end %>
+            </div>
+        <% end %>
+      </div>
+      <li class="homepageNewsTime fr"><%= time_tag(ma.created_at).html_safe %> </li>
+
+    </ul>
+<% end %>
+<% if ma.course_message_type == "StudentWorksScore" && ma.course_message %>
+    <ul class="homepageNewsList fl">
+      <div class="longMessageWidth">
+        <li class="homepageNewsPortrait fl">
+          <% if ma.course_message.reviewer_role == 3 %>
+              <%= link_to image_tag(url_to_avatar(""), :width => "30", :height => "30"),"javascript:void(0);", :target => '_blank' %>
+          <% else %>
+              <%= link_to image_tag(url_to_avatar(ma.course_message.user), :width => "30", :height => "30"), user_path(ma.course_message.user), :target => '_blank' %>
+          <% end %>
+        </li>
+        <li class="homepageNewsPubType fl">
+          <% if ma.course_message.reviewer_role == 3 %>
+              <span class="newsBlue homepageNewsPublisher">匿名用户</span>
+          <% else %>
               <%= link_to ma.course_message.user.lastname + ma.course_message.user.firstname + "老师",
                           user_path(ma.course_message.user), :class => "newsBlue homepageNewsPublisher", :target => '_blank' %>
-              <span class="homepageNewsType fl">启动作业匿评失败：</span>
-            </li>
-            <li class="messageInformationContents">
-              <%= link_to truncate(ma.course_message.name,:length=>25)+'(失败原因：提交作品的人数低于2人)', student_work_index_path(:homework => ma.course_message.id),
-                          :class => "#{ma.viewed == 0 ? "c_red" : "newsGrey "}",
-                          :target => '_blank',
-                          :title => "#{truncate(ma.course_message.name,:length=>25)}(失败原因：提交作品的人数低于2人)"
-              %>
-              <!--:onmouseover => "message_titile_show($(this),event)",-->
-              <!--:onmouseout => "message_titile_hide($(this))" %>-->
-            </li>
-          </div>
-          <div style="display: none" class="message_title_red system_message_style">
-            <p>
-              <%= User.current.lastname + User.current.firstname %><%= User.current.allowed_to?(:as_teacher, ma.course_message.course) ? '老师':'同学'%>您好！
-              <%= User.current.eql?(ma.course_message.user) ?"您":(ma.course_message.user.lastname + ma.course_message.user.firstname + "老师") %>启动作业匿评失败啦
-
-            </p>
-            <ul class="ul_normal_color">
-              <li>班级名称：<%= ma.course_message.course.name %>(<%= ma.course_message.course.time.to_s + '年' + ma.course_message.course.term %>)</li>
-              <li>作业标题：<span style="color:Red;"><%= ma.course_message.name %></span></li>
-              <li>提交截止：<span style="color:Red;"><%= ma.course_message.end_time%>&nbsp;&nbsp;23:59</span></li>
-            </ul>
-          </div>
-          <li class="homepageNewsTime fr"><%= time_tag(ma.created_at).html_safe %> </li>
-        </ul>
-    <% end %>
-    <% if ma.course_message_type == "HomeworkCommon" && ma.status == 5 %>
-        <ul class="homepageNewsList fl" id="course_message_homework_<%= ma.id %>">
-          <%= render :partial => 'apply_homework_course_message', :locals => {:ma => ma} %>
-        </ul>
-    <% end %>
-    <!--资源申请-->
-    <% if ma.course_message_type == "ApplyResource" && ma.status == 0 && ma.course_message %>
-        <ul class="homepageNewsList fl" id="apply_resource_message_<%= ma.id %>">
-          <%= render :partial => 'apply_resource_course_message', :locals => {:ma => ma} %>
-        </ul>
-    <% end %>
-    <!--资源申请回复-->
-    <% if ma.course_message_type == "ApplyResource" && ma.status == 1 && ma.course_message %>
-        <ul class="homepageNewsList fl" id="apply_resource_message_<%= ma.id %>">
-          <%= render :partial => 'apply_resource_course_message_reply', :locals => {:ma => ma} %>
-        </ul>
-    <% end %>
-    <% if ma.course_message_type == "HomeworkCommon" && ma.status == 6 && ma.course_message %>
-        <ul class="homepageNewsList fl">
-          <div class="longMessageWidth">
-            <li class="homepageNewsPortrait fl">
-              <div class="navHomepageLogo fl">
-                <%= image_tag(url_to_avatar(User.find(ma.apply_user_id)), width: "30px", height: "30px", class: "mt3") %>
-              </div>
-            </li>
-            <li class="homepageNewsPubType fl">
-              <%= link_to ma.course_message.user.try(:show_name),
-                          user_path(ma.course_message.user), :class => "newsBlue homepageNewsPublisher", :target => '_blank' %>
-              <span class="homepageNewsType fl"><%= ma.apply_result == 1 ? '同意' : '拒绝'%>引用作业：</span>
-            </li>
-            <li class="messageInformationContents">
-              <% link_str = ma.apply_result == 1 ?
-                      '您申请引用作业"'+HomeworkCommon.find(ma.course_message_id).name+'"的申请已通过'
-              :
-                      '您申请引用作业"'+HomeworkCommon.find(ma.course_message_id).name+'"的申请被拒绝' %>
-              <% if User.current.member_of_course?(ma.course_message.course) || User.current.admin? || (ma.course_message.is_open == 1 && ma.course_message.course.is_public == 1) %>
-                  <%= link_to link_str, student_work_index_path(:homework => ma.course_message.id), :title => link_str,:class => "#{ma.viewed == 0 ? "newsBlack" : "newsGrey "}", :target => '_blank' %>
-              <% else %>
-                  <span title='<%= link_str %>' style="color:#4b4b4b; cursor: default;" class="<%= ma.viewed == 0 ? 'newsBlack' : 'newsGrey'%>"><%= link_str %></span>
-              <% end %>
-              <!--:onmouseover => "message_titile_show($(this),event)",-->
-              <!--:onmouseout => "message_titile_hide($(this))" %>-->
-            </li>
-          </div>
-          <li class="homepageNewsTime fr"><%= time_tag(ma.created_at).html_safe %> </li>
-        </ul>
-    <% end %>
-    <% if ma.course_message_type == "Poll" && ma.course_message %>
-        <ul class="homepageNewsList fl">
-          <div class="longMessageWidth">
-            <li class="homepageNewsPortrait fl">
-              <%= link_to image_tag(url_to_avatar(ma.course_message.user), :width => "30", :height => "30"), user_path(ma.course_message.user), :target => '_blank' %>
-            </li>
-            <li class="homepageNewsPubType fl">
-              <%= link_to ma.course_message.user.try(:show_name), user_path(ma.course_message.user), :class => "newsBlue homepageNewsPublisher", :target => '_blank' %>
-              <span class="homepageNewsType fl">发布了问卷：</span>
-            </li>
-            <li class="messageInformationContents">
-              <%= link_to format_activity_title(" #{ma.course_message.polls_name.nil? ? "未命名问卷" : ma.course_message.polls_name}"), poll_path(ma.course_message.id),
-                          :class=>"#{ma.viewed==0?"newsBlack":"newsGrey"}", :target => '_blank' %>
-              <!--:onmouseover =>"message_titile_show($(this),event)",-->
-              <!--:onmouseout => "message_titile_hide($(this))" %>-->
-            </li>
-          </div>
-          <div  style="display: none" class="message_title_red system_message_style">
-            <%= ma.course_message.polls_name %>
-          </div>
-          <li class="homepageNewsTime fr"><%= time_tag(ma.created_at).html_safe %> </li>
-        </ul>
-    <% end %>
-    <% if ma.course_message_type == "Message" && !ma.nil? && !ma.course_message.nil? %>
-        <ul class="homepageNewsList fl">
-          <div class="longMessageWidth">
-            <li class="homepageNewsPortrait fl">
-              <%=link_to image_tag(url_to_avatar(ma.course_message.author), :width => "30", :height => "30"), user_path(ma.course_message.author), :target => '_blank' %>
-            </li>
-            <li class="homepageNewsPubType fl">
-              <%=link_to ma.course_message.author.try(:show_name), user_path(ma.course_message.author), :class => "newsBlue homepageNewsPublisher", :target => '_blank' %>
-              <span class="homepageNewsType fl">
-            <%= ma.course_message.parent_id.nil? ? "发布了班级帖子：" : "评论了班级帖子：" %></span></li>
-            <% if ma.course_message.parent_id.nil? %>
-                <li class="messageInformationContents">
-                  <%= link_to ma.course_message.subject, board_message_path(ma.course_message.board_id, ma.course_message.id),
-                              :class => "#{ma.viewed==0 ? "newsBlack" : "newsGrey"}",
-                              :target => '_blank',
-                              :title => "#{ma.course_message.subject}"
-                  %>
-                  <!--:onmouseover =>"message_titile_show($(this),event)",-->
-                  <!--:onmouseout => "message_titile_hide($(this))" %>-->
-                </li>
-                <div  style="display: none" class="message_title_red system_message_style" >
-                  <p><strong>主题：</strong><%= ma.course_message.subject %></p>
-                  <% unless ma.course_message.content.nil? %>
-                      <div class="fl"><strong>内容：</strong></div>
-                      <div class="ml36"><%= ma.course_message.content.html_safe %></div>
-                  <% end %>
-                </div>
-            <% else %>
-                <li class="messageInformationContents">
-                  <%= link_to message_content(ma.course_message.content), board_message_path(ma.course_message.board_id, ma.course_message.parent_id),
-                              :class => "#{ma.viewed==0 ? "newsBlack" : "newsGrey"}", :target => '_blank' %>
-                  <!--:onmouseover =>"message_titile_show($(this),event)",-->
-                  <!--:onmouseout => "message_titile_hide($(this))" %>-->
-                </li>
-                <div  style="display: none" class="message_title_red system_message_style" >
-                  <p><strong>主题：</strong><%= ma.course_message.subject %></p>
-                  <% unless ma.course_message.content.nil? %>
-                      <div class="fl"><strong>内容：</strong></div>
-                      <div class="ml36"><%= ma.course_message.content.html_safe %></div>
-                  <% end %>
-                </div>
-            <% end %>
-          </div>
-          <li class="homepageNewsTime fr"><%= time_tag(ma.created_at).html_safe %> </li>
-
-        </ul>
-    <% end %>
-    <% if ma.course_message_type == "StudentWorksScore" && ma.course_message %>
-        <ul class="homepageNewsList fl">
-          <div class="longMessageWidth">
-            <li class="homepageNewsPortrait fl">
-              <% if ma.course_message.reviewer_role == 3 %>
-                  <%= link_to image_tag(url_to_avatar(""), :width => "30", :height => "30"),"javascript:void(0);", :target => '_blank' %>
-              <% else %>
-                  <%= link_to image_tag(url_to_avatar(ma.course_message.user), :width => "30", :height => "30"), user_path(ma.course_message.user), :target => '_blank' %>
-              <% end %>
-            </li>
-            <li class="homepageNewsPubType fl">
-              <% if ma.course_message.reviewer_role == 3 %>
-                  <span class="newsBlue homepageNewsPublisher">匿名用户</span>
-              <% else %>
-                  <%= link_to ma.course_message.user.lastname + ma.course_message.user.firstname + "老师",
-                              user_path(ma.course_message.user), :class => "newsBlue homepageNewsPublisher", :target => '_blank' %>
-              <% end %>
-              <span class="homepageNewsType fl">
+          <% end %>
+          <span class="homepageNewsType fl">
                           <%= ma.status == 0 ? "评阅了您的作品：" : "重新评阅了您的作品:" %>
                         </span>
-            </li>
-            <li class="messageInformationContents">
-              <% unless ma.content.nil? %>
-                  <%= link_to message_content(ma.content), student_work_index_path(:homework => ma.course_message.student_work.homework_common_id),
-                              :class =>"#{ma.viewed == 0 ? "newsBlack" : "newsGrey"}", :target => '_blank' %>
-                  <!--:onmouseover =>"message_titile_show($(this),event)",-->
-                  <!--:onmouseout => "message_titile_hide($(this))" %>-->
-                  </li>
-                  <div  style="display: none" class="message_title_red system_message_style" >
-                    <p>
-                      <%= User.current.show_name %>同学您好！
-                      <%= ma.course_message.reviewer_role == 3? "匿名用户" : (ma.course_message.user.show_name + "老师")%>
-                      <%= ma.status == 0? "评阅了您的作品" : "重新评阅了您的作品" %>。详情如下：
-                    </p>
-                    <ul class="ul_normal_color">
-                      <li>班级名称：<%= ma.course.name %>(<%= ma.course.time.to_s + '年'+ ma.course.term %>)</li>
-                      <li>作业标题：<span style="color:Red;"><%=ma.course_message.student_work.homework_common.name %></span></li>
-                      <% content = ma.content.gsub("作业评分：","").split("&nbsp;&nbsp;&nbsp; 评语：")%>
-                      <li>作品评分：<span style="color:Red;"><%= content[0] %>分</span></li>
-                      <% if content.size > 1 %>
-                          <div class="fl" style="width:74px;"><li>作品评语：</li></div>
-                          <div style="margin-left:74px"><span style="color:Red;"><%= content[1] %></span></div>
-                      <% end %>
-                    </ul>
-                    <p>
-                      本次作业将在<%= ma.course_message.student_work.homework_common.homework_detail_manual.evaluation_end %>&nbsp;&nbsp;23:59结束匿评，到时您将可以看到所有其他同学的作品啦！大家可以进一步互相学习。  期待您取得更大的进步！
-                    </p>
-                  </div>
-              <% end %>
-              </div>
-          <li class="homepageNewsTime fr"><%= time_tag(ma.created_at).html_safe %> </li>
-        </ul>
-    <% end %>
-    <% if ma.course_message_type == "JournalsForMessage" && ma.course_message %>
-        <% if ma.course_message.jour_type == 'Course' %>
-            <% if params[:type] != 'homework' %>
-                <ul class="homepageNewsList fl">
-                  <div class="longMessageWidth">
-                    <li class="homepageNewsPortrait fl">
-                      <%= link_to image_tag(url_to_avatar(ma.course_message.user), :width => "30", :height => "30"), user_path(ma.course_message.user), :target => '_blank' %>
-                    </li>
-                    <li class="homepageNewsPubType fl">
-                      <%= link_to ma.course_message.user.try(:show_name), user_path(ma.course_message.user), :class => "newsBlue homepageNewsPublisher", :target => '_blank' %>
-                      <span class="homepageNewsType fl">在班级中留言了：</span>
-                    </li>
-                    <li class="messageInformationContents">
-                      <%= link_to message_content(ma.course_message.notes), course_feedback_path(:id => ma.course_id),
-                                  :class => "#{ma.viewed == 0 ? "newsBlack" : "newsGrey"}", :target => '_blank' %>
-                      <!--:onmouseover => "message_titile_show($(this),event)",-->
-                      <!--:onmouseout => "message_titile_hide($(this))" %>-->
-                    </li>
-                  </div>
-                  <div style="display: none" class="message_title_red system_message_style">
-                    <%= ma.course_message.notes.html_safe %>
-                  </div>
-                  <li class="homepageNewsTime fr"><%= time_tag(ma.created_at).html_safe %> </li>
+        </li>
+        <li class="messageInformationContents">
+          <% unless ma.content.nil? %>
+              <%= link_to message_content(ma.content), student_work_index_path(:homework => ma.course_message.student_work.homework_common_id),
+                          :class =>"#{ma.viewed == 0 ? "newsBlack" : "newsGrey"}", :target => '_blank' %>
+              <!--:onmouseover =>"message_titile_show($(this),event)",-->
+              <!--:onmouseout => "message_titile_hide($(this))" %>-->
+              </li>
+              <div  style="display: none" class="message_title_red system_message_style" >
+                <p>
+                  <%= User.current.show_name %>同学您好！
+                  <%= ma.course_message.reviewer_role == 3? "匿名用户" : (ma.course_message.user.show_name + "老师")%>
+                  <%= ma.status == 0? "评阅了您的作品" : "重新评阅了您的作品" %>。详情如下：
+                </p>
+                <ul class="ul_normal_color">
+                  <li>班级名称：<%= ma.course.name %>(<%= ma.course.time.to_s + '年'+ ma.course.term %>)</li>
+                  <li>作业标题：<span style="color:Red;"><%=ma.course_message.student_work.homework_common.name %></span></li>
+                  <% content = ma.content.gsub("作业评分：","").split("&nbsp;&nbsp;&nbsp; 评语：")%>
+                  <li>作品评分：<span style="color:Red;"><%= content[0] %>分</span></li>
+                  <% if content.size > 1 %>
+                      <div class="fl" style="width:74px;"><li>作品评语：</li></div>
+                      <div style="margin-left:74px"><span style="color:Red;"><%= content[1] %></span></div>
+                  <% end %>
                 </ul>
-            <% end %>
-        <% elsif ma.course_message.jour_type == 'HomeworkCommon' %>
+                <p>
+                  本次作业将在<%= ma.course_message.student_work.homework_common.homework_detail_manual.evaluation_end %>&nbsp;&nbsp;23:59结束匿评，到时您将可以看到所有其他同学的作品啦！大家可以进一步互相学习。  期待您取得更大的进步！
+                </p>
+              </div>
+          <% end %>
+          </div>
+      <li class="homepageNewsTime fr"><%= time_tag(ma.created_at).html_safe %> </li>
+    </ul>
+<% end %>
+<% if ma.course_message_type == "JournalsForMessage" && ma.course_message %>
+    <% if ma.course_message.jour_type == 'Course' %>
+        <% if params[:type] != 'homework' %>
             <ul class="homepageNewsList fl">
               <div class="longMessageWidth">
                 <li class="homepageNewsPortrait fl">
@@ -482,16 +458,10 @@
                 </li>
                 <li class="homepageNewsPubType fl">
                   <%= link_to ma.course_message.user.try(:show_name), user_path(ma.course_message.user), :class => "newsBlue homepageNewsPublisher", :target => '_blank' %>
-                  <span class="homepageNewsType fl">
-                      <% if ma.course_message.m_parent_id.nil? %>
-                          <span title="作业：<%= ma.course_message.jour.name %>">回复了您的作业</span>：
-                      <% else %>
-                          <span title="作业：<%= ma.course_message.jour.name %>">在作业中回复了您</span>：
-                      <% end %>
-                    </span>
+                  <span class="homepageNewsType fl">在班级中留言了：</span>
                 </li>
                 <li class="messageInformationContents">
-                  <%= link_to message_content(ma.course_message.notes), homework_common_index_url_in_org( ma.course_id),
+                  <%= link_to message_content(ma.course_message.notes), course_feedback_path(:id => ma.course_id),
                               :class => "#{ma.viewed == 0 ? "newsBlack" : "newsGrey"}", :target => '_blank' %>
                   <!--:onmouseover => "message_titile_show($(this),event)",-->
                   <!--:onmouseout => "message_titile_hide($(this))" %>-->
@@ -502,144 +472,173 @@
               </div>
               <li class="homepageNewsTime fr"><%= time_tag(ma.created_at).html_safe %> </li>
             </ul>
-        <% else %>
-            <ul class="homepageNewsList fl">
-                
-              <div class="longMessageWidth">
-                <li class="homepageNewsPortrait fl">
-              <% show_name = ma.course_message.jour.reviewer_role != 3 || ma.course_message.user.allowed_to?(:as_teacher, ma.course) %>
-                  <%= link_to image_tag(url_to_avatar(show_name ? ma.course_message.user : ""), :width => "30", :height => "30"), show_name ? user_path(ma.course_message.user) : "javascript:void(0)", :target => '_blank' %>
-                
-                </li>
-                <li class="homepageNewsPubType fl">
-                  
-                  <%= link_to show_name ? ma.course_message.user.show_name + "#{ma.course_message.user.allowed_to?(:as_teacher, ma.course)?"老师":"同学"}" : "匿名用户",
-                            show_name ? user_path(ma.course_message.user) : "javascript:void(0)", :class => "newsBlue homepageNewsPublisher", :target => '_blank' %>
-                  <span class="homepageNewsType fl">回复了作品评论：</span>
-                </li>
-                <li class="messageInformationContents">
-                  <%= link_to message_content(ma.course_message.notes),
-                              student_work_index_path(:homework => ma.course_message.jour.student_work.homework_common_id,:show_work_id => ma.course_message.jour.student_work_id),
-                              :class => "#{ma.viewed == 0 ? "newsBlack" : "newsGrey"}",
-                              :target => '_blank' %>
-                  <!--:onmouseover => "message_titile_show($(this),event)",-->
-                  <!--:onmouseout => "message_titile_hide($(this))" %>-->
-                </li>
-              </div>
-              <div style="display: none" class="message_title_red system_message_style">
-                <p>
-                  <%= User.current.show_name %>老师您好！
-                  <%= User.find(ma.course_message.user).show_name %>
-                  <%= ma.course_message.user.allowed_to?(:as_teacher, ma.course)?"老师":"同学"%>回复了您的作品评论。详情如下：
-                </p>
-                <ul class="ul_normal_color">
-                  <li>回复内容：<span style="color:red;"><%= ma.course_message.notes  %></span></li>
-                  <li>您的评论：<span style="color:red;"><%= ma.course_message.jour.comment  %></span></li>
-                  <li>班级名称：<%= ma.course.name %>(<%= ma.course.time.to_s + '年'+ ma.course.term %>)</li>
-                  <li>作业标题：<span style="color:Red;"><%=ma.course_message.jour.student_work.homework_common.name %></span></li>
-                </ul>
-              </div>
-              <li class="homepageNewsTime fr"><%= time_tag(ma.created_at).html_safe %> </li>
-            </ul>
         <% end %>
-    <% end %>
-    <!-- 作业迟交，不能参与匿评提醒消息 -->
-    <% if ma.course_message_type == "StudentWork" && !ma.course_message.nil? && !ma.course_message.homework_common.nil? && !User.current.allowed_to?(:as_teacher, ma.course_message.homework_common.course) && ma.course_message %>
+    <% elsif ma.course_message.jour_type == 'HomeworkCommon' %>
         <ul class="homepageNewsList fl">
-          <div class="shortMessageWidth">
+          <div class="longMessageWidth">
             <li class="homepageNewsPortrait fl">
-              <%= link_to image_tag(url_to_avatar(ma.course_message.homework_common.user), :width => "30", :height => "30"), user_path(ma.course_message.homework_common.user), :target => '_blank' %>
+              <%= link_to image_tag(url_to_avatar(ma.course_message.user), :width => "30", :height => "30"), user_path(ma.course_message.user), :target => '_blank' %>
             </li>
             <li class="homepageNewsPubType fl">
-              <%=link_to ma.course_message.homework_common.user.show_name+"老师", user_path(ma.course_message.homework_common.user), :class => "newsBlue homepageNewsPublisher", :target => '_blank' %>
-              <span class="homepageNewsType fl">发布的作业：</span>
+              <%= link_to ma.course_message.user.try(:show_name), user_path(ma.course_message.user), :class => "newsBlue homepageNewsPublisher", :target => '_blank' %>
+              <span class="homepageNewsType fl">
+                      <% if ma.course_message.m_parent_id.nil? %>
+                          <span title="作业：<%= ma.course_message.jour.name %>">回复了您的作业</span>：
+                      <% else %>
+                          <span title="作业：<%= ma.course_message.jour.name %>">在作业中回复了您</span>：
+                      <% end %>
+                    </span>
             </li>
             <li class="messageInformationContents">
-              <%= link_to "作业标题：" + ma.course_message.homework_common.name, student_work_index_path(:homework => ma.course_message.homework_common_id),
-                          :class => "#{ma.viewed==0 ? "newsBlack" : "newsGrey"}", :target => '_blank' %>
+              <%= link_to message_content(ma.course_message.notes), homework_common_index_url_in_org( ma.course_id),
+                          :class => "#{ma.viewed == 0 ? "newsBlack" : "newsGrey"}", :target => '_blank' %>
+              <!--:onmouseover => "message_titile_show($(this),event)",-->
+              <!--:onmouseout => "message_titile_hide($(this))" %>-->
+            </li>
+          </div>
+          <div style="display: none" class="message_title_red system_message_style">
+            <%= ma.course_message.notes.html_safe %>
+          </div>
+          <li class="homepageNewsTime fr"><%= time_tag(ma.created_at).html_safe %> </li>
+        </ul>
+    <% else %>
+        <ul class="homepageNewsList fl">
+
+          <div class="longMessageWidth">
+            <li class="homepageNewsPortrait fl">
+              <% show_name = ma.course_message.jour.reviewer_role != 3 || ma.course_message.user.allowed_to?(:as_teacher, ma.course) %>
+              <%= link_to image_tag(url_to_avatar(show_name ? ma.course_message.user : ""), :width => "30", :height => "30"), show_name ? user_path(ma.course_message.user) : "javascript:void(0)", :target => '_blank' %>
+
+            </li>
+            <li class="homepageNewsPubType fl">
+
+              <%= link_to show_name ? ma.course_message.user.show_name + "#{ma.course_message.user.allowed_to?(:as_teacher, ma.course)?"老师":"同学"}" : "匿名用户",
+                          show_name ? user_path(ma.course_message.user) : "javascript:void(0)", :class => "newsBlue homepageNewsPublisher", :target => '_blank' %>
+              <span class="homepageNewsType fl">回复了作品评论：</span>
+            </li>
+            <li class="messageInformationContents">
+              <%= link_to message_content(ma.course_message.notes),
+                          student_work_index_path(:homework => ma.course_message.jour.student_work.homework_common_id,:show_work_id => ma.course_message.jour.student_work_id),
+                          :class => "#{ma.viewed == 0 ? "newsBlack" : "newsGrey"}",
+                          :target => '_blank' %>
               <!--:onmouseover => "message_titile_show($(this),event)",-->
               <!--:onmouseout => "message_titile_hide($(this))" %>-->
             </li>
           </div>
           <div style="display: none" class="message_title_red system_message_style">
             <p>
-              <%= User.current.lastname + User.current.firstname %>
-              <%= User.current.allowed_to?(:as_teacher,ma.course_message.homework_common.course) ? '老师':'同学'%>您好！由于迟交作业，您及您的作品都不能参与以下作业的匿评。作业详情如下：
+              <%= User.current.show_name %>老师您好！
+              <%= User.find(ma.course_message.user).show_name %>
+              <%= ma.course_message.user.allowed_to?(:as_teacher, ma.course)?"老师":"同学"%>回复了您的作品评论。详情如下：
             </p>
-            <ul class="ul_grey">
-              <li>班级名称：<%= ma.course_message.homework_common.course.name %>(<%= ma.course_message.homework_common.course.time.to_s + '年' + ma.course_message.homework_common.course.term %>)</li>
-              <li>作业标题：<%= ma.course_message.homework_common.name %></li>
-              <li>提交截止：<%= ma.course_message.homework_common.end_time %>&nbsp;23:59</li>
-              <li>提交时间：<%= format_time(ma.course_message.created_at) %></li>
-              <li>迟交扣分：<%= ma.course_message.homework_common.late_penalty %>分</li>
+            <ul class="ul_normal_color">
+              <li>回复内容：<span style="color:red;"><%= ma.course_message.notes  %></span></li>
+              <li>您的评论：<span style="color:red;"><%= ma.course_message.jour.comment  %></span></li>
+              <li>班级名称：<%= ma.course.name %>(<%= ma.course.time.to_s + '年'+ ma.course.term %>)</li>
+              <li>作业标题：<span style="color:Red;"><%=ma.course_message.jour.student_work.homework_common.name %></span></li>
             </ul>
-            <p>如需获得最终成绩，请您联系主讲老师对您的作品进行单独评分!</p>
           </div>
-          <li class="messageOperateContents fl" title="您成功提交了作品（但被标记为迟交啦）"> 迟交作品</li>
           <li class="homepageNewsTime fr"><%= time_tag(ma.created_at).html_safe %> </li>
         </ul>
     <% end %>
+<% end %>
+<!-- 作业迟交，不能参与匿评提醒消息 -->
+<% if ma.course_message_type == "StudentWork" && !ma.course_message.nil? && !ma.course_message.homework_common.nil? && !User.current.allowed_to?(:as_teacher, ma.course_message.homework_common.course) && ma.course_message %>
+    <ul class="homepageNewsList fl">
+      <div class="shortMessageWidth">
+        <li class="homepageNewsPortrait fl">
+          <%= link_to image_tag(url_to_avatar(ma.course_message.homework_common.user), :width => "30", :height => "30"), user_path(ma.course_message.homework_common.user), :target => '_blank' %>
+        </li>
+        <li class="homepageNewsPubType fl">
+          <%=link_to ma.course_message.homework_common.user.show_name+"老师", user_path(ma.course_message.homework_common.user), :class => "newsBlue homepageNewsPublisher", :target => '_blank' %>
+          <span class="homepageNewsType fl">发布的作业：</span>
+        </li>
+        <li class="messageInformationContents">
+          <%= link_to "作业标题：" + ma.course_message.homework_common.name, student_work_index_path(:homework => ma.course_message.homework_common_id),
+                      :class => "#{ma.viewed==0 ? "newsBlack" : "newsGrey"}", :target => '_blank' %>
+          <!--:onmouseover => "message_titile_show($(this),event)",-->
+          <!--:onmouseout => "message_titile_hide($(this))" %>-->
+        </li>
+      </div>
+      <div style="display: none" class="message_title_red system_message_style">
+        <p>
+          <%= User.current.lastname + User.current.firstname %>
+          <%= User.current.allowed_to?(:as_teacher,ma.course_message.homework_common.course) ? '老师':'同学'%>您好！由于迟交作业，您及您的作品都不能参与以下作业的匿评。作业详情如下：
+        </p>
+        <ul class="ul_grey">
+          <li>班级名称：<%= ma.course_message.homework_common.course.name %>(<%= ma.course_message.homework_common.course.time.to_s + '年' + ma.course_message.homework_common.course.term %>)</li>
+          <li>作业标题：<%= ma.course_message.homework_common.name %></li>
+          <li>提交截止：<%= ma.course_message.homework_common.end_time %>&nbsp;23:59</li>
+          <li>提交时间：<%= format_time(ma.course_message.created_at) %></li>
+          <li>迟交扣分：<%= ma.course_message.homework_common.late_penalty %>分</li>
+        </ul>
+        <p>如需获得最终成绩，请您联系主讲老师对您的作品进行单独评分!</p>
+      </div>
+      <li class="messageOperateContents fl" title="您成功提交了作品（但被标记为迟交啦）"> 迟交作品</li>
+      <li class="homepageNewsTime fr"><%= time_tag(ma.created_at).html_safe %> </li>
+    </ul>
+<% end %>
 
 
-    <% if ma.course_message_type == "StudentWork" && ma.status == 1 && ma.course_message %>
-        <ul class="homepageNewsList fl">
-          <div class="longMessageWidth">
-            <li class="homepageNewsPortrait fl">
-              <%= link_to image_tag(url_to_avatar(ma.course_message.user), :width => "30", :height => "30"), user_path(ma.course_message.user), :target => '_blank' %>
-            </li>
-            <li class="homepageNewsPubType fl">
-              <%= link_to ma.course_message.user.lastname + ma.course_message.user.firstname + "同学",
-                          user_path(ma.course_message.user), :class => "newsBlue homepageNewsPublisher", :target => '_blank' %>
-              <span class="homepageNewsType fl">重新提交了作品：</span>
-            </li>
-            <li class="messageInformationContents">
-              <%= link_to "作业标题：" + ma.course_message.name, student_work_index_path(:homework => ma.course_message.homework_common_id, :show_work_id => ma.course_message_id, :tab => 2),
-                          :class =>"#{ma.viewed == 0 ? "newsBlack" : "newsGrey"}", :target => '_blank' %>
-              <%#= link_to truncate(ma.course_message.name,:length=>25)+'(失败原因：提交作品的人数低于2人)', student_work_index_path(:homework => ma.course_message.id), :class => "#{ma.viewed == 0 ? "c_red" : "newsGrey "}" %>
-              <!--:onmouseover => "message_titile_show($(this),event)",-->
-              <!--:onmouseout => "message_titile_hide($(this))" %>-->
-            </li>
-          </div>
-          <li class="homepageNewsTime fr"><%= time_tag(ma.created_at).html_safe %> </li>
-        </ul>
-    <% end %>
-    <!-- 学生追加作品附件 -->
-    <% if ma.course_message_type == "StudentWork" && ma.status == 2 && ma.course_message %>
-        <ul class="homepageNewsList fl">
-          <div class="longMessageWidth">
-            <li class="homepageNewsPortrait fl">
-              <%= link_to image_tag(url_to_avatar(ma.course_message.user), :width => "30", :height => "30"), user_path(ma.course_message.user), :target => '_blank' %>
-            </li>
-            <li class="homepageNewsPubType fl">
-              <%= link_to ma.course_message.user.show_name+ "同学",
-                          user_path(ma.course_message.user), :class => "newsBlue homepageNewsPublisher", :target => '_blank' %>
-              <span class="homepageNewsType fl">追加新附件了：</span>
-            </li>
-            <li class="messageInformationContents">
-              <%= link_to "作业标题：" + ma.course_message.homework_common.name, student_work_index_path(:homework => ma.course_message.homework_common_id, :show_work_id => ma.course_message_id, :tab => 2),
-                          :class =>"#{ma.viewed == 0 ? "newsBlack" : "newsGrey"}", :target => '_blank' %>
-              <!--:onmouseover => "message_titile_show($(this),event)",-->
-              <!--:onmouseout => "message_titile_hide($(this))" %>-->
-            </li>
-          </div>
-          <li class="homepageNewsTime fr"><%= time_tag(ma.created_at).html_safe %> </li>
-        </ul>
-    <% end %>
-    <!-- 匿评申诉 -->
-    <% if ma.course_message_type == "StudentWorksScoresAppeal" && ma.course_message %>
-        <ul class="homepageNewsList fl">
-         <div class="longMessageWidth">
-          <li class="homepageNewsPortrait fl">
-            <%=link_to image_tag(url_to_avatar(""), :width => "30", :height => "30"), "javascript:void(0);", :target => '_blank' %>
-          </li>
-          <li class="homepageNewsPubType fl">
-            <% if ma.status == 1 %>
+<% if ma.course_message_type == "StudentWork" && ma.status == 1 && ma.course_message %>
+    <ul class="homepageNewsList fl">
+      <div class="longMessageWidth">
+        <li class="homepageNewsPortrait fl">
+          <%= link_to image_tag(url_to_avatar(ma.course_message.user), :width => "30", :height => "30"), user_path(ma.course_message.user), :target => '_blank' %>
+        </li>
+        <li class="homepageNewsPubType fl">
+          <%= link_to ma.course_message.user.lastname + ma.course_message.user.firstname + "同学",
+                      user_path(ma.course_message.user), :class => "newsBlue homepageNewsPublisher", :target => '_blank' %>
+          <span class="homepageNewsType fl">重新提交了作品：</span>
+        </li>
+        <li class="messageInformationContents">
+          <%= link_to "作业标题：" + ma.course_message.name, student_work_index_path(:homework => ma.course_message.homework_common_id, :show_work_id => ma.course_message_id, :tab => 2),
+                      :class =>"#{ma.viewed == 0 ? "newsBlack" : "newsGrey"}", :target => '_blank' %>
+          <%#= link_to truncate(ma.course_message.name,:length=>25)+'(失败原因：提交作品的人数低于2人)', student_work_index_path(:homework => ma.course_message.id), :class => "#{ma.viewed == 0 ? "c_red" : "newsGrey "}" %>
+          <!--:onmouseover => "message_titile_show($(this),event)",-->
+          <!--:onmouseout => "message_titile_hide($(this))" %>-->
+        </li>
+      </div>
+      <li class="homepageNewsTime fr"><%= time_tag(ma.created_at).html_safe %> </li>
+    </ul>
+<% end %>
+<!-- 学生追加作品附件 -->
+<% if ma.course_message_type == "StudentWork" && ma.status == 2 && ma.course_message %>
+    <ul class="homepageNewsList fl">
+      <div class="longMessageWidth">
+        <li class="homepageNewsPortrait fl">
+          <%= link_to image_tag(url_to_avatar(ma.course_message.user), :width => "30", :height => "30"), user_path(ma.course_message.user), :target => '_blank' %>
+        </li>
+        <li class="homepageNewsPubType fl">
+          <%= link_to ma.course_message.user.show_name+ "同学",
+                      user_path(ma.course_message.user), :class => "newsBlue homepageNewsPublisher", :target => '_blank' %>
+          <span class="homepageNewsType fl">追加新附件了：</span>
+        </li>
+        <li class="messageInformationContents">
+          <%= link_to "作业标题：" + ma.course_message.homework_common.name, student_work_index_path(:homework => ma.course_message.homework_common_id, :show_work_id => ma.course_message_id, :tab => 2),
+                      :class =>"#{ma.viewed == 0 ? "newsBlack" : "newsGrey"}", :target => '_blank' %>
+          <!--:onmouseover => "message_titile_show($(this),event)",-->
+          <!--:onmouseout => "message_titile_hide($(this))" %>-->
+        </li>
+      </div>
+      <li class="homepageNewsTime fr"><%= time_tag(ma.created_at).html_safe %> </li>
+    </ul>
+<% end %>
+<!-- 匿评申诉 -->
+<% if ma.course_message_type == "StudentWorksScoresAppeal" && ma.course_message %>
+    <ul class="homepageNewsList fl">
+      <div class="longMessageWidth">
+        <li class="homepageNewsPortrait fl">
+          <%=link_to image_tag(url_to_avatar(""), :width => "30", :height => "30"), "javascript:void(0);", :target => '_blank' %>
+        </li>
+        <li class="homepageNewsPubType fl">
+          <% if ma.status == 1 %>
               <span class="newsBlue homepageNewsPublisher">匿名用户</span>
-            <% elsif ma.status == 3 || ma.status == 4 %>
-                <% deal_user = User.find ma.apply_result %>
-                <%= link_to deal_user.show_name, user_path(deal_user), :class => "newsBlue homepageNewsPublisher", :target => '_blank' %>
-            <% end %>
-            <span class="<%= ma.viewed == 0 ? "homepageNewsTypeNotRead fl" : "homepageNewsType fl" %>">
+          <% elsif ma.status == 3 || ma.status == 4 %>
+              <% deal_user = User.find ma.apply_result %>
+              <%= link_to deal_user.show_name, user_path(deal_user), :class => "newsBlue homepageNewsPublisher", :target => '_blank' %>
+          <% end %>
+          <span class="<%= ma.viewed == 0 ? "homepageNewsTypeNotRead fl" : "homepageNewsType fl" %>">
               <% if ma.status == 1 %>
               对您的评阅发起申诉：
               <% elsif ma.status == 3 %>
@@ -648,68 +647,68 @@
               拒绝申诉：
               <% end %>
             </span>
-          </li>
-          <li class="messageInformationContents">
-            <%= link_to ma.course_message.student_works_score.student_work.homework_common.name, student_work_index_path(:homework => ma.course_message.student_works_score.student_work.homework_common_id, :show_work_id => ma.course_message.student_works_score.student_work_id, :tab => 2),
-                        :class =>"#{ma.viewed == 0 ? "newsBlack" : "newsGrey"}", :target => '_blank' %>
-          </li>
-         </div>
-          <li class="homepageNewsTime fr"><%= time_tag(ma.created_at).html_safe %> </li>
-        </ul>
-    <% end %>
-    <!-- 创建课程消息 -->
-    <% if ma.course_message_type == "Course" && ma.course_message %>
-        <ul class="homepageNewsList fl">
-          <div class="longMessageWidth">
-            <li class="homepageNewsPortrait fl">
-              <div class="navHomepageLogo fl"><%= image_tag("/images/trustie_logo1.png", width: "30px", height: "30px", class: "mt3") %></div>
-            </li>
-            <li class="homepageNewsPubType fl">
-              <span class="newsBlue homepageNewsPublisher">系统提示</span>
-              <span class="homepageNewsType fl">您成功创建了班级：</span>
-            </li>
-            <li class="messageInformationContents">
-              <%= link_to "班级名称：" + ma.course_message.name, course_path(ma.course_message),
-                          :class => "#{ma.viewed==0 ? "newsBlack" : "newsGrey"}", :target => '_blank' %>
-              <!--:onmouseover => "message_titile_show($(this),event)",-->
-              <!--:onmouseout => "message_titile_hide($(this))" %>-->
-            </li>
-          </div>
-          <div style="display: none" class="message_title_red system_message_style">
-            <p>
-              <%= User.current.lastname + User.current.firstname %>老师您好！您成功创建了一个班级，详情如下：
-            </p>
-            <p>班级名称：<%= ma.course_message.name %></p>
-            <p>开课学期：<%= ma.course_message.time.to_s + '年' + ma.course_message.term %></p>
-            <p>班级ID：<span style="color:red;"><%= ma.course_message.id %></span></p>
-            <p>班级密码：<span style="color:red;"><%= ma.course_message.password %></span></p>
-            <p>学时总数：<%= ma.course_message.class_period %></p>
-            <p>创建时间：<%= format_time(ma.course_message.created_at) %></p>
-            <p>您可以点击左上角的“配置”按钮，修改班级基本信息，添加及删除班级成员。您也可以把邀请码告诉学生和其他成员，让他们输入邀请码加入班级。</p>
-            <% if ma.course_message.is_public %>
-                <p>您的班级是公开的，所有人都能访问您的班级。若不想设置为公开，您可以在配置中设置。</p>
-            <% else %>
-                <p>您的班级是私有的，非班级成员不能访问您的班级。如果想设置为公开，您可以在配置中设置。</p>
-            <% end %>
-          </div>
-          <li class="homepageNewsTime fr"><%= time_tag(ma.created_at).html_safe %> </li>
-        </ul>
-    <% end %>
+        </li>
+        <li class="messageInformationContents">
+          <%= link_to ma.course_message.student_works_score.student_work.homework_common.name, student_work_index_path(:homework => ma.course_message.student_works_score.student_work.homework_common_id, :show_work_id => ma.course_message.student_works_score.student_work_id, :tab => 2),
+                      :class =>"#{ma.viewed == 0 ? "newsBlack" : "newsGrey"}", :target => '_blank' %>
+        </li>
+      </div>
+      <li class="homepageNewsTime fr"><%= time_tag(ma.created_at).html_safe %> </li>
+    </ul>
+<% end %>
+<!-- 创建课程消息 -->
+<% if ma.course_message_type == "Course" && ma.course_message %>
+    <ul class="homepageNewsList fl">
+      <div class="longMessageWidth">
+        <li class="homepageNewsPortrait fl">
+          <div class="navHomepageLogo fl"><%= image_tag("/images/trustie_logo1.png", width: "30px", height: "30px", class: "mt3") %></div>
+        </li>
+        <li class="homepageNewsPubType fl">
+          <span class="newsBlue homepageNewsPublisher">系统提示</span>
+          <span class="homepageNewsType fl">您成功创建了班级：</span>
+        </li>
+        <li class="messageInformationContents">
+          <%= link_to "班级名称：" + ma.course_message.name, course_path(ma.course_message),
+                      :class => "#{ma.viewed==0 ? "newsBlack" : "newsGrey"}", :target => '_blank' %>
+          <!--:onmouseover => "message_titile_show($(this),event)",-->
+          <!--:onmouseout => "message_titile_hide($(this))" %>-->
+        </li>
+      </div>
+      <div style="display: none" class="message_title_red system_message_style">
+        <p>
+          <%= User.current.lastname + User.current.firstname %>老师您好！您成功创建了一个班级，详情如下：
+        </p>
+        <p>班级名称：<%= ma.course_message.name %></p>
+        <p>开课学期：<%= ma.course_message.time.to_s + '年' + ma.course_message.term %></p>
+        <p>班级ID：<span style="color:red;"><%= ma.course_message.id %></span></p>
+        <p>班级密码：<span style="color:red;"><%= ma.course_message.password %></span></p>
+        <p>学时总数：<%= ma.course_message.class_period %></p>
+        <p>创建时间：<%= format_time(ma.course_message.created_at) %></p>
+        <p>您可以点击左上角的“配置”按钮，修改班级基本信息，添加及删除班级成员。您也可以把邀请码告诉学生和其他成员，让他们输入邀请码加入班级。</p>
+        <% if ma.course_message.is_public %>
+            <p>您的班级是公开的，所有人都能访问您的班级。若不想设置为公开，您可以在配置中设置。</p>
+        <% else %>
+            <p>您的班级是私有的，非班级成员不能访问您的班级。如果想设置为公开，您可以在配置中设置。</p>
+        <% end %>
+      </div>
+      <li class="homepageNewsTime fr"><%= time_tag(ma.created_at).html_safe %> </li>
+    </ul>
+<% end %>
 
-    <!--# ma.course_message_id 是用户id-->
-    <% if ma.course_message_type == "JoinCourseRequest" && !ma.nil? %>
-        <ul class="homepageNewsList fl" id="course_message_join_<%=ma.id %>">
-          <%= render :partial => 'join_course_course_message', :locals => {:ma => ma} %>
-        </ul>
-    <% end %>
-    <% if ma.course_message_type == "CourseRequestDealResult" %>
-        <ul class="homepageNewsList fl">
-          <div class="shortMessageWidth">
-            <li class="homepageNewsPortrait fl">
-              <%= link_to image_tag(url_to_avatar(User.find(ma.user_id)), :width => "30", :height => "30"), user_path(User.find(ma.user_id)), :target => '_blank' %>
-              <!--<div class="navHomepageLogo fl"><%#= image_tag("/images/trustie_logo1.png", width: "30px", height: "30px", class: "mt3") %></div>-->
-            </li>
-            <li class="homepageNewsPubType fl">
+<!--# ma.course_message_id 是用户id-->
+<% if ma.course_message_type == "JoinCourseRequest" && !ma.nil? %>
+    <ul class="homepageNewsList fl" id="course_message_join_<%=ma.id %>">
+      <%= render :partial => 'join_course_course_message', :locals => {:ma => ma} %>
+    </ul>
+<% end %>
+<% if ma.course_message_type == "CourseRequestDealResult" %>
+    <ul class="homepageNewsList fl">
+      <div class="shortMessageWidth">
+        <li class="homepageNewsPortrait fl">
+          <%= link_to image_tag(url_to_avatar(User.find(ma.user_id)), :width => "30", :height => "30"), user_path(User.find(ma.user_id)), :target => '_blank' %>
+          <!--<div class="navHomepageLogo fl"><%#= image_tag("/images/trustie_logo1.png", width: "30px", height: "30px", class: "mt3") %></div>-->
+        </li>
+        <li class="homepageNewsPubType fl">
               <span class="newsBlue homepageNewsPublisher">
                 <%=link_to User.find(ma.user_id).show_name, user_path(User.find(ma.user_id)),
                            :class => "newsBlue homepageNewsPublisher", :target => '_blank' %>
@@ -717,209 +716,208 @@
             <span class="homepageNewsType fl">
                 申请以“<%= ma.content.include?('9') ? '教师' : '教辅' %>”身份加入：
             </span>
-            </li>
-            <li class="messageInformationContents">
-              <%= link_to  Course.find(ma.course_id).name, course_path(Course.find(ma.course_id)),
-                           :class => "#{ma.viewed==0 ? "newsBlack" : "newsGrey"}", :target => '_blank' %>
-              <!--:onmouseover => "message_titile_show($(this),event)",-->
-              <!--:onmouseout => "message_titile_hide($(this))" %>-->
-            </li>
-          </div>
-          <li class="messageOperateContents fl">
-            <% if ma.status == 1 %>
-                <span class="user_hiddent fl" title="<%=User.find(ma.course_message_id).show_name %>"><%= User.find(ma.course_message_id).show_name %></span><span>已通过</span>
-            <% else %>
-                <span class="user_hiddent fl" title="<%=User.find(ma.course_message_id).show_name %>"><%= User.find(ma.course_message_id).show_name %></span><span>已拒绝</span>
-            <% end %>
-          </li>
-          <li class="homepageNewsTime fr"><%= time_tag(ma.created_at).html_safe %> </li>
-        </ul>
-    <% end %>
+        </li>
+        <li class="messageInformationContents">
+          <%= link_to  Course.find(ma.course_id).name, course_path(Course.find(ma.course_id)),
+                       :class => "#{ma.viewed==0 ? "newsBlack" : "newsGrey"}", :target => '_blank' %>
+          <!--:onmouseover => "message_titile_show($(this),event)",-->
+          <!--:onmouseout => "message_titile_hide($(this))" %>-->
+        </li>
+      </div>
+      <li class="messageOperateContents fl">
+        <% if ma.status == 1 %>
+            <span class="user_hiddent fl" title="<%=User.find(ma.course_message_id).show_name %>"><%= User.find(ma.course_message_id).show_name %></span><span>已通过</span>
+        <% else %>
+            <span class="user_hiddent fl" title="<%=User.find(ma.course_message_id).show_name %>"><%= User.find(ma.course_message_id).show_name %></span><span>已拒绝</span>
+        <% end %>
+      </li>
+      <li class="homepageNewsTime fr"><%= time_tag(ma.created_at).html_safe %> </li>
+    </ul>
+<% end %>
 
-    <!--被老师拉入课程-->
-    <% if ma.course_message_type == "JoinCourse" and ma.status == 0 %>
-        <ul class="homepageNewsList fl">
-          <div class="longMessageWidth">
-            <li class="homepageNewsPortrait fl">
-              <%= link_to image_tag(url_to_avatar(User.find(ma.course_message_id)), :width => "30", :height => "30"), user_path(ma.course_message_id), :target => '_blank' %>
-            </li>
-            <li class="homepageNewsPubType fl">
-              <%=link_to User.find(ma.course_message_id).show_name, user_path(User.find(ma.course_message_id)), :class => "newsBlue homepageNewsPublisher", :target => '_blank' %>
-              <span class="homepageNewsType fl">将您加入了班级：</span>
-            </li>
-            <li class="messageInformationContents">
-              <%= link_to ma.course.name, course_member_path(ma.course), :class => "#{ma.viewed == 0 ? "newsBlack" : "newsGrey"}", :target => '_blank' %>
-              <!--:onmouseover => "message_titile_show($(this),event)",-->
-              <!--:onmouseout => "message_titile_hide($(this))" %>-->
-            </li>
-          </div>
-          <div style="display: none" class="message_title_red system_message_style">
-            <% if ma.course.is_public? || User.current.member_of_course?(ma.course) || User.current.admin? %>
-                <% teacher = User.find(ma.course_message_id) %>
-                <p><%= teacher.show_name %>(<%= teacher %>)老师把您加入了班级，详情如下：</p>
-                <p>班级名称：<%= ma.course.name %></p>
-                <p>开课学期：<%= ma.course.time.to_s + '年'+ ma.course.term %></p>
-                <p>班级ID：<%= ma.course.id %></p>
-                <p>课时总数：<%= ma.course.class_period %></p>
-            <% else %>
-                <p>
-                  您已经被移出该私有班级，非班级成员没有权限访问私有班级
-                </p>
-            <% end %>
-          </div>
-          <li class="homepageNewsTime fr"><%= time_tag(ma.created_at).html_safe %> </li>
-        </ul>
-    <% end %>
+<!--被老师拉入课程-->
+<% if ma.course_message_type == "JoinCourse" and ma.status == 0 %>
+    <ul class="homepageNewsList fl">
+      <div class="longMessageWidth">
+        <li class="homepageNewsPortrait fl">
+          <%= link_to image_tag(url_to_avatar(User.find(ma.course_message_id)), :width => "30", :height => "30"), user_path(ma.course_message_id), :target => '_blank' %>
+        </li>
+        <li class="homepageNewsPubType fl">
+          <%=link_to User.find(ma.course_message_id).show_name, user_path(User.find(ma.course_message_id)), :class => "newsBlue homepageNewsPublisher", :target => '_blank' %>
+          <span class="homepageNewsType fl">将您加入了班级：</span>
+        </li>
+        <li class="messageInformationContents">
+          <%= link_to ma.course.name, course_member_path(ma.course), :class => "#{ma.viewed == 0 ? "newsBlack" : "newsGrey"}", :target => '_blank' %>
+          <!--:onmouseover => "message_titile_show($(this),event)",-->
+          <!--:onmouseout => "message_titile_hide($(this))" %>-->
+        </li>
+      </div>
+      <div style="display: none" class="message_title_red system_message_style">
+        <% if ma.course.is_public? || User.current.member_of_course?(ma.course) || User.current.admin? %>
+            <% teacher = User.find(ma.course_message_id) %>
+            <p><%= teacher.show_name %>(<%= teacher %>)老师把您加入了班级，详情如下：</p>
+            <p>班级名称：<%= ma.course.name %></p>
+            <p>开课学期：<%= ma.course.time.to_s + '年'+ ma.course.term %></p>
+            <p>班级ID：<%= ma.course.id %></p>
+            <p>课时总数：<%= ma.course.class_period %></p>
+        <% else %>
+            <p>
+              您已经被移出该私有班级，非班级成员没有权限访问私有班级
+            </p>
+        <% end %>
+      </div>
+      <li class="homepageNewsTime fr"><%= time_tag(ma.created_at).html_safe %> </li>
+    </ul>
+<% end %>
 
-    <!--被老师拉入课程-->
-    <% if ma.course_message_type == "JoinCourse" and ma.status == 1 %>
-        <ul class="homepageNewsList fl">
-          <div class="longMessageWidth">
-            <li class="homepageNewsPortrait fl">
-              <div class="navHomepageLogo fl"><%= image_tag("/images/trustie_logo1.png", width: "30px", height: "30px", class: "mt3") %></div>
-            </li>
-            <li class="homepageNewsPubType fl">
-              <span class="newsBlue homepageNewsPublisher">系统提示</span>
-              <span class="homepageNewsType fl">您增加了新的班级成员：</span>
-            </li>
-            <li class="messageInformationContents">
-              <%= link_to User.find(ma.course_message_id).login+"("+(User.find(ma.course_message_id).realname ?  User.find(ma.course_message_id).realname : User.find(ma.course_message_id).login) +")",
-                          {:controller => 'courses', :action => 'settings', :id => ma.course_id, :tab=>'member'},
-                          :class => "#{ma.viewed == 0 ? "newsBlack" : "newsGrey"}",
-                          :target => '_blank' %>
-              <!--:onmouseover => "message_titile_show($(this),event)",-->
-              <!--:onmouseout => "message_titile_hide($(this))" %>-->
-            </li>
-          </div>
-          <div style="display: none" class="message_title_red system_message_style">
-            <% if ma.course.is_public? || User.current.member_of_course?(ma.course) || User.current.admin? %>
-                <p>您增加了新的班级成员，详情如下：</p>
-                <p>成员：<%= User.find(ma.course_message_id).login+"("+(User.find(ma.course_message_id).realname ?  User.find(ma.course_message_id).realname : User.find(ma.course_message_id).login) +")" %></p>
-                <p>班级名称：<%= ma.course.name %></p>
-                <p>开课学期：<%= ma.course.time.to_s + '年'+ ma.course.term %></p>
-                <p>班级ID：<%= ma.course.id %></p>
-                <p>课时总数：<%= ma.course.class_period %></p>
-            <% else %>
-                <p>
-                  您已经被移出该私有班级，非班级成员没有权限访问私有班级
-                </p>
-            <% end %>
-          </div>
-          <li class="homepageNewsTime fr"><%= time_tag(ma.created_at).html_safe %> </li>
-        </ul>
-    <% end %>
+<!--被老师拉入课程-->
+<% if ma.course_message_type == "JoinCourse" and ma.status == 1 %>
+    <ul class="homepageNewsList fl">
+      <div class="longMessageWidth">
+        <li class="homepageNewsPortrait fl">
+          <div class="navHomepageLogo fl"><%= image_tag("/images/trustie_logo1.png", width: "30px", height: "30px", class: "mt3") %></div>
+        </li>
+        <li class="homepageNewsPubType fl">
+          <span class="newsBlue homepageNewsPublisher">系统提示</span>
+          <span class="homepageNewsType fl">您增加了新的班级成员：</span>
+        </li>
+        <li class="messageInformationContents">
+          <%= link_to User.find(ma.course_message_id).login+"("+(User.find(ma.course_message_id).realname ?  User.find(ma.course_message_id).realname : User.find(ma.course_message_id).login) +")",
+                      {:controller => 'courses', :action => 'settings', :id => ma.course_id, :tab=>'member'},
+                      :class => "#{ma.viewed == 0 ? "newsBlack" : "newsGrey"}",
+                      :target => '_blank' %>
+          <!--:onmouseover => "message_titile_show($(this),event)",-->
+          <!--:onmouseout => "message_titile_hide($(this))" %>-->
+        </li>
+      </div>
+      <div style="display: none" class="message_title_red system_message_style">
+        <% if ma.course.is_public? || User.current.member_of_course?(ma.course) || User.current.admin? %>
+            <p>您增加了新的班级成员，详情如下：</p>
+            <p>成员：<%= User.find(ma.course_message_id).login+"("+(User.find(ma.course_message_id).realname ?  User.find(ma.course_message_id).realname : User.find(ma.course_message_id).login) +")" %></p>
+            <p>班级名称：<%= ma.course.name %></p>
+            <p>开课学期：<%= ma.course.time.to_s + '年'+ ma.course.term %></p>
+            <p>班级ID：<%= ma.course.id %></p>
+            <p>课时总数：<%= ma.course.class_period %></p>
+        <% else %>
+            <p>
+              您已经被移出该私有班级，非班级成员没有权限访问私有班级
+            </p>
+        <% end %>
+      </div>
+      <li class="homepageNewsTime fr"><%= time_tag(ma.created_at).html_safe %> </li>
+    </ul>
+<% end %>
 
-    <!--被老师移出课程-->
-    <% if ma.course_message_type == "RemoveFromCourse" %>
-        <ul class="homepageNewsList fl">
-          <div class="longMessageWidth">
-            <li class="homepageNewsPortrait fl">
-              <%=link_to image_tag(url_to_avatar(User.find(ma.course_message_id)), :width => "30", :height => "30"), user_path(ma.course_message_id), :target => '_blank' %>
-            </li>
-            <li class="homepageNewsPubType fl">
-              <%=link_to User.find(ma.course_message_id).show_name, user_path(User.find(ma.course_message_id)), :class => "newsBlue homepageNewsPublisher", :target => '_blank' %>
-              <span class="homepageNewsType fl">将您移出了班级：</span>
-            </li>
-            <li class="messageInformationContents">
-              <%= link_to ma.course.name, member_course_path(ma.course), :class => "#{ma.viewed == 0 ? "newsBlack" : "newsGrey"}", :target => '_blank' %>
-              <!--:onmouseover => "message_titile_show($(this),event)",-->
-              <!--:onmouseout => "message_titile_hide($(this))" %>-->
-            </li>
-          </div>
-          <div style="display: none" class="message_title_red system_message_style">
-            <% if ma.course.is_public? || User.current.member_of?(ma.course) || User.current.admin? %>
-                <p>您已被<%= User.find(ma.course_message_id).show_name %>老师移出了班级，详情如下：</p>
-                <p>班级名称：<%= ma.course.name %></p>
-                <p>开课学期：<%= ma.course.time.to_s + '年'+ ma.course.term %></p>
-                <% if !ma.content.nil? %>
-                    <p>担任角色：<%= ma.content %></p>
-                <% end %>
-                <p>学时总数：<%= ma.course.class_period %></p>
-            <% else %>
-                <p>
-                  您已经被移出该私有班级，非班级成员没有权限访问私有班级
-                </p>
+<!--被老师移出课程-->
+<% if ma.course_message_type == "RemoveFromCourse" %>
+    <ul class="homepageNewsList fl">
+      <div class="longMessageWidth">
+        <li class="homepageNewsPortrait fl">
+          <%=link_to image_tag(url_to_avatar(User.find(ma.course_message_id)), :width => "30", :height => "30"), user_path(ma.course_message_id), :target => '_blank' %>
+        </li>
+        <li class="homepageNewsPubType fl">
+          <%=link_to User.find(ma.course_message_id).show_name, user_path(User.find(ma.course_message_id)), :class => "newsBlue homepageNewsPublisher", :target => '_blank' %>
+          <span class="homepageNewsType fl">将您移出了班级：</span>
+        </li>
+        <li class="messageInformationContents">
+          <%= link_to ma.course.name, member_course_path(ma.course), :class => "#{ma.viewed == 0 ? "newsBlack" : "newsGrey"}", :target => '_blank' %>
+          <!--:onmouseover => "message_titile_show($(this),event)",-->
+          <!--:onmouseout => "message_titile_hide($(this))" %>-->
+        </li>
+      </div>
+      <div style="display: none" class="message_title_red system_message_style">
+        <% if ma.course.is_public? || User.current.member_of?(ma.course) || User.current.admin? %>
+            <p>您已被<%= User.find(ma.course_message_id).show_name %>老师移出了班级，详情如下：</p>
+            <p>班级名称：<%= ma.course.name %></p>
+            <p>开课学期：<%= ma.course.time.to_s + '年'+ ma.course.term %></p>
+            <% if !ma.content.nil? %>
+                <p>担任角色：<%= ma.content %></p>
             <% end %>
-          </div>
-          <li class="homepageNewsTime fr"><%= time_tag(ma.created_at).html_safe %> </li>
-        </ul>
-    <% end %>
+            <p>学时总数：<%= ma.course.class_period %></p>
+        <% else %>
+            <p>
+              您已经被移出该私有班级，非班级成员没有权限访问私有班级
+            </p>
+        <% end %>
+      </div>
+      <li class="homepageNewsTime fr"><%= time_tag(ma.created_at).html_safe %> </li>
+    </ul>
+<% end %>
 
-    <!--老师发布测验 发给学生看-->
-    <% if ma.course_message_type == "Exercise" && ma.status == 2 && ma.course_message %>
-        <ul class="homepageNewsList fl">
-          <div class="longMessageWidth">
-            <li class="homepageNewsPortrait fl">
-              <%=link_to image_tag(url_to_avatar(ma.course_message.user), :width => "30", :height => "30"), user_path(ma.course_message.user), :target => '_blank' %>
-            </li>
-            <li class="homepageNewsPubType fl">
+<!--老师发布测验 发给学生看-->
+<% if ma.course_message_type == "Exercise" && ma.status == 2 && ma.course_message %>
+    <ul class="homepageNewsList fl">
+      <div class="longMessageWidth">
+        <li class="homepageNewsPortrait fl">
+          <%=link_to image_tag(url_to_avatar(ma.course_message.user), :width => "30", :height => "30"), user_path(ma.course_message.user), :target => '_blank' %>
+        </li>
+        <li class="homepageNewsPubType fl">
             <span><%=link_to ma.course_message.user.lastname + ma.course_message.user.firstname + "老师",
                              user_path(ma.course_message.user), :class => "newsBlue homepageNewsPublisher", :target => '_blank' %></span>
-              <span class="homepageNewsType fl">发布了班级测验：</span>
-            </li>
-            <li class="messageInformationContents">
-              <%= link_to "测验题目：" + ma.course_message.exercise_name, exercise_path(:id => ma.course_message.id), :class =>"#{ma.viewed == 0 ? "newsBlack" : "newsGrey"}", :target => '_blank' %>
-              <!--:onmouseover =>"message_titile_show($(this),event)",-->
-              <!--:onmouseout => "message_titile_hide($(this))"%>-->
-            </li>
-          </div>
-          <div  style="display: none" class="message_title_red system_message_style">
-            <p>
-              <%= User.current.lastname + User.current.firstname %><%= User.current.allowed_to?(:as_teacher,ma.course_message.course) ? '老师':'同学'%>您好！
-              <%= User.current.eql?(ma.course_message.user)?"您":(ma.course_message.user.lastname + ma.course_message.user.firstname+"老师") %>发布了班级测验 ，测验详情如下：
-            </p>
-            <ul class="ul_normal_color">
-              <li>班级名称：<%= ma.course_message.course.name %>(<%= ma.course_message.course.time.to_s + '年'+ ma.course_message.course.term %>)</li>
-              <li>测验标题：<%= ma.course_message.exercise_name %></li>
-              <!--<li>测验描述：<%#= ma.course_message.exercise_description %></li>-->
-              <!--<li>测验状态：<%#= ma.course_message.exercise_status == 1 ? '未发布':'已发布'%></li>-->
-              <!--<%# if ma.course_message.publish_time %>-->
-              <!--<li>发布时间：<%#= ma.course_message.publish_time.to_s.gsub("+0800","").to_datetime.strftime("%Y-%m-%d %H:%M:%S") %></li>-->
-              <!--<%# end %>-->
-              <li>截止时间：<%= ma.course_message.end_time.to_s.gsub("+0800","").to_datetime.strftime("%Y-%m-%d %H:%M:%S") %></li>
-              <li>答题时长：<%= ma.course_message.time == -1 ? '不限时' : ma.course_message.time.to_s + '分钟' %></li>
-              <% if !User.current.allowed_to?(:as_teacher,ma.course_message.course)%>
-                  <p>请记得在截止时间前完成测验噢，辛苦啦！</p>
-              <% end %>
-            </ul>
-          </div>
-          <li class="homepageNewsTime fr"><%= time_tag(ma.created_at).html_safe %> </li>
+          <span class="homepageNewsType fl">发布了班级测验：</span>
+        </li>
+        <li class="messageInformationContents">
+          <%= link_to "测验题目：" + ma.course_message.exercise_name, exercise_path(:id => ma.course_message.id), :class =>"#{ma.viewed == 0 ? "newsBlack" : "newsGrey"}", :target => '_blank' %>
+          <!--:onmouseover =>"message_titile_show($(this),event)",-->
+          <!--:onmouseout => "message_titile_hide($(this))"%>-->
+        </li>
+      </div>
+      <div  style="display: none" class="message_title_red system_message_style">
+        <p>
+          <%= User.current.lastname + User.current.firstname %><%= User.current.allowed_to?(:as_teacher,ma.course_message.course) ? '老师':'同学'%>您好！
+          <%= User.current.eql?(ma.course_message.user)?"您":(ma.course_message.user.lastname + ma.course_message.user.firstname+"老师") %>发布了班级测验 ，测验详情如下：
+        </p>
+        <ul class="ul_normal_color">
+          <li>班级名称：<%= ma.course_message.course.name %>(<%= ma.course_message.course.time.to_s + '年'+ ma.course_message.course.term %>)</li>
+          <li>测验标题：<%= ma.course_message.exercise_name %></li>
+          <!--<li>测验描述：<%#= ma.course_message.exercise_description %></li>-->
+          <!--<li>测验状态：<%#= ma.course_message.exercise_status == 1 ? '未发布':'已发布'%></li>-->
+          <!--<%# if ma.course_message.publish_time %>-->
+          <!--<li>发布时间：<%#= ma.course_message.publish_time.to_s.gsub("+0800","").to_datetime.strftime("%Y-%m-%d %H:%M:%S") %></li>-->
+          <!--<%# end %>-->
+          <li>截止时间：<%= ma.course_message.end_time.to_s.gsub("+0800","").to_datetime.strftime("%Y-%m-%d %H:%M:%S") %></li>
+          <li>答题时长：<%= ma.course_message.time == -1 ? '不限时' : ma.course_message.time.to_s + '分钟' %></li>
+          <% if !User.current.allowed_to?(:as_teacher,ma.course_message.course)%>
+              <p>请记得在截止时间前完成测验噢，辛苦啦！</p>
+          <% end %>
         </ul>
-    <% end %>
+      </div>
+      <li class="homepageNewsTime fr"><%= time_tag(ma.created_at).html_safe %> </li>
+    </ul>
+<% end %>
 
 
-    <% if ma.course_message_type == "Exercise" && ma.status == 3 && ma.course_message %>
-        <ul class="homepageNewsList fl">
-          <div class="shortMessageWidth">
-            <li class="homepageNewsPortrait fl">
-              <%=link_to image_tag(url_to_avatar(ma.course_message.user), :width => "30", :height => "30"), user_path(ma.course_message.user), :target => '_blank' %></li>
-            <li class="homepageNewsPubType fl">
+<% if ma.course_message_type == "Exercise" && ma.status == 3 && ma.course_message %>
+    <ul class="homepageNewsList fl">
+      <div class="shortMessageWidth">
+        <li class="homepageNewsPortrait fl">
+          <%=link_to image_tag(url_to_avatar(ma.course_message.user), :width => "30", :height => "30"), user_path(ma.course_message.user), :target => '_blank' %></li>
+        <li class="homepageNewsPubType fl">
            <span><%= link_to ma.course_message.user.lastname + ma.course_message.user.firstname + "老师",
                              user_path(ma.course_message.user), :class => "newsBlue homepageNewsPublisher", :target => '_blank' %></span>
-              <span class="homepageNewsType fl">发布的测验：</span></li>
-            <li class="messageInformationContents">
-              <%= link_to "测验题目：" + ma.course_message.exercise_name, exercise_path(:id => ma.course_message.id), :class =>"#{ma.viewed == 0 ? "newsBlack" : "newsGrey"}", :target => '_blank' %>
-              <!--:onmouseover =>"message_titile_show($(this),event)",-->
-              <!--:onmouseout => "message_titile_hide($(this))"%>-->
+          <span class="homepageNewsType fl">发布的测验：</span></li>
+        <li class="messageInformationContents">
+          <%= link_to "测验题目：" + ma.course_message.exercise_name, exercise_path(:id => ma.course_message.id), :class =>"#{ma.viewed == 0 ? "newsBlack" : "newsGrey"}", :target => '_blank' %>
+          <!--:onmouseover =>"message_titile_show($(this),event)",-->
+          <!--:onmouseout => "message_titile_hide($(this))"%>-->
 
-            </li>
-          </div>
-          <div  style="display: none" class="message_title_red system_message_style">
-            <p>
-              <%= User.current.lastname + User.current.firstname %><%= User.current.allowed_to?(:as_teacher,ma.course_message.course) ? '老师':'同学'%>您好！
-              <%= User.current.eql?(ma.course_message.user)?"您":(ma.course_message.user.lastname + ma.course_message.user.firstname+"老师") %>发布的班级测验截止时间快到了，测验详情如下：
-            </p>
+        </li>
+      </div>
+      <div  style="display: none" class="message_title_red system_message_style">
+        <p>
+          <%= User.current.lastname + User.current.firstname %><%= User.current.allowed_to?(:as_teacher,ma.course_message.course) ? '老师':'同学'%>您好！
+          <%= User.current.eql?(ma.course_message.user)?"您":(ma.course_message.user.lastname + ma.course_message.user.firstname+"老师") %>发布的班级测验截止时间快到了，测验详情如下：
+        </p>
 
-            <ul class="ul_normal_color">
-              <li>班级名称：<%= ma.course_message.course.name %>(<%= ma.course_message.course.time.to_s + '年'+ ma.course_message.course.term %>)</li>
-              <li>测验标题：<%= ma.course_message.exercise_name %></li>
-              <li>截止时间：<%= ma.course_message.end_time.to_s.gsub("+0800","").to_datetime.strftime("%Y-%m-%d %H:%M:%S") %></li>
-              <li>答题时长：<%= ma.course_message.time == -1 ? '无限制' : ma.course_message.time.to_s + '分钟' %></li>
-              <p>请及时完成班级测验，辛苦啦！</p>
-            </ul>
-          </div>
-          <li class="messageOperateContents fl" title="截止时间快到啦">截止时间快到啦 </li>
-          <li class="homepageNewsTime fr"><%= time_tag(ma.created_at).html_safe %> </li>
+        <ul class="ul_normal_color">
+          <li>班级名称：<%= ma.course_message.course.name %>(<%= ma.course_message.course.time.to_s + '年'+ ma.course_message.course.term %>)</li>
+          <li>测验标题：<%= ma.course_message.exercise_name %></li>
+          <li>截止时间：<%= ma.course_message.end_time.to_s.gsub("+0800","").to_datetime.strftime("%Y-%m-%d %H:%M:%S") %></li>
+          <li>答题时长：<%= ma.course_message.time == -1 ? '无限制' : ma.course_message.time.to_s + '分钟' %></li>
+          <p>请及时完成班级测验，辛苦啦！</p>
         </ul>
-    <% end %>
-<% end %>
\ No newline at end of file
+      </div>
+      <li class="messageOperateContents fl" title="截止时间快到啦">截止时间快到啦 </li>
+      <li class="homepageNewsTime fr"><%= time_tag(ma.created_at).html_safe %> </li>
+    </ul>
+<% end %>
diff --git a/app/views/users/_user_message_forge.html.erb b/app/views/users/_user_message_forge.html.erb
index 4017c063a..e4291c3bd 100644
--- a/app/views/users/_user_message_forge.html.erb
+++ b/app/views/users/_user_message_forge.html.erb
@@ -1,17 +1,37 @@
-<% if ma.class == ForgeMessage %>
-    <!--申请加入项目-->
-    <% if ma.forge_message_type == "AppliedProject" %>
+<% if ma.forge_message_type == "AppliedProject" %>
+    <%#= 这类数据其实已经不要了 %>
+    <ul class="homepageNewsList fl">
+      <div class="longMessageWidth">
+        <li class="homepageNewsPortrait fl">
+          <%= link_to image_tag(url_to_avatar(ma.forge_message.user), :width => "30", :height => "30"), user_path(ma.forge_message.user), :target => '_blank' %>
+        </li>
+        <li class="homepageNewsPubType fl">
+          <%=link_to ma.forge_message.user, user_path(ma.forge_message.user), :class => "newsBlue homepageNewsPublisher", :target => '_blank' %>
+          <span class="homepageNewsType fl">申请加入：</span>
+        </li>
+        <li class="messageInformationContents">
+          <%= link_to ma.project, settings_project_path(:id => ma.project, :tab => "members"), :class => "#{ma.viewed == 0 ? "newsBlack" : "newsGrey"}", :target => '_blank' %>
+          <!--:onmouseover => "message_titile_show($(this),event)",-->
+          <!--:onmouseout => "message_titile_hide($(this))" %>-->
+        </li>
+      </div>
+      <li class="homepageNewsTime fr"><%= time_tag(ma.created_at).html_safe %> </li>
+    </ul>
+<% end %>
+<!--被管理员拉入项目-->
+<% if ma.forge_message_type == "JoinProject" %>
+    <% unless ma.project.nil? %>
         <ul class="homepageNewsList fl">
           <div class="longMessageWidth">
             <li class="homepageNewsPortrait fl">
-              <%= link_to image_tag(url_to_avatar(ma.forge_message.user), :width => "30", :height => "30"), user_path(ma.forge_message.user), :target => '_blank' %>
+              <%=link_to image_tag(url_to_avatar(User.find(ma.forge_message_id)), :width => "30", :height => "30"), user_path(ma.forge_message_id), :target => '_blank' %>
             </li>
             <li class="homepageNewsPubType fl">
-              <%=link_to ma.forge_message.user, user_path(ma.forge_message.user), :class => "newsBlue homepageNewsPublisher", :target => '_blank' %>
-              <span class="homepageNewsType fl">申请加入：</span>
+              <%=link_to User.find(ma.forge_message_id).show_name, user_path(User.find(ma.forge_message_id)), :class => "newsBlue homepageNewsPublisher", :target => '_blank' %>
+              <span class="homepageNewsType fl">将您加入了项目：</span>
             </li>
             <li class="messageInformationContents">
-              <%= link_to ma.project, settings_project_path(:id => ma.project, :tab => "members"), :class => "#{ma.viewed == 0 ? "newsBlack" : "newsGrey"}", :target => '_blank' %>
+              <%= link_to ma.project, project_member_path(ma.project), :class => "#{ma.viewed == 0 ? "newsBlack" : "newsGrey"}", :target => '_blank' %>
               <!--:onmouseover => "message_titile_show($(this),event)",-->
               <!--:onmouseout => "message_titile_hide($(this))" %>-->
             </li>
@@ -19,192 +39,110 @@
           <li class="homepageNewsTime fr"><%= time_tag(ma.created_at).html_safe %> </li>
         </ul>
     <% end %>
-    <!--被管理员拉入项目-->
-    <% if ma.forge_message_type == "JoinProject" %>
-        <% unless ma.project.nil? %>
-            <ul class="homepageNewsList fl">
-              <div class="longMessageWidth">
-                <li class="homepageNewsPortrait fl">
-                  <%=link_to image_tag(url_to_avatar(User.find(ma.forge_message_id)), :width => "30", :height => "30"), user_path(ma.forge_message_id), :target => '_blank' %>
-                </li>
-                <li class="homepageNewsPubType fl">
-                  <%=link_to User.find(ma.forge_message_id).show_name, user_path(User.find(ma.forge_message_id)), :class => "newsBlue homepageNewsPublisher", :target => '_blank' %>
-                  <span class="homepageNewsType fl">将您加入了项目：</span>
-                </li>
-                <li class="messageInformationContents">
-                  <%= link_to ma.project, project_member_path(ma.project), :class => "#{ma.viewed == 0 ? "newsBlack" : "newsGrey"}", :target => '_blank' %>
-                  <!--:onmouseover => "message_titile_show($(this),event)",-->
-                  <!--:onmouseout => "message_titile_hide($(this))" %>-->
-                </li>
-              </div>
-              <li class="homepageNewsTime fr"><%= time_tag(ma.created_at).html_safe %> </li>
-            </ul>
-        <% end %>
+<% end %>
+<!--被管理员移出项目-->
+<% if ma.forge_message_type == "RemoveFromProject" %>
+    <% unless ma.project.nil? %>
+        <ul class="homepageNewsList fl">
+          <div class="longMessageWidth">
+            <li class="homepageNewsPortrait fl">
+              <%=link_to image_tag(url_to_avatar(User.find(ma.forge_message_id)), :width => "30", :height => "30"), user_path(ma.forge_message_id), :target => '_blank' %>
+            </li>
+            <li class="homepageNewsPubType fl">
+              <%=link_to User.find(ma.forge_message_id).show_name, user_path(User.find(ma.forge_message_id)), :class => "newsBlue homepageNewsPublisher", :target => '_blank' %>
+              <span class="homepageNewsType fl">将您移出了项目：</span>
+            </li>
+            <li class="messageInformationContents">
+              <%= link_to ma.project, member_project_path(ma.project), :class => "#{ma.viewed == 0 ? "newsBlack" : "newsGrey"}", :target => '_blank' %>
+              <!--:onmouseover => "message_titile_show($(this),event)",-->
+              <!--:onmouseout => "message_titile_hide($(this))" %>-->
+            </li>
+          </div>
+          <li class="homepageNewsTime fr"><%= time_tag(ma.created_at).html_safe %> </li>
+        </ul>
     <% end %>
-    <!--被管理员移出项目-->
-    <% if ma.forge_message_type == "RemoveFromProject" %>
-        <% unless ma.project.nil? %>
-            <ul class="homepageNewsList fl">
-              <div class="longMessageWidth">
-                <li class="homepageNewsPortrait fl">
-                  <%=link_to image_tag(url_to_avatar(User.find(ma.forge_message_id)), :width => "30", :height => "30"), user_path(ma.forge_message_id), :target => '_blank' %>
-                </li>
-                <li class="homepageNewsPubType fl">
-                  <%=link_to User.find(ma.forge_message_id).show_name, user_path(User.find(ma.forge_message_id)), :class => "newsBlue homepageNewsPublisher", :target => '_blank' %>
-                  <span class="homepageNewsType fl">将您移出了项目：</span>
-                </li>
-                <li class="messageInformationContents">
-                  <%= link_to ma.project, member_project_path(ma.project), :class => "#{ma.viewed == 0 ? "newsBlack" : "newsGrey"}", :target => '_blank' %>
-                  <!--:onmouseover => "message_titile_show($(this),event)",-->
-                  <!--:onmouseout => "message_titile_hide($(this))" %>-->
-                </li>
-              </div>
-              <li class="homepageNewsTime fr"><%= time_tag(ma.created_at).html_safe %> </li>
-            </ul>
-        <% end %>
-    <% end %>
-    <!--邀请加入项目-->
-    <% if ma.forge_message_type == "ProjectInvite" %>
-        <% inviter = User.find(ma.forge_message_id) %>
+<% end %>
+<!--邀请加入项目-->
+<% if ma.forge_message_type == "ProjectInvite" %>
+    <% inviter = User.find(ma.forge_message_id) %>
+    <ul class="homepageNewsList fl">
+      <div class="shortMessageWidth">
+        <li class="homepageNewsPortrait fl">
+          <%=link_to image_tag(url_to_avatar(inviter), :width => "30", :height => "30"), user_path(inviter), :target => '_blank' %>
+        </li>
+        <li class="homepageNewsPubType fl">
+          <%=link_to inviter, user_path(inviter), :class => "newsBlue homepageNewsPublisher", :target => '_blank' %>
+          <span class='<%= ma.viewed == 0 ? 'homepageNewsTypeNotRead fl' : 'homepageNewsType fl' %>'>邀请你加入项目：</span>
+        </li>
+        <li class="messageInformationContents">
+          <%= link_to ma.project, project_path(ma.project),
+                      :class => "#{ma.viewed == 0 ? "newsBlack" : "newsGrey"}",
+                      :target => '_blank',
+                      :title => "ma.project"
+          %>
+          <!--:onmouseover => "message_titile_show($(this),event)",-->
+          <!--:onmouseout => "message_titile_hide($(this))" %>-->
+        </li>
+      </div>
+      <% unless User.current.member_of?(ma.project) %>
+          <li class="messageOperateContents fl">
+            <%=link_to "同意加入", {:controller => 'projects', :action => 'member', :id => ma.project_id, :message_id =>ma.id,  :key => ma.secret_key},
+                       :value => ma.secret_key,
+                       :class => "green_btn_cir",
+                       :style => "color:#fff",
+                       :target => '_blank' %>
+          </li>
+      <% end %>
+      <li class="homepageNewsTime fr"><%= time_tag(ma.created_at).html_safe %> </li>
+    </ul>
+<% end %>
+<% if ma.forge_message_type == "Issue" %>
+    <% if ma.status == 1%>
         <ul class="homepageNewsList fl">
           <div class="shortMessageWidth">
             <li class="homepageNewsPortrait fl">
-              <%=link_to image_tag(url_to_avatar(inviter), :width => "30", :height => "30"), user_path(inviter), :target => '_blank' %>
+              <%=link_to image_tag(url_to_avatar(ma.forge_message.author), :width => "30", :height => "30"), user_path(ma.forge_message.author), :target => '_blank' %>
             </li>
             <li class="homepageNewsPubType fl">
-              <%=link_to inviter, user_path(inviter), :class => "newsBlue homepageNewsPublisher", :target => '_blank' %>
-              <span class='<%= ma.viewed == 0 ? 'homepageNewsTypeNotRead fl' : 'homepageNewsType fl' %>'>邀请你加入项目：</span>
+              <%=link_to User.find(ma.forge_message.author_id).show_name, user_path(ma.forge_message.author),
+                         :class => "newsBlue homepageNewsPublisher", :target => '_blank' %>
+              <span class="homepageNewsType fl">
+                  <%= ma.forge_message.tracker_id == 5 ? "发布的周报：" : "指派给你的问题："%>
+                </span>
             </li>
             <li class="messageInformationContents">
-              <%= link_to ma.project, project_path(ma.project),
+              <%= link_to ma.forge_message.subject, issue_path(:id => ma.forge_message.id),
                           :class => "#{ma.viewed == 0 ? "newsBlack" : "newsGrey"}",
                           :target => '_blank',
-                          :title => "ma.project"
+                          :title => "#{ma.forge_message.subject}"
               %>
               <!--:onmouseover => "message_titile_show($(this),event)",-->
               <!--:onmouseout => "message_titile_hide($(this))" %>-->
             </li>
           </div>
-          <% unless User.current.member_of?(ma.project) %>
-              <li class="messageOperateContents fl">
-                <%=link_to "同意加入", {:controller => 'projects', :action => 'member', :id => ma.project_id, :message_id =>ma.id,  :key => ma.secret_key},
-                           :value => ma.secret_key,
-                           :class => "green_btn_cir",
-                           :style => "color:#fff",
-                           :target => '_blank' %>
-              </li>
-          <% end %>
+          <li class="messageOperateContents fl" title="截止时间快到了！">截止时间快到啦</li>
           <li class="homepageNewsTime fr"><%= time_tag(ma.created_at).html_safe %> </li>
         </ul>
-    <% end %>
-    <% if ma.forge_message_type == "Issue" %>
-        <% if ma.status == 1%>
-            <ul class="homepageNewsList fl">
-              <div class="shortMessageWidth">
-                <li class="homepageNewsPortrait fl">
-                  <%=link_to image_tag(url_to_avatar(ma.forge_message.author), :width => "30", :height => "30"), user_path(ma.forge_message.author), :target => '_blank' %>
-                </li>
-                <li class="homepageNewsPubType fl">
-                  <%=link_to User.find(ma.forge_message.author_id).show_name, user_path(ma.forge_message.author),
-                             :class => "newsBlue homepageNewsPublisher", :target => '_blank' %>
-                  <span class="homepageNewsType fl">
-                  <%= ma.forge_message.tracker_id == 5 ? "发布的周报：" : "指派给你的问题："%>
-                </span>
-                </li>
-                <li class="messageInformationContents">
-                  <%= link_to ma.forge_message.subject, issue_path(:id => ma.forge_message.id),
-                              :class => "#{ma.viewed == 0 ? "newsBlack" : "newsGrey"}",
-                              :target => '_blank',
-                              :title => "#{ma.forge_message.subject}"
-                  %>
-                  <!--:onmouseover => "message_titile_show($(this),event)",-->
-                  <!--:onmouseout => "message_titile_hide($(this))" %>-->
-                </li>
-              </div>
-              <li class="messageOperateContents fl" title="截止时间快到了！">截止时间快到啦</li>
-              <li class="homepageNewsTime fr"><%= time_tag(ma.created_at).html_safe %> </li>
-            </ul>
-        <% else %>
-            <ul class="homepageNewsList fl">
-              <div class="longMessageWidth">
-                <li class="homepageNewsPortrait fl">
-                  <%=link_to image_tag(url_to_avatar(ma.forge_message.author), :width => "30", :height => "30"), user_path(ma.forge_message.author), :target => '_blank' %>
-                </li>
-                <li class="homepageNewsPubType fl">
-                  <%=link_to User.find(ma.forge_message.author_id).show_name, user_path(ma.forge_message.author),
-                             :class => "newsBlue homepageNewsPublisher", :target => '_blank' %>
-                  <span class="homepageNewsType fl">
+    <% else %>
+        <ul class="homepageNewsList fl">
+          <div class="longMessageWidth">
+            <li class="homepageNewsPortrait fl">
+              <%=link_to image_tag(url_to_avatar(ma.forge_message.author), :width => "30", :height => "30"), user_path(ma.forge_message.author), :target => '_blank' %>
+            </li>
+            <li class="homepageNewsPubType fl">
+              <%=link_to User.find(ma.forge_message.author_id).show_name, user_path(ma.forge_message.author),
+                         :class => "newsBlue homepageNewsPublisher", :target => '_blank' %>
+              <span class="homepageNewsType fl">
                   <%= ma.forge_message.tracker_id == 5 ? "发布了周报：" : "指派了问题给你："%>
                 </span>
-                </li>
-                <li class="messageInformationContents">
-                  <%= link_to ma.forge_message.subject,
-                              issue_path(:id => ma.forge_message.id),
-                              :class => "#{ma.viewed == 0 ? "newsBlack" : "newsGrey"}",
-                              :target => '_blank',
-                              :title => "#{ma.forge_message.subject}"
-                  %>
-                  <!--:onmouseover => "message_titile_show($(this),event)",-->
-                  <!--:onmouseout => "message_titile_hide($(this))" %>-->
-                </li>
-              </div>
-              <li class="homepageNewsTime fr"><%= time_tag(ma.created_at).html_safe %> </li>
-            </ul>
-        <% end %>
-    <% end %>
-    <% if ma.forge_message_type == "Journal" && ma.forge_message %>
-        <ul class="homepageNewsList fl">
-          <div class="longMessageWidth">
-            <li class="homepageNewsPortrait fl">
-              <%=link_to image_tag(url_to_avatar(ma.forge_message.user), :width => "30", :height => "30"), user_path(ma.forge_message.user), :target => '_blank' %>
-            </li>
-            <li class="homepageNewsPubType fl">
-              <%= link_to User.find(ma.forge_message.user_id).show_name, user_path(ma.forge_message.user), :class => "newsBlue homepageNewsPublisher", :target => '_blank' %>
-              <span class="homepageNewsType fl">更新了问题状态：</span>
             </li>
             <li class="messageInformationContents">
-              <%= link_to ma.forge_message.journalized.subject,
-                          issue_path(:id => ma.forge_message.journalized_id), :class => "#{ma.viewed == 0 ? "newsBlack" : "newsGrey"}", :target => '_blank' %>
-              <!--:onmouseover =>"message_titile_show($(this),event)",-->
-              <!--:onmouseout => "message_titile_hide($(this))" %>-->
-            </li>
-          </div>
-          <li class="homepageNewsTime fr"><%= time_tag(ma.created_at).html_safe %> </li>
-        </ul>
-    <% end %>
-    <% if ma.forge_message_type == "Message" %>
-        <ul class="homepageNewsList fl">
-          <div class="longMessageWidth">
-            <li class="homepageNewsPortrait fl">
-              <%=link_to image_tag(url_to_avatar(ma.forge_message.author), :width => "30", :height => "30"), user_path(ma.forge_message.author), :target => '_blank' %>
-            </li>
-            <li class="homepageNewsPubType fl">
-              <%=link_to ma.forge_message.author.try(:show_name), user_path(ma.forge_message.author), :class => "newsBlue homepageNewsPublisher", :target => '_blank' %>
-              <span class="homepageNewsType fl"><%= ma.forge_message.parent_id.nil? ? "发布了项目帖子：" : "评论了项目帖子：" %></span>
-            </li>
-            <li class="messageInformationContents">
-              <%= link_to ma.forge_message.subject, board_message_path(ma.forge_message.board_id, ma.forge_message.parent_id ? ma.forge_message.parent_id : ma.forge_message.id), :class => "#{ma.viewed==0 ? "newsBlack" : "newsGrey"}", :target => '_blank' %>
-              <!--:onmouseover => "message_titile_show($(this),event)",-->
-              <!--:onmouseout => "message_titile_hide($(this))" %>-->
-            </li>
-          </div>
-          <li class="homepageNewsTime fr"><%= time_tag(ma.created_at).html_safe %> </li>
-        </ul>
-    <% end %>
-    <% if ma.forge_message_type == "Comment" %>
-        <ul class="homepageNewsList fl">
-          <div class="longMessageWidth">
-            <li class="homepageNewsPortrait fl">
-              <%=link_to image_tag(url_to_avatar(ma.forge_message.author), :width => "30", :height => "30"), user_path(ma.forge_message.author), :target => '_blank' %>
-            </li>
-            <li class="homepageNewsPubType fl">
-              <%=link_to ma.forge_message.author.try(:show_name), user_path(ma.forge_message.author),
-                         :class => "newsBlue homepageNewsPublisher", :target => '_blank' %>
-              <span class="homepageNewsType fl">评论了新闻：</span>
-            </li>
-            <li class="messageInformationContents">
-              <%= link_to "#{ma.forge_message.commented.title}",
-                          {:controller => 'news', :action => 'show', :id => ma.forge_message.commented.id },:class =>"#{ma.viewed == 0 ? "newsBlack" : "newsGrey"}", :target => '_blank' %>
+              <%= link_to ma.forge_message.subject,
+                          issue_path(:id => ma.forge_message.id),
+                          :class => "#{ma.viewed == 0 ? "newsBlack" : "newsGrey"}",
+                          :target => '_blank',
+                          :title => "#{ma.forge_message.subject}"
+              %>
               <!--:onmouseover => "message_titile_show($(this),event)",-->
               <!--:onmouseout => "message_titile_hide($(this))" %>-->
             </li>
@@ -212,29 +150,89 @@
           <li class="homepageNewsTime fr"><%= time_tag(ma.created_at).html_safe %> </li>
         </ul>
     <% end %>
+<% end %>
+<% if ma.forge_message_type == "Journal" && ma.forge_message %>
+    <ul class="homepageNewsList fl">
+      <div class="longMessageWidth">
+        <li class="homepageNewsPortrait fl">
+          <%=link_to image_tag(url_to_avatar(ma.forge_message.user), :width => "30", :height => "30"), user_path(ma.forge_message.user), :target => '_blank' %>
+        </li>
+        <li class="homepageNewsPubType fl">
+          <%= link_to User.find(ma.forge_message.user_id).show_name, user_path(ma.forge_message.user), :class => "newsBlue homepageNewsPublisher", :target => '_blank' %>
+          <span class="homepageNewsType fl">更新了问题状态：</span>
+        </li>
+        <li class="messageInformationContents">
+          <%= link_to ma.forge_message.journalized.subject,
+                      issue_path(:id => ma.forge_message.journalized_id), :class => "#{ma.viewed == 0 ? "newsBlack" : "newsGrey"}", :target => '_blank' %>
+          <!--:onmouseover =>"message_titile_show($(this),event)",-->
+          <!--:onmouseout => "message_titile_hide($(this))" %>-->
+        </li>
+      </div>
+      <li class="homepageNewsTime fr"><%= time_tag(ma.created_at).html_safe %> </li>
+    </ul>
+<% end %>
+<% if ma.forge_message_type == "Message" %>
+    <ul class="homepageNewsList fl">
+      <div class="longMessageWidth">
+        <li class="homepageNewsPortrait fl">
+          <%=link_to image_tag(url_to_avatar(ma.forge_message.author), :width => "30", :height => "30"), user_path(ma.forge_message.author), :target => '_blank' %>
+        </li>
+        <li class="homepageNewsPubType fl">
+          <%=link_to ma.forge_message.author.try(:show_name), user_path(ma.forge_message.author), :class => "newsBlue homepageNewsPublisher", :target => '_blank' %>
+          <span class="homepageNewsType fl"><%= ma.forge_message.parent_id.nil? ? "发布了项目帖子：" : "评论了项目帖子：" %></span>
+        </li>
+        <li class="messageInformationContents">
+          <%= link_to ma.forge_message.subject, board_message_path(ma.forge_message.board_id, ma.forge_message.parent_id ? ma.forge_message.parent_id : ma.forge_message.id), :class => "#{ma.viewed==0 ? "newsBlack" : "newsGrey"}", :target => '_blank' %>
+          <!--:onmouseover => "message_titile_show($(this),event)",-->
+          <!--:onmouseout => "message_titile_hide($(this))" %>-->
+        </li>
+      </div>
+      <li class="homepageNewsTime fr"><%= time_tag(ma.created_at).html_safe %> </li>
+    </ul>
+<% end %>
+<% if ma.forge_message_type == "Comment" %>
+    <ul class="homepageNewsList fl">
+      <div class="longMessageWidth">
+        <li class="homepageNewsPortrait fl">
+          <%=link_to image_tag(url_to_avatar(ma.forge_message.author), :width => "30", :height => "30"), user_path(ma.forge_message.author), :target => '_blank' %>
+        </li>
+        <li class="homepageNewsPubType fl">
+          <%=link_to ma.forge_message.author.try(:show_name), user_path(ma.forge_message.author),
+                     :class => "newsBlue homepageNewsPublisher", :target => '_blank' %>
+          <span class="homepageNewsType fl">评论了新闻：</span>
+        </li>
+        <li class="messageInformationContents">
+          <%= link_to "#{ma.forge_message.commented.title}",
+                      {:controller => 'news', :action => 'show', :id => ma.forge_message.commented.id },:class =>"#{ma.viewed == 0 ? "newsBlack" : "newsGrey"}", :target => '_blank' %>
+          <!--:onmouseover => "message_titile_show($(this),event)",-->
+          <!--:onmouseout => "message_titile_hide($(this))" %>-->
+        </li>
+      </div>
+      <li class="homepageNewsTime fr"><%= time_tag(ma.created_at).html_safe %> </li>
+    </ul>
+<% end %>
 
-    <% if ma.forge_message_type == "PullRequest" && PullRequest.where(:pull_request_id => ma.forge_message_id).count != 0 %>
-        <ul class="homepageNewsList fl">
-          <div class="longMessageWidth">
-            <li class="homepageNewsPortrait fl">
-              <% send_message_user =  PullRequest.where(:pull_request_id => ma.forge_message_id) %>
-              <% author = User.find(ma.operate_user_id.nil? ? 2 : ma.operate_user_id) %>
-              <%= link_to image_tag(url_to_avatar(author), :width => "30", :height => "30"), user_path(author), :target => '_blank' %>
-            </li>
-            <li class="homepageNewsPubType fl">
-              <%= link_to User.find(author.id).show_name, user_path(author),
-                          :class => "newsBlue homepageNewsPublisher", :target => '_blank' %>
-              <span class="<%= ma.viewed == 0 ? "homepageNewsTypeNotRead fl":"homepageNewsType fl" %>">
+<% if ma.forge_message_type == "PullRequest" && PullRequest.where(:pull_request_id => ma.forge_message_id).count != 0 %>
+    <ul class="homepageNewsList fl">
+      <div class="longMessageWidth">
+        <li class="homepageNewsPortrait fl">
+          <% send_message_user =  PullRequest.where(:pull_request_id => ma.forge_message_id) %>
+          <% author = User.find(ma.operate_user_id.nil? ? 2 : ma.operate_user_id) %>
+          <%= link_to image_tag(url_to_avatar(author), :width => "30", :height => "30"), user_path(author), :target => '_blank' %>
+        </li>
+        <li class="homepageNewsPubType fl">
+          <%= link_to User.find(author.id).show_name, user_path(author),
+                      :class => "newsBlue homepageNewsPublisher", :target => '_blank' %>
+          <span class="<%= ma.viewed == 0 ? "homepageNewsTypeNotRead fl":"homepageNewsType fl" %>">
               <%= pull_request_message_status(ma) %>
             </span>
-            </li>
-            <li class="messageInformationContents">
-              <%= link_to "#{send_message_user[0].title}", project_pull_requests_path(ma.project_id),
-                          :class =>"#{ma.viewed == 0 ? "newsBlack" : "newsGrey"}", :target => '_blank' %>
+        </li>
+        <li class="messageInformationContents">
+          <%= link_to "#{send_message_user[0].title}", project_pull_requests_path(ma.project_id),
+                      :class =>"#{ma.viewed == 0 ? "newsBlack" : "newsGrey"}", :target => '_blank' %>
 
-            </li>
-          </div>
-          <li class="homepageNewsTime fr"><%= time_tag(ma.created_at).html_safe %> </li>
-        </ul>
-    <% end %>
-<% end %>
\ No newline at end of file
+        </li>
+      </div>
+      <li class="homepageNewsTime fr"><%= time_tag(ma.created_at).html_safe %> </li>
+    </ul>
+<% end %>
diff --git a/app/views/users/_user_message_forum.html.erb b/app/views/users/_user_message_forum.html.erb
index 9bcfb1712..920b4d877 100644
--- a/app/views/users/_user_message_forum.html.erb
+++ b/app/views/users/_user_message_forum.html.erb
@@ -1,4 +1,4 @@
-<% if ma.class == MemoMessage %>
+
     <% if ma.memo_type == "Memo" && !ma.memo.nil? && !ma.memo.author.nil? %>
         <ul class="homepageNewsList fl">
           <div class="longMessageWidth">
@@ -26,4 +26,3 @@
           <li class="homepageNewsTime fr"><%= time_tag(ma.memo.created_at).html_safe %> </li>
         </ul>
     <% end %>
-<% end %>
\ No newline at end of file
diff --git a/app/views/users/_user_message_org.html.erb b/app/views/users/_user_message_org.html.erb
index 45ba65ec0..0e02509ec 100644
--- a/app/views/users/_user_message_org.html.erb
+++ b/app/views/users/_user_message_org.html.erb
@@ -1,44 +1,43 @@
-<% if ma.class == OrgMessage %>
-    <% if ma.message_type == 'ApplySubdomain'%>
-        <ul class="homepageNewsList fl">
-          <div class="shortMessageWidth">
-            <li class="homepageNewsPortrait fl">
-              <%=link_to image_tag(url_to_avatar(ma.organization), :width => "30", :height => "30"), organization_path(ma.organization_id), :target => '_blank' %>
-            </li>
-            <li class="homepageNewsPubType fl">
-              <%=link_to ma.organization.name, organization_path(ma.organization_id), :class => "newsBlue homepageNewsPublisher", :target => '_blank' %>
-              <span class='homepageNewsType fl'>申请子域名：</span>
-            </li>
-            <li class="messageInformationContents">
-              <%= ma.content %>
-            </li>
-          </div>
-          <li class="messageOperateContents fl">
-            <%=link_to (Secdomain.where("sub_type=2 and pid=?", ma.organization.id).count == 0 || (Secdomain.where("sub_type=2 and pid=?", ma.organization.id).count > 0 && Secdomain.where("sub_type=2 and pid=?", ma.organization.id).first.subname != ma.content)) ? "同意申请":"申请已批准",
-                       agree_apply_subdomain_organizations_path( :organization_id => ma.organization_id, :org_domain => ma.content, :user_id => ma.sender_id, :act_id => ma.id ),
-                       :id => "agree_apply_subdomain_#{ma.id}",
-                       :method => 'post',
-                       :remote => true,
-                       :class => 'link-blue'
-            %>
-          </li>
-          <li class="homepageNewsTime fr"><%= time_tag(ma.created_at).html_safe %> </li>
-        </ul>
-    <% end %>
-    <% if ma.message_type == 'AgreeApplySubdomain'%>
-        <ul class="homepageNewsList fl">
-          <div class="longMessageWidth">
-            <li class="homepageNewsPortrait fl">
-              <div class="navHomepageLogo fl"><%= image_tag("/images/trustie_logo1.png", width: "30px", height: "30px", class: "mt3") %></div>
-            </li>
-            <li class="homepageNewsPubType fl">
-              <span class='homepageNewsType fl'>管理员同意了您的子域名申请：</span>
-            </li>
-            <li class="messageInformationContents">
-              <%= ma.content %>
-            </li>
-          </div>
-          <li class="homepageNewsTime fr"><%= time_tag(ma.created_at).html_safe %> </li>
-        </ul>
-    <% end %>
-<% end %>
\ No newline at end of file
+
+<% if ma.message_type == 'ApplySubdomain'%>
+    <ul class="homepageNewsList fl">
+      <div class="shortMessageWidth">
+        <li class="homepageNewsPortrait fl">
+          <%=link_to image_tag(url_to_avatar(ma.organization), :width => "30", :height => "30"), organization_path(ma.organization_id), :target => '_blank' %>
+        </li>
+        <li class="homepageNewsPubType fl">
+          <%=link_to ma.organization.name, organization_path(ma.organization_id), :class => "newsBlue homepageNewsPublisher", :target => '_blank' %>
+          <span class='homepageNewsType fl'>申请子域名：</span>
+        </li>
+        <li class="messageInformationContents">
+          <%= ma.content %>
+        </li>
+      </div>
+      <li class="messageOperateContents fl">
+        <%=link_to (Secdomain.where("sub_type=2 and pid=?", ma.organization.id).count == 0 || (Secdomain.where("sub_type=2 and pid=?", ma.organization.id).count > 0 && Secdomain.where("sub_type=2 and pid=?", ma.organization.id).first.subname != ma.content)) ? "同意申请":"申请已批准",
+                   agree_apply_subdomain_organizations_path( :organization_id => ma.organization_id, :org_domain => ma.content, :user_id => ma.sender_id, :act_id => ma.id ),
+                   :id => "agree_apply_subdomain_#{ma.id}",
+                   :method => 'post',
+                   :remote => true,
+                   :class => 'link-blue'
+        %>
+      </li>
+      <li class="homepageNewsTime fr"><%= time_tag(ma.created_at).html_safe %> </li>
+    </ul>
+<% end %>
+<% if ma.message_type == 'AgreeApplySubdomain'%>
+    <ul class="homepageNewsList fl">
+      <div class="longMessageWidth">
+        <li class="homepageNewsPortrait fl">
+          <div class="navHomepageLogo fl"><%= image_tag("/images/trustie_logo1.png", width: "30px", height: "30px", class: "mt3") %></div>
+        </li>
+        <li class="homepageNewsPubType fl">
+          <span class='homepageNewsType fl'>管理员同意了您的子域名申请：</span>
+        </li>
+        <li class="messageInformationContents">
+          <%= ma.content %>
+        </li>
+      </div>
+      <li class="homepageNewsTime fr"><%= time_tag(ma.created_at).html_safe %> </li>
+    </ul>
+<% end %>
diff --git a/app/views/users/_user_message_system.html.erb b/app/views/users/_user_message_system.html.erb
index 3f8d00c44..19d8eab3f 100644
--- a/app/views/users/_user_message_system.html.erb
+++ b/app/views/users/_user_message_system.html.erb
@@ -1,22 +1,16 @@
-<% if ma.class == SystemMessage && many_days_ago(ma.created_at, 30) %>
-    <%# @user_system_messages.each do |usm| %>
-    <ul class="homepageNewsList fl">
-      <div class="longMessageWidth">
-        <li class="homepageNewsPortrait fl">
-          <div class="navHomepageLogo fl"><%= image_tag("/images/trustie_logo1.png", width: "30px", height: "30px", class: "mt3") %></div>
-        </li>
-        <li class="homepageNewsPubType fl">
-          <span style="color: red;float: left">系统消息：</span>
-          <!--            <span class="homepageNewsType fl">发布新消息：</span>-->
-        </li>
-        <li class="messageInformationContents">
-          <%= link_to ma.subject.blank? ? (ma.content.nil? ? ma.description.html_safe : ma.content.html_safe) : ma.subject, user_system_messages_path(User.current, :anchor => "position_#{ma.id}"),
-                      :id => "content_link_#{ma.id}", :target => '_blank' %>
-          <!--:onmouseover =>"message_titile_show($(this),event);",-->
-          <!--:onmouseout => "message_titile_hide($(this));"-->
-        </li>
-      </div>
-      <li class="homepageNewsTime fr"><%= time_tag(ma.created_at).html_safe %> </li>
-    </ul>
-    <%# end %>
-<% end %>
\ No newline at end of file
+<ul class="homepageNewsList fl">
+  <div class="longMessageWidth">
+    <li class="homepageNewsPortrait fl">
+      <div class="navHomepageLogo fl"><%= image_tag("/images/trustie_logo1.png", width: "30px", height: "30px", class: "mt3") %></div>
+    </li>
+    <li class="homepageNewsPubType fl">
+      <span style="color: red;float: left">系统消息：</span>
+    </li>
+    <li class="messageInformationContents">
+      <%= link_to ma.subject.blank? ? (ma.content.nil? ? ma.description.html_safe : ma.content.html_safe) : ma.subject, user_system_messages_path(User.current, :anchor => "position_#{ma.id}"),
+                  :id => "content_link_#{ma.id}", :target => '_blank' %>
+    </li>
+  </div>
+  <li class="homepageNewsTime fr"><%= time_tag(ma.created_at).html_safe %> </li>
+</ul>
+
diff --git a/app/views/users/_user_message_userfeedaback.html.erb b/app/views/users/_user_message_userfeedaback.html.erb
index 7b3251397..a4445a346 100644
--- a/app/views/users/_user_message_userfeedaback.html.erb
+++ b/app/views/users/_user_message_userfeedaback.html.erb
@@ -1,36 +1,35 @@
-<% if ma.class == UserFeedbackMessage %>
-    <% if ma.journals_for_message_type == "JournalsForMessage" %>
-        <ul class="homepageNewsList fl">
-          <div class="longMessageWidth">
-            <li class="homepageNewsPortrait fl">
-              <%=link_to image_tag(url_to_avatar(ma.journals_for_message.user), :width => "30", :height => "30"),
-                         user_path(ma.journals_for_message.user), :target => '_blank' %>
-            </li>
-            <li class="homepageNewsPubType fl">
-              <%=link_to User.find(ma.journals_for_message.user_id).show_name, user_path(ma.journals_for_message.user), :class => "newsBlue homepageNewsPublisher", :target => '_blank' %>
-              <span class="homepageNewsType fl">
+
+<% if ma.journals_for_message_type == "JournalsForMessage" %>
+    <ul class="homepageNewsList fl">
+      <div class="longMessageWidth">
+        <li class="homepageNewsPortrait fl">
+          <%=link_to image_tag(url_to_avatar(ma.journals_for_message.user), :width => "30", :height => "30"),
+                     user_path(ma.journals_for_message.user), :target => '_blank' %>
+        </li>
+        <li class="homepageNewsPubType fl">
+          <%=link_to User.find(ma.journals_for_message.user_id).show_name, user_path(ma.journals_for_message.user), :class => "newsBlue homepageNewsPublisher", :target => '_blank' %>
+          <span class="homepageNewsType fl">
               <%= ma.journals_for_message.reply_id == 0 ? "给你留言了：" : "回复了你的留言：" %>
             </span>
-            </li>
-            <li class="messageInformationContents">
-              <%= link_to message_content(ma.journals_for_message.notes),
-                          feedback_path(ma.journals_for_message.jour_id,
-                                        :anchor => "user_activity_#{ma.journals_for_message.id}"),
-                          :class =>"#{ma.viewed == 0 ? "newsBlack" : "newsGrey"}",
-                          :target => '_blank'%>
-            </li>
-          </div>
-          <div  style="display: none" class="message_title_red system_message_style" >
-            <% if ma.journals_for_message.reply_id == 0 %>
-                <%= ma.journals_for_message.notes.html_safe %>
-            <% else %>
-                <div class="fl"><strong>您的留言：</strong></div>
-                <div class="ml60"><%= JournalsForMessage.find(ma.journals_for_message.m_reply_id).notes.html_safe %></div>
-                <div class="fl"><strong>回复内容：</strong></div>
-                <div class="ml60"><%= ma.journals_for_message.notes.html_safe %></div>
-            <% end %>
-          </div>
-          <li class="homepageNewsTime fr"><%= time_tag(ma.journals_for_message.created_on).html_safe %> </li>
-        </ul>
-    <% end %>
-<% end %>
\ No newline at end of file
+        </li>
+        <li class="messageInformationContents">
+          <%= link_to message_content(ma.journals_for_message.notes),
+                      feedback_path(ma.journals_for_message.jour_id,
+                                    :anchor => "user_activity_#{ma.journals_for_message.id}"),
+                      :class =>"#{ma.viewed == 0 ? "newsBlack" : "newsGrey"}",
+                      :target => '_blank'%>
+        </li>
+      </div>
+      <div  style="display: none" class="message_title_red system_message_style" >
+        <% if ma.journals_for_message.reply_id == 0 %>
+            <%= ma.journals_for_message.notes.html_safe %>
+        <% else %>
+            <div class="fl"><strong>您的留言：</strong></div>
+            <div class="ml60"><%= JournalsForMessage.find(ma.journals_for_message.m_reply_id).notes.html_safe %></div>
+            <div class="fl"><strong>回复内容：</strong></div>
+            <div class="ml60"><%= ma.journals_for_message.notes.html_safe %></div>
+        <% end %>
+      </div>
+      <li class="homepageNewsTime fr"><%= time_tag(ma.journals_for_message.created_on).html_safe %> </li>
+    </ul>
+<% end %>