From 6d6445465b5ec1bb09ec3bece64656342ec14f2f Mon Sep 17 00:00:00 2001
From: SylorHuang <sylor_huang@126.com>
Date: Wed, 23 Oct 2019 11:37:24 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B6=88=E6=81=AF=E9=80=9A=E7=9F=A5=E9=A1=B5?=
 =?UTF-8?q?=E9=9D=A2=E7=9A=84=E5=AE=8C=E6=88=90?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../layouts/_show_messages_list.html.erb      |    2 +-
 .../_applied_organization_sundomain.html.erb  |    2 +-
 .../_apply_homework_course_message.html.erb   |   54 +-
 .../_apply_resource_course_message.html.erb   |   63 +-
 ...ply_resource_course_message_reply.html.erb |   53 +-
 .../_join_course_course_message.html.erb      |   58 +-
 app/views/users/_new_user_message.html.erb    |   25 +-
 .../users/_user_info_message_avatar.html.erb  |    1 +
 .../users/_user_info_message_header.html.erb  |    6 +
 .../users/_user_message_applied.html.erb      |   51 +-
 app/views/users/_user_message_blog.html.erb   |   32 +-
 .../users/_user_message_contest.html.erb      |  529 +++---
 app/views/users/_user_message_course.html.erb | 1440 ++++++++---------
 app/views/users/_user_message_forum.html.erb  |   41 +-
 ...ssage_organization_applied_action.html.erb |    4 +-
 15 files changed, 1097 insertions(+), 1264 deletions(-)
 create mode 100644 app/views/users/_user_info_message_avatar.html.erb
 create mode 100644 app/views/users/_user_info_message_header.html.erb

diff --git a/app/views/layouts/_show_messages_list.html.erb b/app/views/layouts/_show_messages_list.html.erb
index 3e24f18cf..c8f34b93a 100644
--- a/app/views/layouts/_show_messages_list.html.erb
+++ b/app/views/layouts/_show_messages_list.html.erb
@@ -247,7 +247,7 @@
   <% end %>
 </ul>
   <!--<a onclick = "show_more();" id = "show_more_messages" style="display: none; cursor: pointer;" class = "shadowbox_news_all">展开更多</a>-->
-<%= link_to '查看全部', user_path(User.current), :id =>'show_all_messages', :class => "shadowbox_news_all", :target =>"_Blank" %>
+<%= link_to '查看全部', user_message_path(User.current), :id =>'show_all_messages', :class => "shadowbox_news_all", :target =>"_Blank" %>
 </div>
 
 <script type="text/javascript">
diff --git a/app/views/users/_applied_organization_sundomain.html.erb b/app/views/users/_applied_organization_sundomain.html.erb
index 595b82ce0..b3457f26c 100644
--- a/app/views/users/_applied_organization_sundomain.html.erb
+++ b/app/views/users/_applied_organization_sundomain.html.erb
@@ -23,7 +23,7 @@
         <%=link_to ma.applied.name, organization_path(ma.applied_id), :target => '_blank' %>
       </span>
     <span class="fontGrey4 f12"><%= time_from_now(ma.updated_at) %></span>
-    <span><%= render :partial => "users/user_message_organization_applied_action", :locals => {:ma => ma} %></span>
+    <span class="ml20"><%= render :partial => "users/user_message_organization_applied_action", :locals => {:ma => ma} %></span>
   </p>
   <p class="c_grey02 f14">
       <span class="homepageNewsType fl">
diff --git a/app/views/users/_apply_homework_course_message.html.erb b/app/views/users/_apply_homework_course_message.html.erb
index 98fc536f3..ae8b06a6a 100644
--- a/app/views/users/_apply_homework_course_message.html.erb
+++ b/app/views/users/_apply_homework_course_message.html.erb
@@ -1,35 +1,33 @@
-<div class="shortMessageWidth">
-  <li class="homepageNewsPortrait fl">
-    <div class="navHomepageLogo fl">
-      <%= link_to image_tag(url_to_avatar(User.find(ma.apply_user_id)), :width => "30", :height => "30"), user_path(User.find(ma.apply_user_id)), :target => '_blank' %>
-    </div>
-  </li>
-  <li class="homepageNewsPubType fl">
-    <%= link_to User.find(ma.apply_user_id).show_name, user_path(User.find(ma.apply_user_id)), :class => "newsBlue homepageNewsPublisher", :target => '_blank' %>
-    <span class="homepageNewsType fl">申请引用作业：</span>
-  </li>
-  <li class="messageInformationContents">
+<% user = User.find(ma.apply_user_id) %>
+<%= render partial: "users/user_info_message_avatar", locals: {user: user} %>
+
+<div>
+  <p class="lh25 mb10">
+      <span class="mr20 f16 color-grey3">
+        <%= link_to "#{user.try(:show_name)}", user_path(user), :target => "_blank", :title => "#{user.try(:show_name)}" %>
+      </span>
+    <span class="fontGrey4 f12"><%= time_from_now(ma.updated_at) %></span>
+    <span id="deal_info_<%= ma.id %>" class="ml20">
+      <% if ma.apply_result == 0 || ma.apply_result.nil? %>
+        <%= link_to '同意', dealwith_apply_homework_user_path(User.current, :agree=>'Y', :msg_id=>ma.id), :remote=>'true'%>
+        |
+        <%= link_to '拒绝', dealwith_apply_homework_user_path(User.current, :agree=>'N', :msg_id=>ma.id), :remote=>'true'%>
+      <% elsif ma.apply_result == 1 %> <!-- 同意 -->
+        <span class="fs12 infoTips bg-green">您已同意申请</span>
+      <% elsif ma.apply_result == 2 %> <!-- 拒绝 -->
+        <span class="fs12 infoTips bg-refuse">您已拒绝申请</span>
+      <% end %>
+    </span>
+  </p>
+  <p class="c_grey02 f14">
+      <span class="homepageNewsType fl">
+        申请引用作业：
+      </span>
     <% content = ma.content.nil? ? '' : '：'+ ma.content.to_s %>
     <%= link_to User.find(ma.apply_user_id).show_name+"申请引用作业\""+"#{HomeworkCommon.find(ma.course_message_id).name}"+"\"#{content}",
                 student_work_index_path(:homework => ma.course_message.id),
                 :title => User.find(ma.apply_user_id).show_name+"申请引用作业\""+"#{HomeworkCommon.find(ma.course_message_id).name}"+"\"#{content}",
                 :class => "#{ma.viewed == 0 ? "newsBlack" : "newsGrey "}",
                 :target => '_blank' %>
-    <!--:onmouseover => "message_titile_show($(this),event)",-->
-    <!--:onmouseout => "message_titile_hide($(this))" %>-->
-  </li>
+  </p>
 </div>
-<li class="messageApplyContents fl">
-            <span id="deal_info_<%= ma.id %>">
-              <% if ma.apply_result == 0 || ma.apply_result.nil? %>
-                <%= link_to '同意', dealwith_apply_homework_user_path(User.current, :agree=>'Y', :msg_id=>ma.id), :remote=>'true'%>
-                  |
-                  <%= link_to '拒绝', dealwith_apply_homework_user_path(User.current, :agree=>'N', :msg_id=>ma.id), :remote=>'true'%>
-             <% elsif ma.apply_result == 1 %> <!-- 同意 -->
-                 您已同意申请
-             <% elsif ma.apply_result == 2 %> <!-- 拒绝 -->
-                 您已拒绝申请
-             <% end %>
-             </span>
-</li>
-<li class="homepageNewsTime fr"><%= time_tag(ma.created_at).html_safe %> </li>
\ No newline at end of file
diff --git a/app/views/users/_apply_resource_course_message.html.erb b/app/views/users/_apply_resource_course_message.html.erb
index 837c02f6d..a2f519d9e 100644
--- a/app/views/users/_apply_resource_course_message.html.erb
+++ b/app/views/users/_apply_resource_course_message.html.erb
@@ -1,39 +1,38 @@
-<div class="shortMessageWidth">
-<li class="homepageNewsPortrait fl">
-  <div class="navHomepageLogo fl">
-    <%= link_to image_tag(url_to_avatar(ma.course_message.user), :width => "30", :height => "30"), user_path(ma.course_message.user) %>
-  </div>
-</li>
-<li class="homepageNewsPubType fl">
-  <%= link_to ma.course_message.user.show_name, user_path(ma.course_message.user), :class => "newsBlue homepageNewsPublisher" %>
-  <span class="homepageNewsType fl">申请引用资源：</span>
-</li>
-<li class="messageInformationContents">
-  <% content = ma.course_message.content.nil? ? '' : '：'+ ma.course_message.content.to_s %>
-  <% show_content = ma.course_message.user.show_name + "申请引用资源\""+"#{ma.course_message.find_attachment(ma.course_message.attachment_id).try(:filename)}"+"\"#{content}" %>
-  <% if ma.course_message.container_type == "Course" %>
+<% user = User.find(ma.apply_user_id) %>
+<%= render partial: "users/user_info_message_avatar", locals: {user: user} %>
+<div>
+  <p class="lh25 mb10">
+    <span class="mr20 f16 color-grey3">
+      <%= link_to "#{user.try(:show_name)}", user_path(user), :target => "_blank", :title => "#{user.try(:show_name)}" %>
+    </span>
+    <span class="fontGrey4 f12"><%= time_from_now(ma.updated_at) %></span>
+    <span id="deal_info_<%= ma.id %>" class="ml20">
+     <% if ma.apply_result == 0 || ma.apply_result.nil? %>
+         <%= link_to '同意', deal_with_apply_resource_user_path(User.current, :agree => 'Y', :msg_id => ma.id, :apply_user_id => ma.course_message.apply_user_id), :remote => 'true' %> |
+        <%= link_to '拒绝', deal_with_apply_resource_user_path(User.current, :agree => 'N', :msg_id => ma.id, :apply_user_id => ma.course_message.apply_user_id), :remote => 'true' %>
+     <% elsif ma.apply_result == 1 %>
+         <span class="fs12 infoTips bg-green">您已同意申请</span>
+     <% elsif ma.apply_result == 2 %>
+        <span class="fs12 infoTips bg-refuse">您已拒绝申请</span>
+     <%end %>
+   </span>
+  </p>
+  <p class="c_grey02 f14">
+      <span class="homepageNewsType fl">
+        申请引用资源：
+      </span>
+    <% content = ma.course_message.content.nil? ? '' : '：'+ ma.course_message.content.to_s %>
+    <% show_content = ma.course_message.user.show_name + "申请引用资源\""+"#{ma.course_message.find_attachment(ma.course_message.attachment_id).try(:filename)}"+"\"#{content}" %>
+    <% if ma.course_message.container_type == "Course" %>
       <%= link_to show_content, course_files_path(ma.course_message.container_id), :title => show_content, :class => " #{ma.viewed == 0 ? "newsBlack" : "newsGrey "}" %>
-  <% elsif ma.course_message.container_type == "Project" %>
+    <% elsif ma.course_message.container_type == "Project" %>
       <%= link_to show_content, project_files_path(ma.course_message.container_id), :title => show_content, :class => " #{ma.viewed == 0 ? "newsBlack" : "newsGrey "}" %>
