From f4cad2897a4ccc6359f1b0955a936d6a63b6c5a3 Mon Sep 17 00:00:00 2001
From: ouyangxuhua <ouyangxuhua167@163.com>
Date: Thu, 24 Sep 2015 14:48:48 +0800
Subject: [PATCH] =?UTF-8?q?1.=E4=BF=AE=E6=94=B9=E8=80=81=E5=B8=88=E5=85=B3?=
 =?UTF-8?q?=E9=97=AD=E4=BD=9C=E5=93=81=E8=AF=84=E9=98=85=E5=92=8C=E5=BC=80?=
 =?UTF-8?q?=E5=90=AF=E4=BD=9C=E5=93=81=E8=AF=84=E9=98=85=E5=86=85=E5=AE=B9?=
 =?UTF-8?q?=E5=92=8C=E6=A0=B7=E5=BC=8F=202.=E4=BF=AE=E6=94=B9=E8=80=81?=
 =?UTF-8?q?=E5=B8=88=E5=85=B3=E9=97=AD=E4=BD=9C=E5=93=81=E8=AF=84=E9=98=85?=
 =?UTF-8?q?=E5=92=8C=E5=BC=80=E5=90=AF=E4=BD=9C=E5=93=81=E8=AF=84=E9=98=85?=
 =?UTF-8?q?=E7=9A=84tips=E5=86=85=E5=AE=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/views/users/user_messages.html.erb | 86 ++++++++++++--------------
 1 file changed, 41 insertions(+), 45 deletions(-)

diff --git a/app/views/users/user_messages.html.erb b/app/views/users/user_messages.html.erb
index c7895efb7..8f64d6c29 100644
--- a/app/views/users/user_messages.html.erb
+++ b/app/views/users/user_messages.html.erb
@@ -224,61 +224,57 @@
                       <li class="homepageNewsTime fl"><%= time_tag(ma.created_at).html_safe %> </li>
                     </ul>
                 <% end %>
-                <!--作品开启匿评 待整合：时间紧-->
-                <% if ma.course_message_type == "HomeworkCommon" && ma.status == 2 %>
-                    <ul class="homepageNewsList fl">
-                      <li class="homepageNewsPortrait fl"><a href="javascript:void(0);"><%=link_to image_tag(url_to_avatar(ma.course_message.user), :width => "30", :height => "30"), user_path(ma.course_message.user) %></a></li>
-                      <li class="homepageNewsPubType fl"><%=link_to ma.course_message.user, user_path(ma.course_message.user), :class => "newsBlue homepageNewsPublisher" %><span class="<%= ma.viewed == 0 ? "homepageNewsTypeNotRead fl":"homepageNewsType fl" %>">发布的作业：</span></li>
-                      <% if ma.viewed == 0 %>
-                          <li class="homepageHomeworkContent fl">
-                            <%= 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))" %>
-                          </li>
-                          <div  style="display: none" class="message_title_red system_message_style">
-                            <%= ma.course_message.name %>
-                          </div>
-                          <li  class="homepageHomeworkContentWarn fl"> &nbsp;&nbsp; 开启匿评了！</li>
-                      <% else %>
-                          <li class="homepageNewsContent fl">
-                            <%= 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))"%>
-                          </li>
-                          <div  style="display: none" class="message_title_red system_message_style">
-                            <%= ma.course_message.name %>
-                          </div>
-                      <% end %>
-                      <li class="homepageNewsTime fl"><%= time_tag(ma.created_at).html_safe %> </li>
-                    </ul>
-                <% end %>
+                  <!--作品开启匿评 待整合：时间紧-->
+                  <% if ma.course_message_type == "HomeworkCommon" && ma.status == 2 %>
+                      <ul class="homepageNewsList fl">
+                        <li class="homepageNewsPortrait fl">
+                          <a href="javascript:void(0);"><%= link_to image_tag(url_to_avatar(ma.course_message.user), :width => "30", :height => "30"), user_path(ma.course_message.user) %></a>
+                        </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" %>
+                          <span class="<%= ma.viewed == 0 ? "homepageNewsTypeNotRead fl" : "homepageNewsType fl" %>">启动了作业匿评：</span>
+                        </li>
+                        <li class="homepageNewsContent fl">
+                          <%= 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))" %>
+                        </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>
+                        </div>
+                        <li class="homepageNewsTime fl"><%= time_tag(ma.created_at).html_safe %> </li>
+                      </ul>
+                  <% end %>
                 <!--作品关闭匿评-->
                 <% if ma.course_message_type == "HomeworkCommon" && ma.status == 3 %>
                     <ul class="homepageNewsList fl">
                       <li class="homepageNewsPortrait fl"><a href="javascript:void(0);"><%=link_to image_tag(url_to_avatar(ma.course_message.user), :width => "30", :height => "30"), user_path(ma.course_message.user) %></a></li>
-                      <li class="homepageNewsPubType fl"><%=link_to ma.course_message.user, user_path(ma.course_message.user), :class => "newsBlue homepageNewsPublisher" %><span class="<%= ma.viewed == 0 ? "homepageNewsTypeNotRead fl":"homepageNewsType fl" %>">发布的作业：</span></li>
-                      <% if ma.viewed == 0 %>
-                          <li class="homepageHomeworkContent fl">
-                            <%= 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))" %>
-                          </li>
-                          <div  style="display: none" class="message_title_red system_message_style">
-                            <%= ma.course_message.name %>
-                          </div>
-                          <li  class="homepageHomeworkContentWarn fl"> &nbsp;&nbsp; 匿评已经关闭！</li>
-                      <% else %>
+                      <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" %><span class="<%= ma.viewed == 0 ? "homepageNewsTypeNotRead fl":"homepageNewsType fl" %>">关闭了作业匿评：</span></li>
                           <li class="homepageNewsContent fl">
-                            <%= link_to ma.course_message.name, student_work_index_path(:homework => ma.course_message.id), :class =>"#{ma.viewed == 0 ? "newsBlack" : "newsGrey"}",
+                            <%= 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))"%>
                           </li>
                           <div  style="display: none" class="message_title_red system_message_style">
-                            <%= ma.course_message.name %>
+                            <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 %>
                           </div>
-                      <% end %>
                       <li class="homepageNewsTime fl"><%= time_tag(ma.created_at).html_safe %> </li>
                     </ul>
                 <% end %>