From bc3fbc270f2ca9de873429f613a3e373ca0bde52 Mon Sep 17 00:00:00 2001
From: ouyangxuhua <ouyangxuhua167@163.com>
Date: Fri, 23 Oct 2015 16:28:22 +0800
Subject: [PATCH] =?UTF-8?q?=E5=B0=86=E5=AD=A6=E7=94=9F=E6=94=B9=E6=88=90?=
 =?UTF-8?q?=E5=90=8C=E5=AD=A6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/views/users/_user_message_course.html.erb | 2 +-
 public/stylesheets/new_user.css               | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/views/users/_user_message_course.html.erb b/app/views/users/_user_message_course.html.erb
index fb63f4fc0..91ea32a62 100644
--- a/app/views/users/_user_message_course.html.erb
+++ b/app/views/users/_user_message_course.html.erb
@@ -361,7 +361,7 @@
               <div style="display: none" class="message_title_red system_message_style">
                 <p>
                   <%= User.current.show_name %>老师您好！
-                  <%= ma.course_message.user.show_name%><%= ma.course_message.user.allowed_to?(:as_teacher, ma.course)?"老师":"学生"%>回复了您的作品评论。详情如下：
+                  <%= ma.course_message.user.show_name%><%= ma.course_message.user.allowed_to?(:as_teacher, ma.course)?"老师":"同学"%>回复了您的作品评论。详情如下：
                 </p>
                 <ul class="ul_normal_color">
                   <li>回复内容：<span style="color:red;"><%= ma.course_message.notes  %></span></li>
diff --git a/public/stylesheets/new_user.css b/public/stylesheets/new_user.css
index 599ea5476..d0dbaa8ca 100644
--- a/public/stylesheets/new_user.css
+++ b/public/stylesheets/new_user.css
@@ -1268,7 +1268,7 @@ a:hover.tijiao{ background:#0f99a9;}
 #cboxPrevious{position:absolute; bottom:0px; left:0; color:#444;}
 #cboxNext{position:absolute; bottom:0px; left:63px; color:#444;}
 #cboxClose{position:absolute; bottom:0; right:0; display:block; color:#444;}
-.system_message_style {line-height: 19.1px; max-width: 681px;overflow:hidden; work-wrap: break-word; word-break: break-all;}
+.system_message_style {line-height: 19.1px; max-width: 681px; work-wrap: break-word; word-break: break-all; text-overflow:clip;}
 .system_message_style img {max-width: 100%;}
 /*20150906关联项目LB*/
 a.RalationIcon{  background: url(../images/homepage_icon.png) -183px -396px  no-repeat; height:20px; display:block; padding-left:20px; color:#888888;}