-  <% elsif ma.course_message.container_type == "OrgSubfield" %>
+    <% elsif ma.course_message.container_type == "OrgSubfield" %>
       <%= link_to show_content, org_subfield_files_path(ma.course_message.container_id), :title => show_content, :class => " #{ma.viewed == 0 ? "newsBlack" : "newsGrey "}" %>
-  <% else %>
+    <% else %>
       <a title="<%= show_content %>" class = "<%= ma.viewed == 0 ? "newsBlack" : "newsGrey "%>">
         <%= show_content %>
       </a>
-  <% end %>
-</li>
+    <% end %>
+  </p>
 </div>
-<li class="messageApplyContents fl">
-   <span id="deal_info_<%= ma.id %>">
-     <% if ma.apply_result == 0 || ma.apply_result.nil? %>
-         <%= link_to '同意', deal_with_apply_resource_user_path(User.current, :agree => 'Y', :msg_id => ma.id, :apply_user_id => ma.course_message.apply_user_id), :remote => 'true' %> |
-         <%= link_to '拒绝', deal_with_apply_resource_user_path(User.current, :agree => 'N', :msg_id => ma.id, :apply_user_id => ma.course_message.apply_user_id), :remote => 'true' %>
-     <% elsif ma.apply_result == 1 %>
-         您已同意申请
-     <% elsif ma.apply_result == 2 %>
-         您已拒绝申请
-     <%end %>
-   </span>
-</li>
-<li class="homepageNewsTime fr"><%= time_tag(ma.created_at).html_safe %> </li>
\ No newline at end of file
diff --git a/app/views/users/_apply_resource_course_message_reply.html.erb b/app/views/users/_apply_resource_course_message_reply.html.erb
index 142206e1b..273ef99af 100644
--- a/app/views/users/_apply_resource_course_message_reply.html.erb
+++ b/app/views/users/_apply_resource_course_message_reply.html.erb
@@ -1,31 +1,34 @@
-<div class="longMessageWidth">
-  <li class="homepageNewsPortrait fl">
-    <% owner = User.find(ma.course_message.apply_user_id) %>
-    <div class="navHomepageLogo fl">
-      <%= link_to image_tag(url_to_avatar(owner), :width => "30", :height => "30", class: "mt3"), user_path(owner) %>
-    </div>
-  </li>
-  <li class="homepageNewsPubType fl">
-    <%= link_to owner.show_name, user_path(owner), :class => "newsBlue homepageNewsPublisher" %>
-    <span class="homepageNewsType fl"><%= ma.apply_result == 2 ? '同意' : '拒绝'%>引用资源：</span>
-  </li>
-  <li class="messageInformationContents">
+<% user = User.find(ma.course_message.apply_user_id) %>
+<%= render partial: "users/user_info_message_avatar", locals: {user: user} %>
+<div>
+  <p class="lh25 mb10">
+    <span class="mr20 f16 color-grey3">
+      <%= link_to "#{user.try(:show_name)}", user_path(user), :target => "_blank", :title => "#{user.try(:show_name)}" %>
+    </span>
+    <span class="fontGrey4 f12"><%= time_from_now(ma.updated_at) %></span>
+    <span id="deal_info_<%= ma.id %>" class="ml20">
+     <% if ma.apply_result == 2 %>
+      <span class="fs12 infoTips bg-green">同意引用资源</span>
+     <% else %>
+        <span class="fs12 infoTips bg-refuse">拒绝引用资源</span>
+     <%end %>
+   </span>
+  </p>
+  <p class="c_grey02 f14">
     <% link_str = ma.apply_result == 2 ?
-            '您申请引用资源"'+ ma.course_message.find_attachment(ma.course_message.attachment_id).try(:filename) + '"的申请已通过'
-    :
-            '您申请引用资源"'+ ma.course_message.find_attachment(ma.course_message.attachment_id).try(:filename) + '"的申请被婉拒' %>
+                      '您申请引用资源"'+ ma.course_message.find_attachment(ma.course_message.attachment_id).try(:filename) + '"的申请已通过'
+                      :
+                      '您申请引用资源"'+ ma.course_message.find_attachment(ma.course_message.attachment_id).try(:filename) + '"的申请被婉拒' %>
     <% if ma.course_message.container_type == "Course" %>
-        <%= link_to link_str, course_files_path(ma.course_message.container_id), :title => link_str, :class => " #{ma.viewed == 0 ? "newsBlack" : "newsGrey "}" %>
+      <%= link_to link_str, course_files_path(ma.course_message.container_id), :title => link_str, :class => " #{ma.viewed == 0 ? "newsBlack" : "newsGrey "}" %>
     <% elsif ma.course_message.container_type == "Project" %>
-        <%= link_to link_str, project_files_path(ma.course_message.container_id), :title => link_str, :class => " #{ma.viewed == 0 ? "newsBlack" : "newsGrey "}" %>
+      <%= link_to link_str, project_files_path(ma.course_message.container_id), :title => link_str, :class => " #{ma.viewed == 0 ? "newsBlack" : "newsGrey "}" %>
     <% elsif ma.course_message.container_type == "OrgSubfield" %>
-        <%= link_to link_str, org_subfield_files_path(ma.course_message.container_id), :title => link_str, :class => " #{ma.viewed == 0 ? "newsBlack" : "newsGrey "}" %>
+      <%= link_to link_str, org_subfield_files_path(ma.course_message.container_id), :title => link_str, :class => " #{ma.viewed == 0 ? "newsBlack" : "newsGrey "}" %>
     <% else %>
-        <a title="<%= link_str %>" class = "<%= ma.viewed == 0 ? "newsBlack" : "newsGrey "%>">
-          <%= link_str %>
-        </a>
+      <a title="<%= link_str %>" class = "<%= ma.viewed == 0 ? "newsBlack" : "newsGrey "%>">
+        <%= link_str %>
+      </a>
     <% end %>
-    <%= link_to link_str, user_resource_user_path(User.current, :type => 2), :title => link_str,:class => "#{ma.viewed == 0 ? "newsBlack" : "newsGrey "}" %>
-  </li>
-</div>
-<li class="homepageNewsTime fr"><%= time_tag(ma.created_at).html_safe %> </li>
\ No newline at end of file
+  </p>
+</div>
\ No newline at end of file
diff --git a/app/views/users/_join_course_course_message.html.erb b/app/views/users/_join_course_course_message.html.erb
index 206d75a23..10dc93e23 100644
--- a/app/views/users/_join_course_course_message.html.erb
+++ b/app/views/users/_join_course_course_message.html.erb
@@ -1,26 +1,31 @@
-<div class="shortMessageWidth">
-  <% message_user = User.find(ma.course_message_id) %>
-  <li class="homepageNewsPortrait fl">
-    <div class="navHomepageLogo fl">
-      <%= link_to image_tag(url_to_avatar(message_user), :width => "30", :height => "30"), user_path(message_user), :target => '_blank' %>
-    </div>
-  </li>
-  <li class="homepageNewsPubType fl">
-  <span class="newsBlue homepageNewsPublisher">
-     <%=link_to message_user.show_name, user_path(ma.course_message_id),
-                :class => "newsBlue homepageNewsPublisher", :target => '_blank' %>
+<% message_user = User.find(ma.course_message_id) %>
+<%= render partial: "users/user_info_message_avatar", locals: {user: message_user} %>
+<div>
+  <p class="lh25 mb10">
+  <span class="mr20 f16 color-grey3">
+    <%= link_to message_user.try(:show_name), user_path(message_user), :target => "_blank", :title => "#{message_user.try(:show_name)}" %>
   </span>
-  <span class="homepageNewsType fl">
-    申请以<%= ma.content && ma.content.include?('9') ? "“教师”" : "“助教”" %>的身份加入班级：
-  </span>
-  </li>
-  <li class="messageInformationContents">
+    <span class="fontGrey4 f12"><%= time_from_now(ma.updated_at) %></span>
+    <span id="deal_info_<%=ma.id%>" class="ml20">
+      <% if ma.status == 0 || ma.status.nil?%>
+        <%= link_to '同意',dealwith_apply_request_user_path(User.current,:agree=>'Y',:msg_id=>ma.id),:remote=>'true',:class=>'linkBlue'%>
+        |
+        <%= link_to '拒绝',dealwith_apply_request_user_path(User.current,:agree=>'N',:msg_id=>ma.id),:remote=>'true',:class=>'linkBlue'%>
+      <% elsif ma.status == 1%> <!-- 同意 -->
+        <span class="infoTips bg-green"><%= Course.find(ma.course_id).teacher.show_name %>已同意</span>
+      <% elsif ma.status == 2%> <!-- 拒绝 -->
+        <span class="infoTips bg-refuse"><%= Course.find(ma.course_id).teacher.show_name %>已拒绝</span>
+      <% end %>
+    </span>
+  </p>
+  <p class="c_grey02 f14">
+    <span class="homepageNewsType fl">
+      申请以<%= ma.content && ma.content.include?('9') ? "“教师”" : "“助教”" %>的身份加入班级：
+    </span>
     <% content = User.find(ma.course_message_id).name+"申请成为班级\""+"#{Course.find(ma.course_id).name}"+"\"的"+"#{ma.content && ma.content.include?('9') ? "教师" : "助教"}" %>
     <%= link_to Course.find(ma.course_id).name, course_path(Course.find(ma.course_id)),
                 :class => "#{ma.viewed==0 ? "newsBlack" : "newsGrey"}", :target => '_blank', :title => "#{content}" %>
-    <!--:onmouseover => "message_titile_show($(this),event)",-->
-    <!--:onmouseout => "message_titile_hide($(this))" %>-->
-  </li>
+  </p>
   <div style="display: none" class="message_title_red system_message_style">
     <p>
       <%= User.current.lastname + User.current.firstname %>老师您好！您有了新的班级成员申请，信息如下：
@@ -32,18 +37,5 @@
     <p>申请职位：<%=ma.content && ma.content.include?('9')  ? "教师" : "助教"%></p>
   </div>
 </div>
-<li class="messageOperateContents fl">
-            <span id="deal_info_<%=ma.id%>">
-              <% if ma.status == 0 || ma.status.nil?%>
-                <%= link_to '同意',dealwith_apply_request_user_path(User.current,:agree=>'Y',:msg_id=>ma.id),:remote=>'true',:class=>'linkBlue'%>
-                  |
-                  <%= link_to '拒绝',dealwith_apply_request_user_path(User.current,:agree=>'N',:msg_id=>ma.id),:remote=>'true',:class=>'linkBlue'%>
-             <% elsif ma.status == 1%> <!-- 同意 -->
-                 <span title="<%= Course.find(ma.course_id).teacher.show_name %>已同意"><%= Course.find(ma.course_id).teacher.show_name %>已同意</span>
-             <% elsif ma.status == 2%> <!-- 拒绝 -->
-                  <span title="<%= Course.find(ma.course_id).teacher.show_name %>已拒绝"><%= Course.find(ma.course_id).teacher.show_name %>已拒绝</span>
-             <% end %>
-             </span>
-</li>
-<li class="homepageNewsTime fr"><%= time_tag(ma.created_at).html_safe %> </li>
+
 
diff --git a/app/views/users/_new_user_message.html.erb b/app/views/users/_new_user_message.html.erb
index d41b27807..0924c24da 100644
--- a/app/views/users/_new_user_message.html.erb
+++ b/app/views/users/_new_user_message.html.erb
@@ -11,49 +11,52 @@
     <% end %>
 
     <%# 课程消息 %>
