From 841c680bb14c04d3d7b826b6793540dc80469bb4 Mon Sep 17 00:00:00 2001
From: ouyangxuhua <ouyangxuhua167@163.com>
Date: Wed, 23 Sep 2015 14:53:50 +0800
Subject: [PATCH] =?UTF-8?q?1.=E4=BD=9C=E4=B8=9A=E6=B6=88=E6=81=AF=E5=A2=9E?=
 =?UTF-8?q?=E5=8A=A0=E6=98=BE=E7=A4=BA=E8=80=81=E5=B8=88=E3=80=81=E8=AF=BE?=
 =?UTF-8?q?=E7=A8=8B=E3=80=81=E8=AF=BE=E7=A8=8B=E5=AD=A3=E5=BA=A6=E7=AD=89?=
 =?UTF-8?q?=E4=BF=A1=E6=81=AF=202.=E4=BD=9C=E4=B8=9A=E5=86=85=E5=AE=B9?=
 =?UTF-8?q?=E4=B8=BA=E7=A9=BA=E6=97=B6=EF=BC=8Ctips=E4=B8=AD=E4=B8=8D?=
 =?UTF-8?q?=E6=98=BE=E7=A4=BA=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 | 9 ++++++---
 public/stylesheets/new_user.css        | 3 +++
 2 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/app/views/users/user_messages.html.erb b/app/views/users/user_messages.html.erb
index ac4572b5b..97a67a717 100644
--- a/app/views/users/user_messages.html.erb
+++ b/app/views/users/user_messages.html.erb
@@ -118,15 +118,18 @@
                 <% if ma.course_message_type == "HomeworkCommon" && ma.status.nil? %>
                     <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>
-                      <li class="homepageNewsContent fl"><a href="javascript:void(0);" class="newsGrey">
+                      <li class="homepageNewsPubTypeHomework 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 ? "homepageNewsTypeNotReadHomework fl":"homepageNewsTypeHomework fl" %>">发布了作业于课程：<%= ma.course_message.course.name %></span>
+                      </li>
+                      <li class="homepageNewsContent fl" style="width:315px;"><a href="javascript:void(0);" class="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))" %></a></li>
                       <div  style="display: none" class="message_title_red system_message_style">
+                        <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.nil? %>
+                        <% unless ma.course_message.description.blank? %>
                             <div class="fl"><strong>内容：</strong></div>
                             <div class="ml36"><%= ma.course_message.description.html_safe %></div>
                         <% end %>
diff --git a/public/stylesheets/new_user.css b/public/stylesheets/new_user.css
index 144589d5b..838050fe0 100644
--- a/public/stylesheets/new_user.css
+++ b/public/stylesheets/new_user.css
@@ -515,7 +515,9 @@ a.homepageMenuText {color:#484848; font-size:16px; margin-left:20px;}
 .homepageNewsPortrait {width:40px; display:block; margin-top:7px;}
 .homepageNewsPublisher { max-width:100px; font-size:12px; color:#269ac9; display:block; padding-left:5px; overflow:hidden; white-space: nowrap; text-overflow:ellipsis; float:left; }
 .homepageNewsType {width:110px; padding-left: 5px; font-size:12px; color:#888888; display:block;}
+.homepageNewsTypeHomework {width:160px; padding-left: 5px; font-size:12px; color:#888888; display:block; overflow:hidden; height:49px;word-break:break-all; word-wrap:break-word; text-overflow:ellipsis;}
 .homepageNewsPubType {width:220px; font-size:12px; color:#888888; display: block;}
+.homepageNewsPubTypeHomework {width:270px; font-size:12px; color:#888888; display: block; white-space:nowrap;}
 .homepageNewsContent {width:365px; max-width:365px; margin-right:10px; font-size:12px; color:#4b4b4b; display:block; overflow:hidden; white-space: nowrap; text-overflow:ellipsis;max-height: 49px; }
 .homepageSystenMessageContent {width:291px; max-width:291px; margin-right:10px; font-size:12px; color:#4b4b4b; display:block; overflow:hidden;text-overflow:ellipsis;max-height: 49px; }
 .homepageHomeworkContentWarn {width:110px; max-width:365px; margin-right:10px; font-size:12px; color:red; display:block; overflow:hidden; white-space: nowrap; text-overflow:ellipsis;max-height: 49px; }
@@ -974,6 +976,7 @@ img.ui-datepicker-trigger {
 }
 /*消息*/
 .homepageNewsTypeNotRead {width:100px; padding-left: 5px; font-size:12px; color:#4b4b4b; font-weight:bold; display:block;}
+.homepageNewsTypeNotReadHomework {width:170px; padding-left: 5px; font-size:12px; color:#4b4b4b; font-weight:bold; display:block;overflow:hidden; height:49px; word-break:break-all; word-wrap:break-word;text-overflow:ellipsis;}
 .calendar_input{border-left:none !important;border-bottom: none!important; border-top: none!important; border-right: 1px solid #d9d9d9;}
 .calendar_div{border: 1px solid #d9d9d9;}
 /*缺陷更新动态在消息中显示样式*/