From b58fcb58de67bb5ce18541037283cc69cd5c3fcf Mon Sep 17 00:00:00 2001
From: ouyangxuhua <ouyangxuhua167@163.com>
Date: Mon, 28 Sep 2015 14:45:59 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BD=9C=E4=B8=9A=E6=B6=88=E6=81=AF=E7=9A=84?=
 =?UTF-8?q?=E5=86=85=E5=AE=B9=E6=9B=B4=E6=96=B0=EF=BC=9B=20=E6=9B=B4?=
 =?UTF-8?q?=E6=94=B9=E6=A0=B7=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 | 95 ++++++++------------------
 1 file changed, 28 insertions(+), 67 deletions(-)

diff --git a/app/views/users/user_messages.html.erb b/app/views/users/user_messages.html.erb
index 93969f71b..63876084d 100644
--- a/app/views/users/user_messages.html.erb
+++ b/app/views/users/user_messages.html.erb
@@ -127,7 +127,7 @@
                                     :onmouseover =>"message_titile_show($(this),event)",
                                     :onmouseout => "message_titile_hide($(this))" %></a></li>
                       <div  style="display: none" class="message_title_red system_message_style">
-                        <% if User.current.allowed_to?(:as_teacher,ma.course_message) %>
+                        <% 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 %>老师刚刚发布了一个作业：
@@ -175,47 +175,22 @@
                               <%= 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>作业标题：<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>
-
-                            <p>匿评关闭：<span style="color:Red;"><%= ma.course_message.homework_detail_manual.evaluation_end %>
-                              @nbsp;@nbsp;24点</span></p>
-
+                            <p>匿评关闭：<span style="color:Red;"><%= ma.course_message.homework_detail_manual.evaluation_end %>@nbsp;@nbsp;24点</span></p>
                             <p>迟交扣分：<span style="color:Red;"><%= ma.course_message.late_penalty %>分</span></p>
-
-                            <p>
-                              请同学们抓紧时间提交自己的作品，谢谢！
-                            </p>
+                            <p>请同学们抓紧时间提交自己的作品，谢谢！</p>
                         <% else %>
-                            <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><%= 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>作业标题：<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>
-
-                            <p>匿评开始：<span style="color:Red;"><%= ma.course_message.homework_detail_manual.evaluation_start %>
-                              @nbsp;@nbsp;24点</span></p>
-
-                            <p>匿评关闭：<span style="color:Red;"><%= ma.course_message.homework_detail_manual.evaluation_end %>
-                              @nbsp;@nbsp;24点</span></p>
-
+                            <p>匿评开始：<span style="color:Red;"><%= ma.course_message.homework_detail_manual.evaluation_start %>@nbsp;@nbsp;24点</span></p>
+                            <p>匿评关闭：<span style="color:Red;"><%= ma.course_message.homework_detail_manual.evaluation_end %>@nbsp;@nbsp;24点</span></p>
                             <p>迟交扣分：<span style="color:Red;"><%= ma.course_message.late_penalty %>分</span></p>
-
-                            <p>缺评扣分：<span style="color:Red;"><%= ma.course_message.homework_detail_manual.absence_penalty %>分</span>
-                            </p>
-
-                            <p>
-                              您可以修改作业内容、评分规则、匿评过程等，谢谢！
-                            </p>
+                            <p>缺评扣分：<span style="color:Red;"><%= ma.course_message.homework_detail_manual.absence_penalty %>分</span></p>
+                            <p>您可以修改作业内容、评分规则、匿评过程等，谢谢！</p>
                         <% end %>
                       </div>
                       <li class="homepageHomeworkContentWarn fl"> &nbsp;&nbsp; 截止时间快到了！</li>
@@ -240,14 +215,13 @@
                         </li>
                         <div style="display: none" class="message_title_red system_message_style">
                           <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 %>老师开启了匿评，作业详情如下：
+                            <%= 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>
+                            截止日期：<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>
@@ -267,14 +241,11 @@
                           </li>
                           <div  style="display: none" class="message_title_red system_message_style">
                             <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 %>老师关闭了匿评，作业详情如下：
+                              <%= 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>
-                                <div class="ml60"><%= ma.course_message.description.html_safe %></div>
-                            <% end %>
+                            <p>作业标题：<span style="color:Red;"><%= ma.course_message.name %></span></p>
                           </div>
                       <li class="homepageNewsTime fl"><%= time_tag(ma.created_at).html_safe %> </li>
                     </ul>
@@ -296,13 +267,12 @@
                                       :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>
+                            <%= User.current.lastname + User.current.firstname %><%= User.current.allowed_to?(:as_teacher, ma.course_message.course) ? '老师':'同学'%>您好！
+                            <%= 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>
                         </div>
                         <li class="homepageNewsTime fl"><%= time_tag(ma.created_at).html_safe %> </li>
                       </ul>
@@ -386,13 +356,8 @@
                                         :onmouseout => "message_titile_hide($(this))" %></a></li>
                             <div  style="display: none" class="message_title_red system_message_style" >
                               <%= ma.content.html_safe %>
-                              <p><strong>课程：</strong><%= ma.course.name %>
-                                (<%= ma.course.term %>)</p>
-                              <p><strong>作业标题：</strong><%=ma.course_message.student_work.homework_common.name %></p>
-                              <% unless ma.course_message.student_work.homework_common.description.blank? %>
-                                  <div class="fl"><strong>作业内容：</strong></div>
-                                  <div class="ml60"><%= ma.course_message.student_work.homework_common.description.html_safe %></div>
-                              <% end %>
+                              <p>课程名称：<%= ma.course.name %>(<%= ma.course.term %>)</p>
+                              <p>作业标题：<span style="color:Red;"><%=ma.course_message.student_work.homework_common.name %></span></p>
                             </div>
                         <% end %>
                         <li class="homepageNewsTime fl"><%= time_tag(ma.created_at).html_safe %> </li>
@@ -437,16 +402,12 @@
                                         :onmouseout => "message_titile_hide($(this))" %></a>
                           </li>
                           <div style="display: none" class="message_title_red system_message_style">
-                            <div class="fl"><strong>回复内容：</strong></div>
+                            <div class="fl">回复内容：</div>
                             <div class="ml60"><%= ma.course_message.notes  %></div>
-                            <div class="fl"><strong>您的作品评论：</strong></div>
-                            <div class="ml80"><%= ma.course_message.jour.comment  %></div>
-                            <p><strong>课程：</strong><%= ma.course.name %>(<%= ma.course.term %>)</p>
-                            <p><strong>作业标题：</strong><%=ma.course_message.jour.student_work.homework_common.name %></p>
-                            <% unless ma.course_message.jour.student_work.homework_common.description.blank? %>
-                                <div class="fl"><strong>作业内容：</strong></div>
-                                <div class="ml60"><%= ma.course_message.jour.student_work.homework_common.description.html_safe %></div>
-                            <% end %>
+                            <div class="fl">您的评论：</div>
+                            <div class="ml60"><%= ma.course_message.jour.comment  %></div>
+                            <p>课程名称：<%= ma.course.name %>(<%= ma.course.term %>)</p>
+                            <p>作业标题：<span style="color:Red;"><%=ma.course_message.jour.student_work.homework_common.name %></span></p>
                           </div>
                           <li class="homepageNewsTime fl"><%= time_tag(ma.created_at).html_safe %> </li>
                         </ul>