-    <% if ma.class == CourseMessage %>
-    <%= render :partial => 'users/user_message_course', :locals => {:ma => ma}  %>
+    <% if ma.class == CourseMessage && ma.present? %>
+      <li>
+        <%= render :partial => 'users/user_message_course', :locals => {:ma => ma}  %>
+      </li>
     <% end %>
 
     <!--项目消息-->
-    <% if ma.class == ForgeMessage %>
+    <% if ma.class == ForgeMessage && ma.present? %>
       <li>
         <%= render :partial => 'users/user_message_forge', :locals => {:ma => ma}  %>
       </li>
     <% end %>
 
     <%# 竞赛消息 %>
-    <% if ma.class == ContestMessage %>
-    <%= render :partial => 'users/user_message_contest', :locals => {:ma => ma}  %>
+    <% if ma.class == ContestMessage && ma.present? %>
+      <li>
+        <%= render :partial => 'users/user_message_contest', :locals => {:ma => ma}  %>
+      </li>
     <% end %>
 
     <%# 博客消息 %>
-    <% if ma.class == BlogMessage %>
+    <% if ma.class == BlogMessage && ma.present? %>
     <%= render :partial => 'users/user_message_blog', :locals => {:ma => ma}  %>
     <% end %>
 
     <!--公共贴吧-->
-    <% if ma.class == MemoMessage %>
+    <% if ma.class == MemoMessage && ma.present? %>
     <%= render :partial => 'users/user_message_forum', :locals => {:ma => ma}  %>
     <% end %>
 
     <!--用户留言-->
-    <% if ma.class == UserFeedbackMessage %>
+    <% if ma.class == UserFeedbackMessage && ma.present? %>
       <li>
         <%= render :partial => 'users/user_message_userfeedaback', :locals => {:ma => ma}  %>
       </li>
-
     <% end %>
 
     <!--子域名申请通知-->
-    <% if ma.class == OrgMessage %>
+    <% if ma.class == OrgMessage && ma.present? %>
       <li>
         <%= render :partial => 'users/user_message_org', :locals => {:ma => ma} %>
       </li>
     <% end %>
 
     <%# 申请类消息 %>
-    <% if ma.class == AppliedMessage %>
+    <% if ma.class == AppliedMessage && ma.present? %>
       <li>
         <%= render :partial => 'users/user_message_applied', :locals => {:ma => ma} %>
       </li>
diff --git a/app/views/users/_user_info_message_avatar.html.erb b/app/views/users/_user_info_message_avatar.html.erb
new file mode 100644
index 000000000..041b8cae6
--- /dev/null
+++ b/app/views/users/_user_info_message_avatar.html.erb
@@ -0,0 +1 @@
+<%= link_to image_tag(url_to_avatar(user), class:"r_list_img"), user_path(user), :target => '_blank' %>
diff --git a/app/views/users/_user_info_message_header.html.erb b/app/views/users/_user_info_message_header.html.erb
new file mode 100644
index 000000000..46f6fff82
--- /dev/null
+++ b/app/views/users/_user_info_message_header.html.erb
@@ -0,0 +1,6 @@
+<p class="lh25 mb10">
+  <span class="mr20 f16 color-grey3">
+    <%= link_to user.try(:show_name), user_path(user), :target => "_blank", :title => "#{user.try(:show_name)}" %>
+  </span>
+  <span class="fontGrey4 f12"><%= time_from_now(target_time) %></span>
+</p>
\ No newline at end of file
diff --git a/app/views/users/_user_message_applied.html.erb b/app/views/users/_user_message_applied.html.erb
index c6ca4aa94..8a74ad166 100644
--- a/app/views/users/_user_message_applied.html.erb
+++ b/app/views/users/_user_message_applied.html.erb
@@ -40,37 +40,32 @@
 <% elsif ma && ma.applied_type == "AppliedProject" %>
   <%= render :partial => "users/applied_project_content", :locals =>{:ma => ma} %>
 
-  <ul class="homepageNewsList fl" id="applied_project_<%= ma.id %>">
-      <%= render :partial => "users/applied_project_content", :locals =>{:ma => ma} %>
-    </ul>
+<!--  <ul class="homepageNewsList fl" id="applied_project_<%#= ma.id %>">-->
+      <%#= render :partial => "users/applied_project_content", :locals =>{:ma => ma} %>
+<!--    </ul>-->
 <% elsif ma && ma.applied_type == "Organization" %>
-    <ul class="homepageNewsList fl" id="applied_project_<%= ma.id %>">
-      <%= render :partial => "users/applied_organization_sundomain", :locals =>{:ma => ma} %>
-    </ul>
-     匿评成绩申诉
+  <%= render :partial => "users/applied_organization_sundomain", :locals =>{:ma => ma} %>
+
 <% 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>
+  <% applied_user = User.find(ma.applied_user_id) %>
+  <%= render partial: "users/user_info_message_avatar", locals: {user: applied_user} %>
+  <div>
+    <%= render partial: "users/user_info_message_header", locals: {user: applied_user, target_time: ma.updated_at} %>
+    <p class="c_grey02 f14">
+      <span class="homepageNewsType fl">
+        申诉匿评成绩：
+      </span>
+      <% 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' %>
+    </p>
+  </div>
+
 <% elsif ma && ma.applied_type == "AppliedContest" %>
   <%= render :partial => 'join_contest_applied_message', :locals => {:ma => ma} %>
 
-      <ul class="homepageNewsList fl" id="contest_message_join_<%=ma.id %>">
-      <%= render :partial => 'join_contest_applied_message', :locals => {:ma => ma} %>
-    </ul>
+<!--      <ul class="homepageNewsList fl" id="contest_message_join_<%#=ma.id %>">-->
+      <%#= render :partial => 'join_contest_applied_message', :locals => {:ma => ma} %>
+<!--    </ul>-->
+  <% else %>
+  <span class="c_grey02">内容已删除</span>
 <% end %>
diff --git a/app/views/users/_user_message_blog.html.erb b/app/views/users/_user_message_blog.html.erb
index 4eb20c588..14ee0fe44 100644
--- a/app/views/users/_user_message_blog.html.erb
+++ b/app/views/users/_user_message_blog.html.erb
@@ -1,23 +1,19 @@
 <% ma.nil? ? local_assigns[:ma] : ma %>
 <% if ma.class == BlogMessage %>
     <% if ma.blog_message_type == "BlogComment" %>
-        <ul class="homepageNewsList fl">
-          <div class="longMessageWidth">
-            <li class="homepageNewsPortrait fl">
-              <%= link_to image_tag(url_to_avatar(User.find(ma.user_operator_id)), :width => "30", :height => "30"), user_path(ma.user_operator_id), :target => '_blank' %>
-            </li>
-            <li class="homepageNewsPubType fl">
-              <%= link_to User.find(ma.user_operator_id).show_name, user_path(ma.user_operator_id), :class => "newsBlue homepageNewsPublisher", :target => '_blank' %>
-              <span class="homepageNewsType fl">回复了博客：</span>
-            </li>
-            <li class="messageInformationContents">
-              <% user_id = User.find(BlogComment.find(ma.blog_message_id).blog.author_id) %>
-              <% blog_id = BlogComment.find(ma.blog_message_id).root_id %>
-              <%= link_to message_content(ma.content), user_blog_blog_comment_path(:user_id => user_id, :blog_id => ma.blog_id, :id => blog_id),
-                          :class => "#{ma.viewed == false ? "newsBlack" : "newsGrey"}", :target => '_blank' %>
-            </li>
-          </div>
-          <li class="homepageNewsTime fr"><%= time_tag(ma.created_at).html_safe %> </li>
-        </ul>
+      <% user = User.find(ma.user_operator_id) %>
+      <%= render partial: "users/user_info_message_avatar", locals: {user: user} %>
+      <div>
+        <%= render partial: "users/user_info_message_header", locals: {user: user, target_time: ma.updated_at} %>
+        <p class="c_grey02 f14">
+          <span class="homepageNewsType fl">
+            回复了博客：
+          </span>
+          <% user_id = User.find(BlogComment.find(ma.blog_message_id).blog.author_id) %>
+          <% blog_id = BlogComment.find(ma.blog_message_id).root_id %>
+          <%= link_to message_content(ma.content), user_blog_blog_comment_path(:user_id => user_id, :blog_id => ma.blog_id, :id => blog_id),
+                      :class => "#{ma.viewed == false ? "newsBlack" : "newsGrey"}", :target => '_blank' %>
+        </p>
+      </div>
     <% end %>
 <% end %>
\ No newline at end of file
diff --git a/app/views/users/_user_message_contest.html.erb b/app/views/users/_user_message_contest.html.erb
index 5370ad218..0e8664a34 100644
--- a/app/views/users/_user_message_contest.html.erb
+++ b/app/views/users/_user_message_contest.html.erb
@@ -13,337 +13,290 @@
            role_str = "参赛者"
          end
        end %>
-    <ul class="homepageNewsList fl">
-      <div class="shortMessageWidth">
-        <li class="homepageNewsPortrait fl">
-          <div class="navHomepageLogo fl">
-            <%= link_to image_tag(url_to_avatar(user), :width => "30", :height => "30"), user_path(user), :target => '_blank' %>
-          </div>
-        </li>
-        <li class="homepageNewsPubType fl">
-          <span class="newsBlue homepageNewsPublisher">
-            <%=link_to user.show_name, user_path(user),
-                     :class => "newsBlue homepageNewsPublisher", :target => '_blank' %></span>
-            <span class="homepageNewsType fl">
-              <%= user.user_extensions.school_id.blank? || user.user_extensions.school.nil? ? "" : "来自"+user.user_extensions.school.name+"，" %>
-              申请以"<%= role_str%>"的身份加入竞赛：
-            </span>
-        </li>
-        <li class="messageInformationContents">
-          <%= link_to Contest.find(ma.contest_id).name, contest_path(ma.contest_id),
-                       :class => "#{!ma.viewed ? "newsBlack" : "newsGrey"}", :target => '_blank' %>
-        </li>
-      </div>
-      <li class="messageOperateContents fl">
-        <span id="deal_info_<%=ma.id%>">
+    <%= render partial: "users/user_info_message_avatar", locals: {user: user} %>
+    <div>
+      <p class="lh25 mb10">
+        <span class="mr20 f16 color-grey3">
+          <%= link_to user.try(:show_name), user_path(user), :target => "_blank", :title => "#{user.try(:show_name)}" %>
+        </span>
+        <span class="fontGrey4 f12"><%= time_from_now(ma.updated_at) %></span>
+        <span id="deal_info_<%=ma.id%>" class="ml20">
           <% if ma.status == 1%> <!-- 同意 -->
-             <span title="<%= User.find(ma.contest_message_id).show_name %>已同意"><%= User.find(ma.contest_message_id).show_name %>已同意</span>
+            <span class="infoTips bg-green"><%= User.find(ma.contest_message_id).show_name %>已同意</span>
          <% else%> <!-- 拒绝 -->
