From f8d7c61065cd81e4feb4cdf7a72528ba3d9b1313 Mon Sep 17 00:00:00 2001
From: ouyangxuhua <ouyangxuhua167@163.com>
Date: Mon, 28 Sep 2015 11:22:00 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E4=BD=9C=E4=B8=9A=E6=B6=88?=
 =?UTF-8?q?=E6=81=AF=E6=98=BE=E7=A4=BA=E5=86=85=E5=AE=B9=E5=8F=8A=E6=A0=B7?=
 =?UTF-8?q?=E5=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/views/users/user_messages.html.erb | 27 ++++++++++++++------------
 1 file changed, 15 insertions(+), 12 deletions(-)

diff --git a/app/views/users/user_messages.html.erb b/app/views/users/user_messages.html.erb
index 4d0f3f6bd..6d682048f 100644
--- a/app/views/users/user_messages.html.erb
+++ b/app/views/users/user_messages.html.erb
@@ -191,14 +191,14 @@
                               请同学们抓紧时间提交自己的作品，谢谢！
                             </p>
                         <% else %>
-                            <p><%= User.current.lastname + User.current.firstname %>您好！
+                            <p><%= User.current.lastname + User.current.firstname %>老师您好！
                               <%= ma.course_message.user.lastname + ma.course_message.user.firstname %>
                               老师发布的作业截止日期快到了：</p>
 
                             <p>课程名称：<%= ma.course_message.course.name %>
                               (<%= ma.course_message.course.term %>)</p>
 
-                            <p>作业标题：<%= ma.course_message.name %></p>
+                            <p>作业标题：<span style="color:Red;"><%= ma.course_message.name %></span></p>
 
                             <p>提交截止：<span style="color:Red;"><%= ma.course_message.end_time %>@nbsp;@nbsp;24点</span></p>
 
@@ -239,14 +239,15 @@
                                       :onmouseout => "message_titile_hide($(this))" %>
                         </li>
                         <div style="display: none" class="message_title_red system_message_style">
-                          <p>您好！<%= ma.course_message.user.lastname + ma.course_message.user.firstname %>老师开启了匿评，作业详情如下：</p>
-                          <p><strong>课程：</strong><%= ma.course_message.course.name %>(<%= ma.course_message.course.term %>)</p>
-                          <p><strong>作业标题：</strong><%= ma.course_message.name %></p>
-                          <% unless ma.course_message.description.blank? %>
-                              <div class="fl"><strong>作业内容：</strong></div>
-                              <div class="ml60"><%= ma.course_message.description.html_safe %></div>
-                          <% end %>
-                          <p><strong>匿评自动关闭日期：</strong><%= ma.course_message.homework_detail_manual.evaluation_end %>
+                          <p>
+                            <%= User.current.lastname + User.current.firstname %><%= User.current.members.where("course_id=?", ma.course.id).first.roles.first.name == 'Student' ? '同学' : '老师' %>
+                            您好！<%= ma.course_message.user.lastname + ma.course_message.user.firstname %>老师开启了匿评，作业详情如下：
+                          </p>
+                          <p>课程名称：<%= ma.course_message.course.name %>(<%= ma.course_message.course.term %>)</p>
+                          <p>作业标题：<span style="color:Red;"><%= ma.course_message.name %></span></p>
+
+                          <p>
+                            匿评开启：<span style="color:Red;"><%= ma.course_message.homework_detail_manual.evaluation_end %>&nbsp;&nbsp;24点</span>
                           </p>
                         </div>
                         <li class="homepageNewsTime fl"><%= time_tag(ma.created_at).html_safe %> </li>
@@ -265,8 +266,10 @@
                                         :onmouseout => "message_titile_hide($(this))"%>
                           </li>
                           <div  style="display: none" class="message_title_red system_message_style">
-                            <p>您好！<%= ma.course_message.user.lastname + ma.course_message.user.firstname %>老师关闭了匿评，作业详情如下：</p>
-                            <p><strong>课程：</strong><%= ma.course_message.course.name %>(<%= ma.course_message.course.term %>)</p>
+                            <p>
+                              <%= User.current.lastname + User.current.firstname %><%= User.current.members.where("course_id=?", ma.course.id).first.roles.first.name == 'Student' ? '同学':'老师'%>您好！<%= ma.course_message.user.lastname + ma.course_message.user.firstname %>老师关闭了匿评，作业详情如下：
+                            </p>
+                            <p>课程名称：<%= ma.course_message.course.name %>(<%= ma.course_message.course.term %>)</p>
                             <p><strong>作业标题：</strong><%= ma.course_message.name %></p>
                             <% unless ma.course_message.description.blank? %>
                                 <div class="fl"><strong>作业内容：</strong></div>