From 6d8f0e728d49cd99aa8179ea0eae89cc80a4708d Mon Sep 17 00:00:00 2001
From: sw <939547590@qq.com>
Date: Fri, 12 Jun 2015 16:26:24 +0800
Subject: [PATCH] =?UTF-8?q?=E8=AF=BE=E7=A8=8B=20=E4=BD=9C=E4=B8=9A?=
 =?UTF-8?q?=E3=80=81=E9=80=9A=E7=9F=A5=E6=A8=A1=E5=9D=97=EF=BC=8C=E6=96=B0?=
 =?UTF-8?q?=E7=89=88=E7=BC=96=E8=BE=91=E5=99=A8=E7=9B=B8=E5=85=B3BUG?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../homework_common/_homework_common_form.html.erb | 14 ++++++++------
 app/views/news/_course_form.html.erb               |  8 ++++++--
 .../kindeditor/themes/default/default.css          |  1 +
 .../assets/kindeditor/themes/default/default.css   |  1 +
 public/stylesheets/public.css                      |  1 +
 5 files changed, 17 insertions(+), 8 deletions(-)

diff --git a/app/views/homework_common/_homework_common_form.html.erb b/app/views/homework_common/_homework_common_form.html.erb
index e3ef0d237..28aa490de 100644
--- a/app/views/homework_common/_homework_common_form.html.erb
+++ b/app/views/homework_common/_homework_common_form.html.erb
@@ -11,12 +11,14 @@
   <li >
     <label class="label02 ">&nbsp;&nbsp;&nbsp;<%= l(:field_quote)%>：&nbsp;</label>
     <!--<textarea  name="" placeholder="请在此填入作业的要求及评分依据"  class=" w548 h150 mb10 fl"  ></textarea>-->
-    <% if edit_mode %>
-        <%= f.kindeditor :description,:width=>'83%',:editor_id => 'homework_description_editor',:owner_id => homework.id,:owner_type =>OwnerTypeHelper::HOMEWORKCOMMON %>
-    <% else %>
-        <%= hidden_field_tag :asset_id,params[:asset_id],:required => false,:style => 'display:none' %>
-        <%= f.kindeditor :description,:width=>'83%',:editor_id => 'homework_description_editor' %>
-    <% end %>
+    <div style="width: 83%;float: left;">
+      <% if edit_mode %>
+          <%= f.kindeditor :description,:editor_id => 'homework_description_editor',:owner_id => homework.id,:owner_type =>OwnerTypeHelper::HOMEWORKCOMMON %>
+      <% else %>
+          <%= hidden_field_tag :asset_id,params[:asset_id],:required => false,:style => 'display:none' %>
+          <%= f.kindeditor :description,:editor_id => 'homework_description_editor' %>
+      <% end %>
+    </div>
   </li>
   <div class="cl"></div>
   <li class="mt10">
diff --git a/app/views/news/_course_form.html.erb b/app/views/news/_course_form.html.erb
index 32c8e368e..1769c98f3 100644
--- a/app/views/news/_course_form.html.erb
+++ b/app/views/news/_course_form.html.erb
@@ -8,11 +8,15 @@
     <% if is_new %>
       <%= hidden_field_tag :asset_id,params[:asset_id],:required => false,:style => 'display:none' %>
       <label class="fl" ><span class="c_red">*</span>&nbsp;<%= l(:field_description) %>&nbsp;&nbsp;：</label>
-      <%= f.kindeditor :description,:width=>'91%',:editor_id=>'news_description_editor' %>
+      <div class="fl" style="width: 91%">
+        <%= f.kindeditor :description,:editor_id=>'news_description_editor' %>
+      </div>
       <p id="description_notice_span" class="ml55"></p>
     <% else %>
       <label class="fl" ><span class="c_red">*</span>&nbsp;<%= l(:field_description) %>&nbsp;&nbsp;：</label>
-      <%= f.kindeditor :description,:width=>'91%',:editor_id=>'news_description_editor',:owner_id => @news.id,:owner_type => OwnerTypeHelper::NEWS %>
+      <div class="fl" style="width: 91%">
+        <%= f.kindeditor :description,:editor_id=>'news_description_editor',:owner_id => @news.id,:owner_type => OwnerTypeHelper::NEWS %>
+      </div>
       <p id="description_notice_span" class="ml55"></p>
     <% end %>
 
diff --git a/lib/rails_kindeditor/vendor/assets/javascripts/kindeditor/themes/default/default.css b/lib/rails_kindeditor/vendor/assets/javascripts/kindeditor/themes/default/default.css
index 428b6c8b5..0d322283a 100644
--- a/lib/rails_kindeditor/vendor/assets/javascripts/kindeditor/themes/default/default.css
+++ b/lib/rails_kindeditor/vendor/assets/javascripts/kindeditor/themes/default/default.css
@@ -421,6 +421,7 @@
 	overflow: hidden;
 	margin: 0;
 	padding: 0;
+    max-width: 100%;
 }
 /* toolbar */
 .ke-toolbar {
diff --git a/public/assets/kindeditor/themes/default/default.css b/public/assets/kindeditor/themes/default/default.css
index 5de213f37..c5a84c186 100644
--- a/public/assets/kindeditor/themes/default/default.css
+++ b/public/assets/kindeditor/themes/default/default.css
@@ -432,6 +432,7 @@
 }
 /* container */
 .ke-container {
+    max-width: 100%;
 	display: block;
 	border: 1px solid #CCCCCC;
 	background-color: #FFF;
diff --git a/public/stylesheets/public.css b/public/stylesheets/public.css
index 4bfc1ef99..0ed497127 100644
--- a/public/stylesheets/public.css
+++ b/public/stylesheets/public.css
@@ -440,3 +440,4 @@ img{max-width: 100%;}
 .attachments {clear: both;}
 .is_public_checkbox{margin-left: 15px;margin-right: 10px;}
 .author_name{color: #3ca5c6 !important;}
+.ke-container-default{max-width: 100%;}