-             <span title="<%= User.find(ma.contest_message_id).show_name %>已拒绝"><%= User.find(ma.contest_message_id).show_name %>已拒绝</span>
+            <span class="infoTips bg-refuse"><%= User.find(ma.contest_message_id).show_name %>已拒绝</span>
          <%end %>
          </span>
-      </li>
-      <li class="homepageNewsTime fr"><%= time_tag(ma.created_at).html_safe %> </li>
-    </ul>
+      </p>
+      <%= render partial: "users/user_info_message_header", locals: {user: user, target_time: ma.updated_at} %>
+
+      <p class="c_grey02 f14">
+        <span class="homepageNewsType fl">
+          <%= user.user_extensions.school_id.blank? || user.user_extensions.school.nil? ? "" : "来自"+user.user_extensions.school.name+"，" %>
+          申请以"<%= role_str%>"的身份加入竞赛：
+        </span>
+        <%= link_to Contest.find(ma.contest_id).name, contest_path(ma.contest_id),
+                    :class => "#{!ma.viewed ? "newsBlack" : "newsGrey"}", :target => '_blank' %>
+      </p>
+      <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>
+    </div>
 
     <!--被管理员拉入竞赛：学生身份-->
     <% elsif ma.contest_message_type == "JoinContest" 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.contest_message_id)), :width => "30", :height => "30"), user_path(ma.contest_message_id), :target => '_blank' %>
-            </li>
-            <li class="homepageNewsPubType fl">
-              <%=link_to User.find(ma.contest_message_id).show_name, user_path(User.find(ma.contest_message_id)), :class => "newsBlue homepageNewsPublisher", :target => '_blank' %>
-              <span class="homepageNewsType fl">将您加入了竞赛：</span>
-            </li>
-            <li class="messageInformationContents">
-              <%= link_to ma.contest.name, contest_path(ma.contest), :class => "#{!ma.viewed ? "newsBlack" : "newsGrey"}", :target => '_blank' %>
-            </li>
-          </div>
-          <li class="homepageNewsTime fr"><%= time_tag(ma.created_at).html_safe %> </li>
-        </ul>
+      <% user = User.find(ma.contest_message_id) %>
+      <%= render partial: "users/user_info_message_avatar", locals: {user: user} %>
+      <div>
+        <%= render partial: "users/user_info_message_header", locals: {user: user, target_time: ma.updated_at} %>
+        <p class="c_grey02 f14">
+        <span class="homepageNewsType fl">
+          将您加入了竞赛：
+        </span>
+          <%= link_to ma.contest.name, contest_path(ma.contest), :class => "#{!ma.viewed ? "newsBlack" : "newsGrey"}", :target => '_blank' %>
+        </p>
+      </div>
 
     <!--被管理员拉入竞赛：老师身份-->
     <% elsif ma.contest_message_type == "JoinContest" 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.contest_message_id).login+"("+(User.find(ma.contest_message_id).realname ?  User.find(ma.contest_message_id).realname : User.find(ma.contest_message_id).login) +")",
-                          {:controller => 'contests', :action => 'settings', :id => ma.contest_id, :tab=>'member'},
-                          :class => "#{!ma.viewed ? "newsBlack" : "newsGrey"}",
-                          :target => '_blank' %>
-            </li>
-          </div>
-          <li class="homepageNewsTime fr"><%= time_tag(ma.created_at).html_safe %> </li>
-        </ul>
+
+    <%= link_to image_tag(url_to_avatar(""), class:"r_list_img"),"javascript:void(0)" %>
+    <div>
+      <p class="lh25 mb10">
+      <span class="mr20 f16 color-grey3">
+        <%= link_to "系统提示","javascript:void(0)" %>
+      </span>
+        <span class="fontGrey4 f12"><%= time_from_now(ma.updated_at) %></span>
+      </p>
+      <p class="c_grey02 f14">
+    <span class="homepageNewsType fl">
+      您增加了新的竞赛成员：
+    </span>
+        <%= link_to User.find(ma.contest_message_id).login+"("+(User.find(ma.contest_message_id).realname ?  User.find(ma.contest_message_id).realname : User.find(ma.contest_message_id).login) +")",
+                    {:controller => 'contests', :action => 'settings', :id => ma.contest_id, :tab=>'member'},
+                    :class => "#{!ma.viewed ? "newsBlack" : "newsGrey"}",
+                    :target => '_blank' %>
+      </p>
+    </div>
 
     <!--主动加入竞赛-->
     <% elsif ma.contest_message_type == "JoinContest" and ma.status == 2 %>
-      <ul class="homepageNewsList fl">
-        <div class="longMessageWidth">
-          <% user = User.find(ma.contest_message_id) %>
-          <li class="homepageNewsPortrait fl">
-            <div class="navHomepageLogo fl">
-              <%= link_to image_tag(url_to_avatar(user), :width => "30", :height => "30"), user_path(user), :target => '_blank' %>
-            </div>
-          </li>
-          <li class="homepageNewsPubType fl">
-            <span class="newsBlue homepageNewsPublisher">
-            <%=link_to user.show_name, user_path(user),
-                       :class => "newsBlue homepageNewsPublisher", :target => '_blank' %></span>
-            <span class="homepageNewsType fl">
-              <%= user.user_extensions.school_id.blank? || user.user_extensions.school.nil? ? "" : "来自"+user.user_extensions.school.name+"，" %>
-              以"参赛者"的身份加入了竞赛：
-            </span>
-          </li>
-          <li class="messageInformationContents">
-            <%= link_to ma.contest.name, contest_path(ma.contest), :class => "#{!ma.viewed ? "newsBlack" : "newsGrey"}", :target => '_blank' %>
-          </li>
-        </div>
-        <li class="homepageNewsTime fr"><%= time_tag(ma.created_at).html_safe %> </li>
-      </ul>
+      <% user = User.find(ma.contest_message_id) %>
+      <%= render partial: "users/user_info_message_avatar", locals: {user: user} %>
+      <div>
+        <%= render partial: "users/user_info_message_header", locals: {user: user, target_time: ma.updated_at} %>
+        <p class="c_grey02 f14">
+          <span class="homepageNewsType fl">
+            <%= user.user_extensions.school_id.blank? || user.user_extensions.school.nil? ? "" : "来自"+user.user_extensions.school.name+"，" %>
+            以"参赛者"的身份加入了竞赛：
+          </span>
+          <%= link_to ma.contest.name, contest_path(ma.contest), :class => "#{!ma.viewed ? "newsBlack" : "newsGrey"}", :target => '_blank' %>
+        </p>
+      </div>
 
     <!--被老师移出课程-->
     <% elsif ma.contest_message_type == "RemoveFromContest" %>
-        <ul class="homepageNewsList fl">
-          <div class="longMessageWidth">
-            <li class="homepageNewsPortrait fl">
-              <%=link_to image_tag(url_to_avatar(User.find(ma.contest_message_id)), :width => "30", :height => "30"), user_path(ma.contest_message_id), :target => '_blank' %>
-            </li>
-            <li class="homepageNewsPubType fl">
-              <%=link_to User.find(ma.contest_message_id).show_name, user_path(User.find(ma.contest_message_id)), :class => "newsBlue homepageNewsPublisher", :target => '_blank' %>
-              <span class="homepageNewsType fl">将您移出了竞赛：</span>
-            </li>
-            <li class="messageInformationContents">
-              <%= link_to ma.contest.name, contest_path(ma.contest), :class => "#{!ma.viewed ? "newsBlack" : "newsGrey"}", :target => '_blank' %>
-            </li>
-          </div>
-          <li class="homepageNewsTime fr"><%= time_tag(ma.created_at).html_safe %> </li>
-        </ul>
+      <% user = User.find(ma.contest_message_id) %>
+      <%= render partial: "users/user_info_message_avatar", locals: {user: user} %>
+      <div>
+        <%= render partial: "users/user_info_message_header", locals: {user: user, target_time: ma.updated_at} %>
+        <p class="c_grey02 f14">
+            <span class="homepageNewsType fl">
+             将您移出了竞赛：
+            </span>
+          <%= link_to ma.contest.name, contest_path(ma.contest), :class => "#{!ma.viewed ? "newsBlack" : "newsGrey"}", :target => '_blank' %>
+        </p>
+      </div>
 
     <!--发布竞赛题目-->
     <% elsif ma.contest_message_type == "Work" && ma.status.nil? && ma.contest_message %>
-        <ul class="homepageNewsList fl">
-          <div class="longMessageWidth">
-            <li class="homepageNewsPortrait fl">
-              <%=link_to image_tag(url_to_avatar(ma.contest_message.user), :width => "30", :height => "30"), user_path(ma.contest_message.user), :target => '_blank' %>
-            </li>
-            <li class="homepageNewsPubType fl">
-              <%=link_to ma.contest_message.user.show_name, user_path(ma.contest_message.user), :class => "newsBlue homepageNewsPublisher", :target => '_blank' %>
-              <span class="homepageNewsType fl">发布了竞赛题：</span>
-            </li>
-            <li class="messageInformationContents">
-              <%= link_to ma.contest_message.name, contestant_works_path(:work => ma.contest_message.id),
-                          :class => "#{!ma.viewed ? "newsBlack" : "newsGrey"}",
-                          :target => '_blank',
-                          :title => "竞赛题：#{ma.contest_message.name}"
-             %>
-            </li>
-          </div>
-          <li class="homepageNewsTime fr"><%= time_tag(ma.created_at).html_safe %> </li>
-        </ul>
+      <% user = ma.contest_message.user %>
+      <%= render partial: "users/user_info_message_avatar", locals: {user: user} %>
+      <div>
+        <%= render partial: "users/user_info_message_header", locals: {user: user, target_time: ma.updated_at} %>
+        <p class="c_grey02 f14">
+          <span class="homepageNewsType fl">
+            发布了竞赛题：
+          </span>
+          <%= link_to ma.contest_message.name, contestant_works_path(:work => ma.contest_message.id),
+                      :class => "#{!ma.viewed ? "newsBlack" : "newsGrey"}",
+                      :target => '_blank',
+                      :title => "竞赛题：#{ma.contest_message.name}"
+          %>
+        </p>
+      </div>
 
     <!--竞赛截止时间快到了-->
     <% elsif ma.contest_message_type == "Work" && ma.status == 1 && ma.contest_message %>
