From 10515adc5c6f63effd329e1f1ea2da8f8b7e9551 Mon Sep 17 00:00:00 2001
From: sw <939547590@qq.com>
Date: Fri, 27 Mar 2015 17:00:21 +0800
Subject: [PATCH] =?UTF-8?q?=E8=AF=BE=E7=A8=8B=E9=80=9A=E7=9F=A5=E5=92=8C?=
 =?UTF-8?q?=E8=AE=A8=E8=AE=BA=E5=8C=BA=E5=9B=9E=E5=A4=8D=E6=A0=B7=E5=BC=8F?=
 =?UTF-8?q?=E4=B8=8D=E5=AF=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/views/messages/_course_show.html.erb | 58 +-----------------------
 app/views/news/_course_show.html.erb     |  2 +-
 2 files changed, 2 insertions(+), 58 deletions(-)

diff --git a/app/views/messages/_course_show.html.erb b/app/views/messages/_course_show.html.erb
index 613444c15..1c1628ded 100644
--- a/app/views/messages/_course_show.html.erb
+++ b/app/views/messages/_course_show.html.erb
@@ -1,59 +1,3 @@
-<style type="text/css">
-    .lz {
-        position: relative;
-        min-height: 200px;
-        margin: 10px 2px;
-        border-radius: 5px;
-        box-shadow: 1px 1px 6px #97EBF4;
-    }
-    .lz-left {
-        float: left;
-        margin: 2%;
-        padding: 0;
-    }
-    .memo-section {
-        width: auto;
-        margin-left: 15%;
-        padding-top: 1%;
-        border-left: 2px dotted #EEE;/*#8BE9F3;*/
-    }
-    .memo-title {
-        margin: 1em 0;
-        padding-left: 1%;
-        padding-bottom: 1%;
-        font-weight: bold;
-        border-bottom: 1px dashed rgb(204, 204, 204);
-    }
-    .memo-content {
-        padding: 1%;
-        margin: 1%;
-        margin-bottom: 40px;
-        background-color: #F6F6F6;
-        white-space: normal;
-        /*word-break: break-all;   */
-        word-wrap: break-word;
-    }
-    .memo-timestamp {
-        position: absolute;
-        bottom: 0px;
-        /*right: 0;*/
-        left: 0;
-        margin: 20px;
-    }
-    .replies {
-        float: right;
-        /*max-width: 90%;*/
-    }
-    .reply-box {
-        float: right;
-        width: 640px;
-        padding: 3%;
-        /*border: 2px solid #C6F3F9;*/
-        border-top: 2px double #C6F3F9;
-        /*border-radius: 10px;*/
-    }
-</style>
-
 <div class="project_r_h">
   <h2 class="project_h2"><%= l(:label_board) %></h2>
 </div>
@@ -108,7 +52,7 @@
               <%= 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>
-              <%= textilizable message,:content,:attachments => message.attachments %>
+              <p><%= textilizable message,:content,:attachments => message.attachments %></p>
               <%= link_to_attachments_course message, :author => false %>
             </div>
             <div class="ping_disfoot">
diff --git a/app/views/news/_course_show.html.erb b/app/views/news/_course_show.html.erb
index 9ea8159bd..ed6011e29 100644
--- a/app/views/news/_course_show.html.erb
+++ b/app/views/news/_course_show.html.erb
@@ -115,7 +115,7 @@
           <div class="ping_distop">
             <%= 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) %></span>
             <div class="cl"></div>
-            <%= textilizable(comment.comments) %>
+            <p><%= textilizable(comment.comments) %></p>
             </div>
             <div class="ping_disfoot"><%= link_to_if_authorized_course image_tag('delete.png'), {:controller => 'comments', :action => 'destroy', :id => @news, :comment_id => comment},
                                                                      :data => {:confirm => l(:text_are_you_sure)}, :method => :delete, :title => l(:button_delete) %>