From 3e857ba48f492b34d0eb9dd5ac0ce13f58c9af07 Mon Sep 17 00:00:00 2001
From: ouyangxuhua <ouyangxuhua167@163.com>
Date: Fri, 25 Sep 2015 11:04:46 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BD=9C=E4=B8=9A=E6=B6=88=E6=81=AF=EF=BC=9A?=
 =?UTF-8?q?=E6=88=AA=E6=AD=A2=E6=97=A5=E6=9C=9F=E5=BF=AB=E5=88=B0=E6=97=B6?=
 =?UTF-8?q?=EF=BC=8C=E7=BB=99=E5=87=BA=E6=B6=88=E6=81=AF=E6=8F=90=E9=86=92?=
 =?UTF-8?q?=E3=80=82=E4=BF=AE=E6=94=B9=E6=8F=90=E9=86=92=E5=86=85=E5=AE=B9?=
 =?UTF-8?q?=E5=8F=8A=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 | 111 +++++++++++++------------
 1 file changed, 57 insertions(+), 54 deletions(-)

diff --git a/app/views/users/user_messages.html.erb b/app/views/users/user_messages.html.erb
index 916493561..c4382a145 100644
--- a/app/views/users/user_messages.html.erb
+++ b/app/views/users/user_messages.html.erb
@@ -148,7 +148,7 @@
                             <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_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>
@@ -163,59 +163,62 @@
                     <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">
-                            <% if User.current.members.where("course_id = ?", ma.course_message.course.id).first.roles.first.name == 'Student' %>
-                                <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.end_time %></p>
-                                <p><strong>匿评自动关闭日期：</strong><%= ma.course_message.homework_detail_manual.evaluation_end %></p>
-                                <p><strong>迟交扣分：</strong><%= ma.course_message.late_penalty %>分</p>
-                                <p>
-                                  请同学们抓紧时间提交自己的作品，谢谢！
-                                </p>
-                            <% else %>
-                                <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.end_time %></p>
-                                <p><strong>匿评自动开始日期：</strong><%= ma.course_message.homework_detail_manual.evaluation_start %></p>
-                                <p><strong>匿评自动关闭日期：</strong><%= ma.course_message.homework_detail_manual.evaluation_end %></p>
-                                <p><strong>迟交扣分：</strong><%= ma.course_message.late_penalty %>分</p>
-                                <p><strong>缺评扣分：</strong><%= ma.course_message.homework_detail_manual.absence_penalty %>分</p>
-                                <p>
-                                  您可以修改作业内容、评分规则、匿评过程等，谢谢！
-                                </p>
-                            <% end %>
-                          </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="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">
+                        <% if User.current.members.where("course_id = ?", ma.course_message.course.id).first.roles.first.name == 'Student' %>
+                            <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_end %>
+                              @nbsp;@nbsp;24点</span></p>
+
+                            <p>迟交扣分：<span style="color:Red;"><%= ma.course_message.late_penalty %>分</span></p>
+
+                            <p>
+                              请同学们抓紧时间提交自己的作品，谢谢！
+                            </p>
+                        <% else %>
+                            <p><%= User.current.lastname + User.current.firstname %>您好！
+                              <%= 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>
+
+                            <p><strong>提交截止：</strong><%= ma.course_message.end_time %>@nbsp;@nbsp;24点</p>
+
+                            <p><strong>匿评开始：</strong><%= ma.course_message.homework_detail_manual.evaluation_start %>
+                              @nbsp;@nbsp;24点</p>
+
+                            <p><strong>匿评关闭：</strong><%= ma.course_message.homework_detail_manual.evaluation_end %>
+                              @nbsp;@nbsp;24点</p>
+
+                            <p><strong>迟交扣分：</strong><%= ma.course_message.late_penalty %>分</p>
+
+                            <p><strong>缺评扣分：</strong><%= ma.course_message.homework_detail_manual.absence_penalty %>分
+                            </p>
+
+                            <p>
+                              您可以修改作业内容、评分规则、匿评过程等，谢谢！
+                            </p>
+                        <% end %>
+                      </div>
+                      <li class="homepageHomeworkContentWarn fl"> &nbsp;&nbsp; 截止时间快到了！</li>
                       <li class="homepageNewsTime fl"><%= time_tag(ma.created_at).html_safe %> </li>
                     </ul>
                 <% end %>