-        <ul class="homepageNewsList fl">
-          <div class="shortMessageWidth">
-            <li class="homepageNewsPortrait fl">
-              <%=link_to image_tag(url_to_avatar(ma.contest_message.user), :width => "30", :height => "30"), user_path(ma.contest_message.user), :target => '_blank' %>
-            </li>
-            <li class="homepageNewsPubType fl">
-              <%=link_to ma.contest_message.user.show_name, user_path(ma.contest_message.user),
-                         :class => "newsBlue homepageNewsPublisher",
-                         :title => "#{ma.contest_message.user.show_name}",
-                         :target => '_blank' %>
-              <span class="homepageNewsType fl">发布的竞赛题：</span></li>
-            <li class="messageInformationContents">
-              <%= link_to ma.contest_message.name, contestant_works_path(:work => ma.contest_message.id),
-                          :class => "#{!ma.viewed ? "newsBlack" : "newsGrey"}",
-                          :target => '_blank',
-                          :title => "竞赛题：#{ma.contest_message.name}"
-              %>
-            </li>
-          </div>
-          <li class="messageOperateContents fl" title="截止时间快到啦">截止时间快到啦</li>
-          <li class="homepageNewsTime fr"><%= time_tag(ma.created_at).html_safe %> </li>
-        </ul>
+      <% user = ma.contest_message.user %>
+      <%= render partial: "users/user_info_message_avatar", locals: {user: user} %>
+      <div>
+        <p class="lh25 mb10">
+          <span class="mr20 f16 color-grey3">
+            <%= link_to user.try(:show_name), user_path(user), :target => "_blank", :title => "#{user.try(:show_name)}" %>
+          </span>
+          <span class="fontGrey4 f12"><%= time_from_now(ma.updated_at) %></span>
+          <span class="ml20 fs12 infoTips bg-refuse">截止时间快到啦</span>
+        </p>
+        <p class="c_grey02 f14">
+            <span class="homepageNewsType fl">
+              发布的竞赛题：
+            </span>
+          <%= link_to ma.contest_message.name, contestant_works_path(:work => ma.contest_message.id),
+                      :class => "#{!ma.viewed ? "newsBlack" : "newsGrey"}",
+                      :target => '_blank',
+                      :title => "竞赛题：#{ma.contest_message.name}"
+          %>
+        </p>
+      </div>
 
     <!--竞赛启动在线评审-->
     <% elsif ma.contest_message_type == "Work" && ma.status == 2 && ma.contest_message %>
-        <ul class="homepageNewsList fl">
-          <div class="longMessageWidth">
-            <li class="homepageNewsPortrait fl">
-              <%= link_to image_tag(url_to_avatar(ma.contest_message.user), :width => "30", :height => "30"), user_path(ma.contest_message.user), :target => '_blank' %>
-            </li>
-            <li class="homepageNewsPubType fl">
-              <%= link_to ma.contest_message.user.show_name, user_path(ma.contest_message.user), :class => "newsBlue homepageNewsPublisher", :target => '_blank' %>
-              <span class="homepageNewsType fl">启动了在线评审：</span>
-            </li>
-            <li class="messageInformationContents">
-              <%= link_to ma.contest_message.name, contestant_works_path(:work => ma.contest_message.id), :class => "#{!ma.viewed ? "newsBlack" : "newsGrey"}"%>
-            </li>
-          </div>
-          <li class="homepageNewsTime fr"><%= time_tag(ma.created_at).html_safe %> </li>
-        </ul>
-
+      <% user = ma.contest_message.user %>
+      <%= render partial: "users/user_info_message_avatar", locals: {user: user} %>
+      <div>
+        <%= render partial: "users/user_info_message_header", locals: {user: user, target_time: ma.updated_at} %>
+        <p class="c_grey02 f14">
+          <span class="homepageNewsType fl">
+            启动了在线评审：
+          </span>
+          <%= link_to ma.contest_message.name, contestant_works_path(:work => ma.contest_message.id), :class => "#{!ma.viewed ? "newsBlack" : "newsGrey"}"%>
+        </p>
+      </div>
     <!--关闭在线评审-->
     <% elsif ma.contest_message_type == "Work" && ma.status == 3 && ma.contest_message %>
-      <ul class="homepageNewsList fl">
-        <div class="longMessageWidth">
-          <li class="homepageNewsPortrait fl">
-            <%= link_to image_tag(url_to_avatar(ma.contest_message.user), :width => "30", :height => "30"), user_path(ma.contest_message.user), :target => '_blank' %>
-          </li>
-          <li class="homepageNewsPubType fl">
-            <%= link_to ma.contest_message.user.show_name, user_path(ma.contest_message.user), :class => "newsBlue homepageNewsPublisher", :target => '_blank' %>
-            <span class="homepageNewsType fl">关闭了在线评审：</span>
-          </li>
-          <li class="messageInformationContents">
-            <%= link_to ma.contest_message.name, contestant_works_path(:work => ma.contest_message.id), :class => "#{!ma.viewed ? "newsBlack" : "newsGrey"}", :target => "_blank"%>
-          </li>
-        </div>
-        <li class="homepageNewsTime fr"><%= time_tag(ma.created_at).html_safe %> </li>
-      </ul>
+      <% user = ma.contest_message.user %>
+      <%= render partial: "users/user_info_message_avatar", locals: {user: user} %>
+      <div>
+        <%= render partial: "users/user_info_message_header", locals: {user: user, target_time: ma.updated_at} %>
+        <p class="c_grey02 f14">
+            <span class="homepageNewsType fl">
+              关闭了在线评审：
+            </span>
+          <%= link_to ma.contest_message.name, contestant_works_path(:work => ma.contest_message.id), :class => "#{!ma.viewed ? "newsBlack" : "newsGrey"}", :target => "_blank"%>
+        </p>
+      </div>
 
     <!--在线评审启动失败-->
     <% elsif ma.contest_message_type == "Work" && ma.status == 4 && ma.contest_message %>
-        <ul class="homepageNewsList fl">
-          <div class="longMessageWidth">
-            <li class="homepageNewsPortrait fl">
-              <%= link_to image_tag(url_to_avatar(ma.contest_message.user), :width => "30", :height => "30"), user_path(ma.contest_message.user), :target => '_blank' %>
-            </li>
-            <li class="homepageNewsPubType fl">
-              <%= link_to ma.contest_message.user.show_name, user_path(ma.contest_message.user), :class => "newsBlue homepageNewsPublisher", :target => '_blank' %>
-              <span class="homepageNewsType fl">在线评审启动失败<font class="c_red">(评委数为0或作品数为0)：</font></span>
-            </li>
-            <li class="messageInformationContents">
-              <%= link_to ma.contest_message.name, contestant_works_path(:work => ma.contest_message.id), :class => "#{!ma.viewed ? "newsBlack" : "newsGrey"}", :target => "_blank" %>
-            </li>
-          </div>
-          <li class="homepageNewsTime fr"><%= time_tag(ma.created_at).html_safe %> </li>
-        </ul>
+      <% user = ma.contest_message.user %>
+      <%= render partial: "users/user_info_message_avatar", locals: {user: user} %>
+      <div>
+        <%= render partial: "users/user_info_message_header", locals: {user: user, target_time: ma.updated_at} %>
+        <p class="c_grey02 f14">
+              <span class="homepageNewsType fl">
+                在线评审启动失败<font class="c_red">(评委数为0或作品数为0)：</font>
+              </span>
+          <%= link_to ma.contest_message.name, contestant_works_path(:work => ma.contest_message.id), :class => "#{!ma.viewed ? "newsBlack" : "newsGrey"}", :target => "_blank" %>
+        </p>
+      </div>
 
     <!--在线评审时间快到了-->
     <% elsif ma.contest_message_type == "Work" && ma.status == 5 && ma.contest_message %>
-        <ul class="homepageNewsList fl">
-          <div class="shortMessageWidth">
-            <li class="homepageNewsPortrait fl">
-              <%=link_to image_tag(url_to_avatar(ma.contest_message.user), :width => "30", :height => "30"), user_path(ma.contest_message.user), :target => '_blank' %>
-            </li>
-            <li class="homepageNewsPubType fl">
-              <%=link_to ma.contest_message.user.show_name, user_path(ma.contest_message.user),
-                         :class => "newsBlue homepageNewsPublisher",
-                         :title => "#{ma.contest_message.user.show_name}",
-                         :target => '_blank' %>
-              <span class="homepageNewsType fl">启动的在线评审：</span></li>
-            <li class="messageInformationContents">
-              <%= link_to ma.contest_message.name, contestant_works_path(:work => ma.contest_message.id),
-                          :class => "#{!ma.viewed ? "newsBlack" : "newsGrey"}",
-                          :target => '_blank',
-                          :title => "竞赛题：#{ma.contest_message.name}"
-              %>
-            </li>
-          </div>
-          <li class="messageOperateContents fl" title="截止时间快到啦">截止时间快到啦</li>
-          <li class="homepageNewsTime fr"><%= time_tag(ma.created_at).html_safe %> </li>
-        </ul>
+      <% user = ma.contest_message.user %>
+      <%= render partial: "users/user_info_message_avatar", locals: {user: user} %>
+      <div>
+        <p class="lh25 mb10">
+          <span class="mr20 f16 color-grey3">
+            <%= link_to user.try(:show_name), user_path(user), :target => "_blank", :title => "#{user.try(:show_name)}" %>
+          </span>
+          <span class="fontGrey4 f12"><%= time_from_now(ma.updated_at) %></span>
+          <span class="ml20 fs12 infoTips bg-refuse">截止时间快到啦</span>
+        </p>
+        <p class="c_grey02 f14">
+          <span class="homepageNewsType fl">
+            启动的在线评审：
+          </span>
+          <%= link_to ma.contest_message.name, contestant_works_path(:work => ma.contest_message.id),
+                      :class => "#{!ma.viewed ? "newsBlack" : "newsGrey"}",
+                      :target => '_blank',
+                      :title => "竞赛题：#{ma.contest_message.name}"
+          %>
+        </p>
+      </div>
 
     <!--发布竞赛通知-->
     <% elsif ma.contest_message_type == "News" && ma.contest_message %>
-        <ul class="homepageNewsList fl">
-          <div class="longMessageWidth">
-            <li class="homepageNewsPortrait fl">
-              <%=link_to image_tag(url_to_avatar(ma.contest_message.author), :width => "30", :height => "30"),user_path(ma.contest_message.author), :target => '_blank' %>
-            </li>
-            <li class="homepageNewsPubType fl">
-              <%=link_to ma.contest_message.author.try(:show_name), user_path(ma.contest_message.author), :class => "newsBlue homepageNewsPublisher", :target => '_blank' %>
-              <span class="homepageNewsType fl">发布了竞赛通知：</span>
-            </li>
-            <li class="messageInformationContents">
-              <%= link_to ma.contest_message.title, {:controller => 'news', :action => 'show', :id => ma.contest_message.id },
-                          :class =>"#{!ma.viewed ? "newsBlack" : "newsGrey"}",
-                          :target => '_blank',
-                          :title => "#{ma.contest_message.title}"
-              %>
-            </li>
-          </div>
-          <li class="homepageNewsTime fr"><%= time_tag(ma.created_at).html_safe %> </li>
-        </ul>
+      <% user = ma.contest_message.author %>
+      <%= render partial: "users/user_info_message_avatar", locals: {user: user} %>
+      <div>
+        <%= render partial: "users/user_info_message_header", locals: {user: user, target_time: ma.updated_at} %>
+        <p class="c_grey02 f14">
+          <span class="homepageNewsType fl">
+            发布了竞赛通知：
+          </span>
+          <%= link_to ma.contest_message.title, {:controller => 'news', :action => 'show', :id => ma.contest_message.id },
+                      :class =>"#{!ma.viewed ? "newsBlack" : "newsGrey"}",
+                      :target => '_blank',
+                      :title => "#{ma.contest_message.title}"
+          %>
+        </p>
+      </div>
 
     <!--回复了竞赛通知-->
     <% elsif ma.contest_message_type == "Comment" && ma.contest_message %>
