From 643bfd47cbba13edb466f149c63fd996c6650fc9 Mon Sep 17 00:00:00 2001
From: lizanle <491823689@qq.com>
Date: Thu, 26 Mar 2015 15:41:55 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E4=B8=80=E4=B8=AA=E9=9A=90?=
 =?UTF-8?q?=E8=97=8F=E5=9F=9F=EF=BC=8C=E7=94=A8=E6=9D=A5=E4=BF=9D=E5=AD=98?=
 =?UTF-8?q?kindeditor=E4=B8=8A=E4=BC=A0=E5=9B=BE=E7=89=87=E8=B5=84?=
 =?UTF-8?q?=E6=BA=90=E5=90=8E=E8=BF=94=E5=9B=9E=E7=9A=84=E5=9B=BE=E7=89=87?=
 =?UTF-8?q?id?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/views/memos/_topic_form.html.erb | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/app/views/memos/_topic_form.html.erb b/app/views/memos/_topic_form.html.erb
index d7d0aeca0..ec16fbc5c 100644
--- a/app/views/memos/_topic_form.html.erb
+++ b/app/views/memos/_topic_form.html.erb
@@ -1,9 +1,10 @@
 <%= labelled_form_for(@memo, :url => forum_memos_path) do |f|  %>
 
   <div class="actions" style="max-width:680px">
+    <%= hidden_field_tag :asset_id,params[:asset_id],:required => false,:style => 'display:none' %>
     <p><%= f.text_field :subject, :required => true, :size => 95 %></p>
-    <p style="max-width:680px"><%= f.text_area :content, :required => true, :id => 'editor01' %></p>
-    <script type="text/javascript">var ckeditor=CKEDITOR.replace('editor01');</script>
+    <p style="max-width:680px"><%= f.kindeditor :content, :required => true %></p>
+    <!--<script type="text/javascript">var ckeditor=CKEDITOR.replace('editor01');</script> -->
     <br/>
 
     <p>