From f67bdae22a5fb72f23947d209cee06bf8edd53a9 Mon Sep 17 00:00:00 2001
From: sw <939547590@qq.com>
Date: Fri, 24 Apr 2015 09:10:15 +0800
Subject: [PATCH] =?UTF-8?q?=E8=AF=BE=E7=A8=8B=E8=AE=A8=E8=AE=BA=E5=8E=BB?=
 =?UTF-8?q?=E5=BC=95=E7=94=A8=E3=80=81=E5=9B=9E=E5=B8=96=E4=B8=8D=E6=8D=A2?=
 =?UTF-8?q?=E8=A1=8C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/views/messages/_course_show.html.erb | 4 ++--
 app/views/news/_course_show.html.erb     | 2 +-
 public/stylesheets/courses.css           | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/app/views/messages/_course_show.html.erb b/app/views/messages/_course_show.html.erb
index 018783fbd..579b26d65 100644
--- a/app/views/messages/_course_show.html.erb
+++ b/app/views/messages/_course_show.html.erb
@@ -41,7 +41,7 @@
               :class => 'talk_edit fr'
       ) if @message.course_destroyable_by?(User.current) %>
   <div class="cl"></div>
-  <div class="talk_info mb10 upload_img"><%= @topic.content.html_safe %></div>
+  <div class="talk_info mb10 upload_img break_word"><%= @topic.content.html_safe %></div>
   <div class="talk_info mb10"><%= link_to_attachments_course @topic, :author => false %></div>
   <!-- <a href="#" class=" link_file ml60">附件：爱覅俄方if.zip(27.5kB)</a>-->
   <div class="cl"></div>
@@ -65,7 +65,7 @@
         <div class="ping_C mb10 ml50" id="<%= "message-#{message.id}" %>">
           <div class="ping_dispic"><%= link_to image_tag(url_to_avatar(message.author), :width => '46',:height => '46'), user_path(message.author) %></div>
           <div class="ping_discon">
-            <div class="ping_distop upload_img">
+            <div class="ping_distop upload_img break_word">
               <%= link_to_user_header message.author,false,:class => 'c_blue fb fl mb10 ' %>
               <span class="c_grey fr"><%= format_time(message.created_on) %></span>
               <div class="cl"></div>
diff --git a/app/views/news/_course_show.html.erb b/app/views/news/_course_show.html.erb
index fe73d3d75..63e2ffb85 100644
--- a/app/views/news/_course_show.html.erb
+++ b/app/views/news/_course_show.html.erb
@@ -68,7 +68,7 @@
       <div class="ping_C mb10">
         <div class="ping_dispic"><%= link_to image_tag(url_to_avatar(comment.author),:width => 42,:height => 42), user_path(comment.author)%></div>
         <div class="ping_discon">
-          <div class="ping_distop upload_img">
+          <div class="ping_distop upload_img break_word">
             <%= link_to_user_header(comment.author,false,:class => 'c_blue fb fl mb10 ') if comment.respond_to?(:author) %>
             <span class="c_grey fr">
                 <%= format_time(comment.created_on) %>
diff --git a/public/stylesheets/courses.css b/public/stylesheets/courses.css
index b8e23f4be..1e4b4fedf 100644
--- a/public/stylesheets/courses.css
+++ b/public/stylesheets/courses.css
@@ -345,7 +345,7 @@ a:hover.st_add{ color:#ff8e15;}
 a:hover.link_file{ background:url(../images/pic_file.png) 0 -25px no-repeat; color:#3ca5c6;}
 .r_txt_tit{width:500px; overflow:hidden; white-space: nowrap; text-overflow:ellipsis;color:#15bccf; float:left; color:#09658c; font-size:14px;}
 
-blockquote {background: #eeeeee;padding: 10px;margin-bottom: 10px;}
+blockquote {background: #eeeeee;padding: 10px;margin-bottom: 10px;word-break: break-all;word-wrap: break-word;}
 .respond-form{display: none;margin: auto;clear: both;}
 
 .reply_btn{ cursor:pointer; -moz-border-radius:3px;  -webkit-border-radius:3px; border:1px solid #ccc; color:#999;  border-radius:3px; padding:2px 10px; margin-bottom:10px;display: block;margin-left: 470px;}