-        <ul class="homepageNewsList fl">
-          <div class="longMessageWidth">
-            <li class="homepageNewsPortrait fl">
-              <%=link_to image_tag(url_to_avatar(ma.contest_message.author), :width => "30", :height => "30"), user_path(ma.contest_message.author), :target => '_blank' %>
-            </li>
-            <li class="homepageNewsPubType fl">
-              <%=link_to User.find(ma.contest_message.author_id).show_name, user_path(ma.contest_message.author), :class => "newsBlue homepageNewsPublisher", :target => '_blank' %>
-              <span class="homepageNewsType fl">回复了竞赛通知：</span>
-            </li>
-            <li class="messageInformationContents">
-              <%= link_to  ma.contest_message.commented.title, {:controller => 'news', :action => 'show', :id => ma.contest_message.commented.id },
-                           :class =>"#{!ma.viewed ? "newsBlack" : "newsGrey"}" ,
-                           :target => '_blank',
-                           :title => "#{ma.contest_message.commented.title}"
-              %>
-            </li>
-          </div>
-          <li class="homepageNewsTime fr"><%= time_tag(ma.created_at).html_safe %> </li>
-        </ul>
+      <% user = ma.contest_message.author %>
+      <%= render partial: "users/user_info_message_avatar", locals: {user: user} %>
+      <div>
+        <%= render partial: "users/user_info_message_header", locals: {user: user, target_time: ma.updated_at} %>
+        <p class="c_grey02 f14">
+          <span class="homepageNewsType fl">
+            回复了竞赛通知：
+          </span>
+          <%= link_to  ma.contest_message.commented.title, {:controller => 'news', :action => 'show', :id => ma.contest_message.commented.id },
+                       :class =>"#{!ma.viewed ? "newsBlack" : "newsGrey"}" ,
+                       :target => '_blank',
+                       :title => "#{ma.contest_message.commented.title}"
+          %>
+        </p>
+      </div>
 
     <!--发布/回复了竞赛帖子-->
     <% elsif ma.contest_message_type == "Message" && !ma.nil? && !ma.contest_message.nil? %>
-        <ul class="homepageNewsList fl">
-          <div class="longMessageWidth">
-            <li class="homepageNewsPortrait fl">
-              <%=link_to image_tag(url_to_avatar(ma.contest_message.author), :width => "30", :height => "30"), user_path(ma.contest_message.author), :target => '_blank' %>
-            </li>
-            <li class="homepageNewsPubType fl">
-              <%=link_to ma.contest_message.author.try(:show_name), user_path(ma.contest_message.author), :class => "newsBlue homepageNewsPublisher", :target => '_blank' %>
-              <span class="homepageNewsType fl">
-            <%= ma.contest_message.parent_id.nil? ? "发布了竞赛帖子：" : "回复了竞赛帖子：" %></span></li>
-            <% if ma.contest_message.parent_id.nil? %>
-                <li class="messageInformationContents">
-                  <%= link_to ma.contest_message.subject, board_message_path(ma.contest_message.board_id, ma.contest_message.id),
-                              :class => "#{!ma.viewed ? "newsBlack" : "newsGrey"}",
-                              :target => '_blank',
-                              :title => "#{ma.contest_message.subject}"
-                  %>
-                </li>
-            <% else %>
-                <li class="messageInformationContents">
-                  <%= link_to message_content(ma.contest_message.content), board_message_path(ma.contest_message.board_id, ma.contest_message.parent_id),
-                              :class => "#{!ma.viewed ? "newsBlack" : "newsGrey"}", :target => '_blank' %>
-                </li>
-            <% end %>
-          </div>
-          <li class="homepageNewsTime fr"><%= time_tag(ma.created_at).html_safe %> </li>
-        </ul>
+      <% user = ma.contest_message.author %>
+      <%= render partial: "users/user_info_message_avatar", locals: {user: user} %>
+      <div>
+        <%= render partial: "users/user_info_message_header", locals: {user: user, target_time: ma.updated_at} %>
+        <p class="c_grey02 f14">
+            <span class="homepageNewsType fl">
+              <%= ma.contest_message.parent_id.nil? ? "发布了竞赛帖子：" : "回复了竞赛帖子：" %>
+            </span>
+          <% if ma.contest_message.parent_id.nil? %>
+            <%= link_to ma.contest_message.subject, board_message_path(ma.contest_message.board_id, ma.contest_message.id),
+                        :class => "#{!ma.viewed ? "newsBlack" : "newsGrey"}",
+                        :target => '_blank',
+                        :title => "#{ma.contest_message.subject}"
+            %>
+        <% else %>
+            <%= link_to message_content(ma.contest_message.content), board_message_path(ma.contest_message.board_id, ma.contest_message.parent_id),
+                        :class => "#{!ma.viewed ? "newsBlack" : "newsGrey"}", :target => '_blank' %>
+        <% end %>
+        </p>
+      </div>
 
     <!--发布/回复了竞赛留言-->
     <% elsif ma.contest_message_type == "JournalsForMessage" && ma.contest_message && ma.contest_message.jour_type == 'Contest' %>
-        <ul class="homepageNewsList fl">
-          <div class="longMessageWidth">
-            <li class="homepageNewsPortrait fl">
-              <%= link_to image_tag(url_to_avatar(ma.contest_message.user), :width => "30", :height => "30"), user_path(ma.contest_message.user), :target => '_blank' %>
-            </li>
-            <li class="homepageNewsPubType fl">
-              <%= link_to ma.contest_message.user.try(:show_name), user_path(ma.contest_message.user), :class => "newsBlue homepageNewsPublisher", :target => '_blank' %>
-              <span class="homepageNewsType fl"><%= ma.contest_message.m_parent_id.nil? ? "发布了竞赛留言：" : "回复了竞赛留言：" %></span>
-            </li>
-            <li class="messageInformationContents">
-              <%= link_to message_content(ma.contest_message.notes), feedback_contest_path(:id => ma.contest_id),
-                          :class => "#{!ma.viewed ? "newsBlack" : "newsGrey"}", :target => '_blank' %>
-            </li>
-          </div>
-          <li class="homepageNewsTime fr"><%= time_tag(ma.created_at).html_safe %> </li>
-        </ul>
+      <% user = ma.contest_message.author %>
+      <%= render partial: "users/user_info_message_avatar", locals: {user: user} %>
+      <div>
+        <%= render partial: "users/user_info_message_header", locals: {user: user, target_time: ma.updated_at} %>
+        <p class="c_grey02 f14">
+          <span class="homepageNewsType fl">
+            <%= ma.contest_message.m_parent_id.nil? ? "发布了竞赛留言：" : "回复了竞赛留言：" %>
+          </span>
+          <%= link_to message_content(ma.contest_message.notes), feedback_contest_path(:id => ma.contest_id),
+                      :class => "#{!ma.viewed ? "newsBlack" : "newsGrey"}", :target => '_blank' %>
+        </p>
+      </div>
     <% 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 2ea95ad57..06b637451 100644
--- a/app/views/users/_user_message_course.html.erb
+++ b/app/views/users/_user_message_course.html.erb
@@ -1,875 +1,771 @@
 <% 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>
+  <%= render partial: "users/user_info_message_avatar", locals: {user: ma.course_message.author} %>
+
+  <div>
+    <%= render partial: "users/user_info_message_header", locals: {user: ma.course_message.author, target_time: ma.updated_at} %>
+    <p class="c_grey02 f14">
+      <span class="homepageNewsType fl">
+        发布了通知：
+      </span>
+      <%= 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}"
+      %>
+    </p>
+    <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>
+
+  </div>
 <% 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>
+  <%= render partial: "users/user_info_message_avatar", locals: {user: ma.course_message.author} %>
+
+  <div>
+    <%= render partial: "users/user_info_message_header", locals: {user: ma.course_message.author, target_time: ma.updated_at} %>
+    <p class="c_grey02 f14">
+      <span class="homepageNewsType fl">
+        评论了通知：
+      </span>
+      <%= 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}"
+      %>
+    </p>
+    <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>
+  </div>
 <% 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">
-          <%= 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>
+  <% user = ma.course_message.user %>
+  <%= render partial: "users/user_info_message_avatar", locals: {user: user} %>
+
+  <div>
+    <p class="lh25 mb10">
+      <span class="mr20 f16 color-grey3">
+        <%= link_to "#{user.try(:show_name)}老师", user_path(user), :target => "_blank", :title => "#{user.try(:show_name)}" %>
+      </span>
+      <span class="fontGrey4 f12"><%= time_from_now(ma.updated_at) %></span>
+    </p>
+    <p class="c_grey02 f14">
+      <span class="homepageNewsType fl">
+        发布了班级作业：
+      </span>
+      <%= 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}"
+      %>
+    </p>
+  </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>
-              <p>请抓紧时间提交您的作品，谢谢！</p>
-            </ul>
-        <% end %>
-      </div>
-      <li class="messageOperateContents fl" title="截止时间快到啦">截止时间快到啦</li>
-      <li class="homepageNewsTime fr"><%= time_tag(ma.created_at).html_safe %> </li>
-    </ul>
+  <% user = ma.course_message.user %>
+  <%= render partial: "users/user_info_message_avatar", locals: {user: user} %>
+
+  <div>
+    <p class="lh25 mb10">
+      <span class="mr20 f16 color-grey3">
+        <%= link_to "#{user.try(:show_name)}老师", user_path(user), :target => "_blank", :title => "#{user.try(:show_name)}" %>
+      </span>
+      <span class="fontGrey4 f12"><%= time_from_now(ma.updated_at) %></span>
+      <span class="infoTips bg-refuse ml15">截止时间快到了啦</span>
+    </p>
+    <p class="c_grey02 f14">
+      <span class="homepageNewsType fl">
+        发布的作业：
+      </span>
+      <%= 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}"
+      %>
+    </p>
+    <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>
+  </div>
+
 <% 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>
-        <% 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>
+  <% user = ma.course_message.user %>
+  <%= render partial: "users/user_info_message_avatar", locals: {user: user} %>
+
+  <div>
+    <p class="lh25 mb10">
+      <span class="mr20 f16 color-grey3">
+        <%= link_to "#{user.try(:show_name)}老师", user_path(user), :target => "_blank", :title => "#{user.try(:show_name)}" %>
+      </span>
+      <span class="fontGrey4 f12"><%= time_from_now(ma.updated_at) %></span>
+    </p>
+    <p class="c_grey02 f14">
+      <span class="homepageNewsType fl">
+        启动了作业匿评：
+      </span>
+      <%= 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' %>
+    </p>
+    <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>
+      <% 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>
+  </div>
 <% 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>
-    </ul>
+  <% user = ma.course_message.user %>
+  <%= render partial: "users/user_info_message_avatar", locals: {user: user} %>
+
+  <div>
+    <p class="lh25 mb10">
+      <span class="mr20 f16 color-grey3">
+        <%= link_to "#{user.try(:show_name)}老师", user_path(user), :target => "_blank", :title => "#{user.try(:show_name)}" %>
+      </span>
+      <span class="fontGrey4 f12"><%= time_from_now(ma.updated_at) %></span>
+    </p>
+    <p class="c_grey02 f14">
+      <span class="homepageNewsType fl">
+        关闭了作业匿评：
+      </span>
+      <%= link_to "作业标题：" + ma.course_message.name, student_work_index_path(:homework => ma.course_message.id), :class =>"#{ma.viewed == 0 ? "newsBlack" : "newsGrey"}", :target => '_blank' %>
+    </p>
+    <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>
+  </div>
 <% 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' %>
-        </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 + "老师") %>启动作业匿评失败啦
+  <% user = ma.course_message.user %>
+  <%= render partial: "users/user_info_message_avatar", locals: {user: user} %>
+
+  <div>
+    <p class="lh25 mb10">
+      <span class="mr20 f16 color-grey3">
+        <%= link_to "#{user.try(:show_name)}老师", user_path(user), :target => "_blank", :title => "#{user.try(:show_name)}" %>
+      </span>
+      <span class="fontGrey4 f12"><%= time_from_now(ma.updated_at) %></span>
+    </p>
+    <p class="c_grey02 f14">
+      <span class="homepageNewsType fl">
+        启动作业匿评失败：
+      </span>
+      <%= 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人)"
+      %>
+    </p>
+    <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>
+  </div>
 
-        </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>
+  <%= render :partial => 'apply_homework_course_message', :locals => {:ma => ma} %>
 <% 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>
+  <%= render :partial => 'apply_resource_course_message', :locals => {:ma => ma} %>
+
 <% 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>
+  <%= render :partial => 'apply_resource_course_message_reply', :locals => {:ma => ma} %>
+
 <% 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>
+  <% user = User.find(ma.course_message.apply_user_id) %>
+  <%= render partial: "users/user_info_message_avatar", locals: {user: user} %>
+  <div>
+    <p class="lh25 mb10">
+    <span class="mr20 f16 color-grey3">
+      <%= link_to "#{user.try(:show_name)}", user_path(user), :target => "_blank", :title => "#{user.try(:show_name)}" %>
+    </span>
+      <span class="fontGrey4 f12"><%= time_from_now(ma.updated_at) %></span>
+      <span id="deal_info_<%= ma.id %>" class="ml20">
+     <% if ma.apply_result == 2 %>
+      <span class="fs12 infoTips bg-green">同意引用作业</span>
+     <% else %>
+        <span class="fs12 infoTips bg-refuse">拒绝引用作业</span>
+     <%end %>
+   </span>
+    </p>
+    <p class="c_grey02 f14">
+      <% 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 %>
+    </p>
+  </div>
 <% 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>
+  <% user = ma.course_message.user %>
+  <%= render partial: "users/user_info_message_avatar", locals: {user: user} %>
+
+  <div>
+    <%= render partial: "users/user_info_message_header", locals: {user: user, target_time: ma.updated_at} %>
+    <p class="c_grey02 f14">
+      <span class="homepageNewsType fl">
+        发布了问卷：
+      </span>
+      <%= 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' %>
+    </p>
+    <div style="display: none" class="message_title_red system_message_style">
+      <%= ma.course_message.polls_name %>
+    </div>
+  </div>
+
 <% 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>
+  <%= render partial: "users/user_info_message_avatar", locals: {user: ma.course_message.author} %>
+  <div>
+    <%= render partial: "users/user_info_message_header", locals: {user: ma.course_message.author, target_time: ma.updated_at} %>
+    <p class="c_grey02 f14">
+      <span class="homepageNewsType fl">
+         <%= ma.course_message.parent_id.nil? ? "发布了班级帖子：" : "评论了班级帖子：" %>
+      </span>
+      <% if ma.course_message.parent_id.nil? %>
+        <%= 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}"
+        %>
         <% 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>
+        <%= 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' %>
         <% end %>
-      </div>
-      <li class="homepageNewsTime fr"><%= time_tag(ma.created_at).html_safe %> </li>
+    </p>
+    <div  style="display: none" class="message_title_red system_message_style">
+      <p><strong>标题：</strong><%= ma.course_message.subject %></p>
+      <% unless ma.course_message.description.nil? %>
+        <div class="fl"><strong>内容：</strong></div>
+        <div class="ml36"><%= ma.course_message.content.html_safe %></div>
+      <% end %>
+    </div>
+
+  </div>
 
-    </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 %>
+  <% user = ma.course_message.user %>
+  <% unless ma.course_message.reviewer_role == 3 %>
+    <%= render partial: "users/user_info_message_avatar", locals: {user: user} %>
+  <% end %>
+  <div>
+    <p class="lh25 mb10">
+      <span class="mr20 f16 color-grey3">
+         <% 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' %>
+          <%= link_to "#{user.try(:show_name)}老师", user_path(user), :target => "_blank", :title => "#{user.try(:show_name)}" %>
           <% 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>
+      </span>
+      <span class="fontGrey4 f12"><%= time_from_now(ma.updated_at) %></span>
+    </p>
+    <p class="c_grey02 f14">
+      <span class="homepageNewsType fl">
+         <%= ma.status == 0 ? "评阅了您的作品：" : "重新评阅了您的作品：" %>
+      </span>
+      <%= link_to message_content(ma.try(:content)), student_work_index_path(:homework => ma.course_message.student_work.homework_common_id),
+                  :class =>"#{ma.viewed == 0 ? "newsBlack" : "newsGrey"}", :target => '_blank' %>
+    </p>
+    <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>
+
+  </div>
 <% 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>
-            </ul>
+          <% user = ma.course_message.user %>
+          <%= render partial: "users/user_info_message_avatar", locals: {user: user} %>
+          <div>
+            <%= render partial: "users/user_info_message_header", locals: {user: user, target_time: ma.updated_at} %>
+            <p class="c_grey02 f14">
+            <span class="homepageNewsType fl">
+              在班级中留言了：
+            </span>
+              <%= link_to message_content(ma.course_message.notes), course_feedback_path(:id => ma.course_id),
+                          :class => "#{ma.viewed == 0 ? "newsBlack" : "newsGrey"}", :target => '_blank' %>
+              </p>
+            <div style="display: none" class="message_title_red system_message_style">
+              <%= ma.course_message.notes.html_safe %>
+            </div>
+          </div>
         <% end %>
     <% elsif ma.course_message.jour_type == 'HomeworkCommon' %>
-        <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">
-                      <% 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 message_content(ma.course_message.notes), student_work_index_path(:homework => ma.course_message.jour.id),
-                          :class => "#{ma.viewed == 0 ? "newsBlack" : "newsGrey"}", :target => '_blank' %>
-              <!--:onmouseover => "message_titile_show($(this),event)",-->
-              <!--:onmouseout => "message_titile_hide($(this))" %>-->
-            </li>
-          </div>
+      <% user = ma.course_message.user %>
+      <%= render partial: "users/user_info_message_avatar", locals: {user: user} %>
+        <div>
+          <%= render partial: "users/user_info_message_header", locals: {user: user, target_time: ma.updated_at} %>
+          <p class="c_grey02 f14">
+            <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>
+            <%= link_to message_content(ma.course_message.notes), student_work_index_path(:homework => ma.course_message.jour.id),
+                        :class => "#{ma.viewed == 0 ? "newsBlack" : "newsGrey"}", :target => '_blank' %>
+          </p>
           <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>
+        </div>
+
     <% 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>
+      <% user = ma.course_message.user %>
+      <% show_name = ma.course_message.jour.reviewer_role != 3 || ma.course_message.user.allowed_to?(:as_teacher, ma.course) %>
+      <% if show_name %>
+        <%= render partial: "users/user_info_message_avatar", locals: {user: user} %>
+      <% end %>
+      <div>
+        <p class="lh25 mb10">
+          <span class="mr20 f16 color-grey3">
+            <%= 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)",  :target => '_blank' %>
+          </span>
+          <span class="fontGrey4 f12"><%= time_from_now(ma.updated_at) %></span>
+        </p>
+        <p class="c_grey02 f14">
+        <span class="homepageNewsType fl">
+           回复了作品评论：
+        </span>
+          <%= 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' %>
+        </p>
+        <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>
+      </div>
     <% 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>
+  <% user = ma.course_message.homework_common.user %>
+  <%= render partial: "users/user_info_message_avatar", locals: {user: user} %>
+  <div>
+    <p class="lh25 mb10">
+      <span class="mr20 f16 color-grey3">
+        <%= link_to "#{user.try(:show_name)}老师", user_path(user), :target => "_blank", :title => "#{user.try(:show_name)}" %>
+      </span>
+      <span class="fontGrey4 f12"><%= time_from_now(target_time) %></span>
+    </p>
+    <p class="c_grey02 f14">
+      <span class="homepageNewsType fl">
+        发布的作业：
+      </span>
+      <%= 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' %>
+    </p>
+    <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>
+  </div>
 <% 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>
+  <% user = ma.course_message.user %>
+  <%= render partial: "users/user_info_message_avatar", locals: {user: user} %>
+  <div>
+    <%= render partial: "users/user_info_message_header", locals: {user: user, target_time: ma.updated_at} %>
+    <p class="c_grey02 f14">
+      <span class="homepageNewsType fl">
+        重新提交了作品：
+      </span>
+      <%= 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' %>
+    </p>
+  </div>
+
 <% 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>
+  <% user = ma.course_message.user %>
+  <%= render partial: "users/user_info_message_avatar", locals: {user: user} %>
+  <div>
+    <%= render partial: "users/user_info_message_header", locals: {user: user, target_time: ma.updated_at} %>
+    <p class="c_grey02 f14">
+      <span class="homepageNewsType fl">
+        追加新附件了：
+      </span>
+      <%= 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' %>
+    </p>
+  </div>
 <% 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 %>
+  <%= link_to image_tag(url_to_avatar(""), class:"r_list_img"), "javascript:void(0);", :target => '_blank' %>
+  <div>
+    <p class="lh25 mb10">
+      <span class="mr20 f16 color-grey3">
+         <% if ma.status == 1 %>
+          <%= link_to "匿名用户", "javascript:void(0);", :target => "_blank" %>
+         <% 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' %>
+            <%= link_to deal_user.show_name, user_path(deal_user), :target => '_blank' %>
           <% end %>
-          <span class="<%= ma.viewed == 0 ? "homepageNewsTypeNotRead fl" : "homepageNewsType fl" %>">
-              <% if ma.status == 1 %>
-              对您的评阅发起申诉：
-              <% elsif ma.status == 3 %>
-              接受申诉：
-              <% elsif ma.status == 4 %>
-              拒绝申诉：
-              <% 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>
+      </span>
+      <span class="fontGrey4 f12"><%= time_from_now(ma.updated_at) %></span>
+      <span class="fs12">
+        <% if ma.status == 1 %>
+          <span class="fontGrey4">对您的评阅发起申诉：</span>
+        <% elsif ma.status == 3 %>
+          <span class="infoTips bg-green">接受申诉：</span>
+        <% elsif ma.status == 4 %>
+          <span class="infoTips bg-refuse">拒绝申诉：</span>
+        <% end %>
+      </span>
+    </p>
+    <p class="c_grey02 f14">
+      <%= 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' %>
+    </p>
+  </div>
+
 <% 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>
+  <%= link_to image_tag("/images/trustie_logo1.png", class:"r_list_img"), "javascript:void(0);", :target => '_blank' %>
+  <div>
+    <p class="lh25 mb10">
+      <span class="mr20 f16 color-grey3">
+        <%= link_to "系统提示",  "javascript:void(0);" %>
+      </span>
+      <span class="fontGrey4 f12"><%= time_from_now(ma.created_at) %></span>
+    </p>
+    <p class="c_grey02 f14">
+      <span class="homepageNewsType fl">
+        您成功创建了班级：
+      </span>
+      <%= link_to "班级名称：" + ma.course_message.name, course_path(ma.course_message),
+                  :class => "#{ma.viewed==0 ? "newsBlack" : "newsGrey"}", :target => '_blank' %>
+    </p>
+  </div>
 <% 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>
+  <%= render :partial => 'join_course_course_message', :locals => {:ma => ma} %>
 <% 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' %>
-              </span>
-            <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">
+  <% message_user = User.find(ma.user_id) %>
+  <% user = User.find(ma.course_message_id) %>
+  <%= render partial: "users/user_info_message_avatar", locals: {user: message_user} %>
+  <div>
+    <p class="lh25 mb10">
+      <span class="mr20 f16 color-grey3">
+        <%= link_to message_user.try(:show_name), user_path(message_user), :target => "_blank", :title => "#{message_user.try(:show_name)}" %>
+      </span>
+      <span class="fontGrey4 f12"><%= time_from_now(ma.updated_at) %></span>
+      <span class="ml20">
         <% if ma.status == 1 %>
-            <span class="fl" title="<%= User.find(ma.course_message_id).show_name %>已同意"><%= User.find(ma.course_message_id).show_name %>已同意</span>
+          <span class="infoTips bg-green"><%= user.show_name %>已同意</span>
         <% else %>
-            <span class="fl" title="<%= User.find(ma.course_message_id).show_name %>已拒绝"><%= User.find(ma.course_message_id).show_name %>已拒绝</span>
+          <span class="infoTips bg-refuse"><%= user.show_name %>已拒绝</span>
         <% end %>
-      </li>
-      <li class="homepageNewsTime fr"><%= time_tag(ma.created_at).html_safe %> </li>
-    </ul>
+    </span>
+    </p>
+    <p class="c_grey02 f14">
+    <span class="homepageNewsType fl">
+      申请以“<%= ma.content.include?('9') ? '教师' : '教辅' %>”身份加入：
+    </span>
+      <%= link_to  Course.find(ma.course_id).name, course_path(Course.find(ma.course_id)),
+                   :class => "#{ma.viewed==0 ? "newsBlack" : "newsGrey"}", :target => '_blank' %>
+    </p>
+  </div>
+
 <% 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>
+  <% user = User.find(ma.course_message_id) %>
+  <%= render partial: "users/user_info_message_avatar", locals: {user: user} %>
+  <div>
+    <%= render partial: "users/user_info_message_header", locals: {user: user, target_time: ma.updated_at} %>
+
+    <p class="c_grey02 f14">
+    <span class="homepageNewsType fl">
+      将您加入了班级：
+    </span>
+      <%= link_to ma.course.name, course_member_path(ma.course), :class => "#{ma.viewed == 0 ? "newsBlack" : "newsGrey"}", :target => '_blank' %>
+    </p>
+    <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>
+  </div>
 <% 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).show_name) +")",
-                      {: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>
+  <%= link_to image_tag(url_to_avatar(""), class:"r_list_img"),"javascript:void(0)" %>
+  <div>
+    <p class="lh25 mb10">
+      <span class="mr20 f16 color-grey3">
+        <%= link_to "系统提示","javascript:void(0)" %>
+      </span>
+      <span class="fontGrey4 f12"><%= time_from_now(ma.updated_at) %></span>
+    </p>
+    <p class="c_grey02 f14">
+    <span class="homepageNewsType fl">
+      您增加了新的班级成员：
+    </span>
+      <%= link_to User.find(ma.course_message_id).login + "(" + (User.find(ma.course_message_id).show_name) +")",
+                  {:controller => 'courses', :action => 'settings', :id => ma.course_id, :tab => 'member'},
+                  :class => "#{ma.viewed == 0 ? "newsBlack" : "newsGrey"}",
+                  :target => '_blank' %>
+    </p>
+    <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>
+  </div>
 <% 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>
+  <% user = User.find(ma.course_message_id) %>
+  <%= render partial: "users/user_info_message_avatar", locals: {user: user} %>
+  <div>
+    <%= render partial: "users/user_info_message_header", locals: {user: user, target_time: ma.updated_at} %>
+
+    <p class="c_grey02 f14">
+    <span class="homepageNewsType fl">
+      将您移出了班级：
+    </span>
+      <%= link_to ma.course.name, member_course_path(ma.course), :class => "#{ma.viewed == 0 ? "newsBlack" : "newsGrey"}", :target => '_blank' %>
+    </p>
+    <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>
+        <p>学时总数：<%= ma.course.class_period %></p>
+      <% else %>
+        <p>
+          您已经被移出该私有班级，非班级成员没有权限访问私有班级
+        </p>
+      <% end %>
+    </div>
+  </div>
+
 <% 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">
-            <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>
-    </ul>
+  <% user = ma.course_message.user %>
+  <%= render partial: "users/user_info_message_avatar", locals: {user: user} %>
+  <div>
+    <p class="lh25 mb10">
+      <span class="mr20 f16 color-grey3">
+        <%= link_to "#{user.try(:show_name)}老师", user_path(user), :target => "_blank", :title => "#{user.try(:show_name)}" %>
+      </span>
+      <span class="fontGrey4 f12"><%= time_from_now(ma.updated_at) %></span>
+    </p>
+
+    <p class="c_grey02 f14">
+    <span class="homepageNewsType fl">
+      发布了班级测验：
+    </span>
+      <%= link_to "测验题目：" + ma.course_message.exercise_name, exercise_path(:id => ma.course_message.id), :class =>"#{ma.viewed == 0 ? "newsBlack" : "newsGrey"}", :target => '_blank' %>
+    </p>
+    <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>
+  </div>
 <% 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">
-           <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))"%>-->
+  <% user = ma.course_message.user %>
+  <%= render partial: "users/user_info_message_avatar", locals: {user: user} %>
+  <div>
+    <p class="lh25 mb10">
+      <span class="mr20 f16 color-grey3">
+        <%= link_to "#{user.try(:show_name)}老师", user_path(user), :target => "_blank", :title => "#{user.try(:show_name)}" %>
+      </span>
+      <span class="fontGrey4 f12"><%= time_from_now(ma.updated_at) %></span>
+      <span class="ml20 fs12 infoTips bg-refuse">
+        截止时间快到啦
+      </span>
+    </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>
+    <p class="c_grey02 f14">
+    <span class="homepageNewsType fl">
+      发布的测验：
+    </span>
+      <%= link_to "测验题目：" + ma.course_message.exercise_name, exercise_path(:id => ma.course_message.id), :class =>"#{ma.viewed == 0 ? "newsBlack" : "newsGrey"}", :target => '_blank' %>
+    </p>
+    <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>
+      <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>
+  </div>
 <% end %>
diff --git a/app/views/users/_user_message_forum.html.erb b/app/views/users/_user_message_forum.html.erb
index 920b4d877..2e3308bb8 100644
--- a/app/views/users/_user_message_forum.html.erb
+++ b/app/views/users/_user_message_forum.html.erb
@@ -1,28 +1,19 @@
 
     <% if ma.memo_type == "Memo" && !ma.memo.nil? && !ma.memo.author.nil? %>
-        <ul class="homepageNewsList fl">
-          <div class="longMessageWidth">
-            <li class="homepageNewsPortrait fl">
-              <%=link_to image_tag(url_to_avatar(ma.memo.author), :width => "30", :height => "30"), user_path(ma.memo.author), :target => '_blank' %>
-            </li>
-            <li class="homepageNewsPubType fl">
-              <%=link_to User.find(ma.memo.author_id).show_name, user_path(ma.memo.author), :class => "newsBlue homepageNewsPublisher", :target => '_blank' %>
-              <span class="homepageNewsType fl" ><%= ma.memo.parent_id.nil? ? "在贴吧发布帖子：" : "回复了贴吧帖子：" %></span>
-            </li>
-            <% if ma.memo.parent_id.nil? %>
-                <li class="messageInformationContents">
-                  <%= link_to ma.memo.subject, forum_memo_path(ma.memo.forum_id, ma.memo.parent_id ? ma.memo.parent_id: ma.memo.id), :class =>"#{ma.viewed == 0 ? "newsBlack" : "newsGrey"}", :target => '_blank' %>
-                  <!--:onmouseover =>"message_titile_show($(this),event)",-->
-                  <!--:onmouseout => "message_titile_hide($(this))" %>-->
-                </li>
-            <% else %>
-                <li class="messageInformationContents">
-                  <%= link_to message_content(ma.memo.content), forum_memo_path(ma.memo.forum_id, ma.memo.parent_id ? ma.memo.parent_id: ma.memo.id), :class =>"#{ma.viewed == 0 ? "newsBlack" : "newsGrey"}", :target => '_blank' %>
-                  <!--:onmouseover =>"message_titile_show($(this),event)",-->
-                  <!--:onmouseout => "message_titile_hide($(this))" %>-->
-                </li>
-            <% end %>
-          </div>
-          <li class="homepageNewsTime fr"><%= time_tag(ma.memo.created_at).html_safe %> </li>
-        </ul>
+
+      <% user = ma.memo.author %>
+      <%= render partial: "users/user_info_message_avatar", locals: {user: user} %>
+      <div>
+        <%= render partial: "users/user_info_message_header", locals: {user: user, target_time: ma.updated_at} %>
+        <p class="c_grey02 f14">
+          <span class="homepageNewsType fl">
+            <%= ma.memo.parent_id.nil? ? "在贴吧发布帖子：" : "回复了贴吧帖子：" %>
+          </span>
+          <% if ma.memo.parent_id.nil? %>
+            <%= link_to ma.memo.subject, forum_memo_path(ma.memo.forum_id, ma.memo.parent_id ? ma.memo.parent_id: ma.memo.id), :class =>"#{ma.viewed == 0 ? "newsBlack" : "newsGrey"}", :target => '_blank' %>
+        <% else %>
+            <%= link_to message_content(ma.memo.content), forum_memo_path(ma.memo.forum_id, ma.memo.parent_id ? ma.memo.parent_id: ma.memo.id), :class =>"#{ma.viewed == 0 ? "newsBlack" : "newsGrey"}", :target => '_blank' %>
+        <% end %>
+        </p>
+      </div>
     <% end %>
diff --git a/app/views/users/_user_message_organization_applied_action.html.erb b/app/views/users/_user_message_organization_applied_action.html.erb
index ff069ee62..80fba9dc8 100644
--- a/app/views/users/_user_message_organization_applied_action.html.erb
+++ b/app/views/users/_user_message_organization_applied_action.html.erb
@@ -5,7 +5,7 @@
     <%= link_to "拒绝", refused_apply_subdomain_organizations_path(:organization_id => ma.applied_id, :org_domain => ma.name, :user_id => ma.applied_user_id, :ma_id => ma.id),
                 :remote => true, :method => :post, :class => "link-blue",:style => "font-size: 14px;"  %>
 <% elsif ma.status == 2 %>
-    <span style="font-size:14px;">已同意</span>
+    <span class="fs12 infoTips bg-green">已同意</span>
 <% elsif ma.status == 4 %>
-    <span style="font-size:14px;">已拒绝</span>
+    <span class="fs12 infoTips bg-refuse">已拒绝</span>
 <% end %>
\ No newline at end of file