From 31c57b78bf7ab670efe52348108d032c585e56ee Mon Sep 17 00:00:00 2001
From: lizanle <491823689@qq.com>
Date: Thu, 17 Dec 2015 11:28:28 +0800
Subject: [PATCH] =?UTF-8?q?issue=E7=9A=84=E4=BF=AE=E6=94=B9=E5=A6=82?=
 =?UTF-8?q?=E6=9E=9C=E6=9B=B4=E6=94=B9issue=E7=9A=84=E7=B1=BB=E5=9E=8B?=
 =?UTF-8?q?=EF=BC=8C=E9=82=A3=E4=B9=88=E5=B0=B1=E4=BC=9A=E6=9C=89=E9=97=AE?=
 =?UTF-8?q?=E9=A2=98=E3=80=82=E9=9C=80=E8=A6=81=E9=87=8D=E6=96=B0=E6=96=B0?=
 =?UTF-8?q?=E5=BB=BAeditor?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/views/issues/show.html.erb                | 56 ++++++++++---------
 .../app/views/issues/update_form.js.erb       | 12 ++++
 2 files changed, 41 insertions(+), 27 deletions(-)

diff --git a/app/views/issues/show.html.erb b/app/views/issues/show.html.erb
index 4c56a0f05..a1450fc03 100644
--- a/app/views/issues/show.html.erb
+++ b/app/views/issues/show.html.erb
@@ -8,11 +8,11 @@
     });
 </script>
 <div  class="homepageRight mt0 ml10" >
-<div class="homepageRightBanner">
-  <div class="NewsBannerName">问题跟踪</div>
-</div>
+    <div class="homepageRightBanner">
+      <div class="NewsBannerName">问题跟踪</div>
+    </div>
 
-  <div class="resources mt10" style="min-height:619px;">
+  <div class="resources mt10" >
     <div class="pro_page_box">
       <div  class="problem_main borderBottomNone">
           <%= render :partial => 'issues/detail'%>
@@ -22,30 +22,32 @@
       <!--problem_main end-->
       <div style="clear: both;"></div>
       <div class="homepagePostReply">
-        <div class="topBorder" style="display: <%= @issue.journals.count>0 ? 'none': '' %>"></div>
-        <div class="homepagePostReplyBanner" >
-          <div class="homepagePostReplyBannerCount" >回复（<%= @issue.journals.count %>）</div>
-          <div class="homepagePostReplyBannerTime"></div>
-        </div>
+            <div class="topBorder" style="display: <%= @issue.journals.count>0 ? 'none': '' %>"></div>
+            <div class="homepagePostReplyBanner" >
+              <div class="homepagePostReplyBannerCount" >回复（<%= @issue.journals.count %>）</div>
+              <div class="homepagePostReplyBannerTime"></div>
+            </div>
 
-        <div class="" id="reply_div_<%= @issue.id %>" >
-                   <%= render :partial => 'issue_replies',:locals => {:issue=>@issue,:replies_all_i=>0} %>
-        </div>
+            <div class="" id="reply_div_<%= @issue.id %>" >
+                       <%= render :partial => 'issue_replies',:locals => {:issue=>@issue,:replies_all_i=>0} %>
+            </div>
 
 
-        <div class="homepagePostReplyContainer borderBottomNone minHeight48">
-          <%= form_for('new_form',:url =>  add_journal_issue_path(@issue.id),:method => "post", :remote => true) do |f|%>
-              <div class="homepagePostReplyPortrait mr15 imageFuzzy" id="reply_image_<%= @issue.id%>">
-                  <%= link_to image_tag(url_to_avatar(User.current), :width => "33", :height => "33"), user_path(@issue.author_id), :alt => "用户头像" %>
-              </div>
-              <input type="hidden" name="issue_id" value="<%=@issue.id%>">
-                  <div class="homepagePostReplyInputContainer mb10">
-                        <%= kindeditor_tag :notes,"",:height=>"33",:minHeight=>"33",:editor_id=>"issues_reply_editor"%>
-                    <div class="cl"></div>
+            <div class="homepagePostReplyContainer borderBottomNone minHeight48">
+              <%= form_for('new_form',:url =>  add_journal_issue_path(@issue.id),:method => "post", :remote => true) do |f|%>
+                  <div class="homepagePostReplyPortrait mr15 imageFuzzy" id="reply_image_<%= @issue.id%>">
+                      <%= link_to image_tag(url_to_avatar(User.current), :width => "33", :height => "33"), user_path(@issue.author_id), :alt => "用户头像" %>
                   </div>
-                 <a href="javascript:void(0);" onclick="issues_reply_editor.sync();$(this).parent().submit();" class="homepagePostReplySubmit postReplySubmit fl mt5">发送</a>
-              <div class="cl"></div>
-          <% end %>
-        </div>
-</div>
-<!--<div style="clear:both;"></div>-->
\ No newline at end of file
+                  <input type="hidden" name="issue_id" value="<%=@issue.id%>"/>
+                      <div class="homepagePostReplyInputContainer mb10">
+                            <%= kindeditor_tag :notes,"",:height=>"33",:minHeight=>"33",:editor_id=>"issues_reply_editor"%>
+                            <div class="cl"></div>
+                      </div>
+                      <a href="javascript:void(0);" onclick="issues_reply_editor.sync();$(this).parent().submit();" class="homepagePostReplySubmit postReplySubmit fl mt5">发送</a>
+                      <div class="cl"></div>
+              <% end %>
+            </div>
+         </div>
+     </div>
+  </div>
+</div>
\ No newline at end of file
diff --git a/plugins/redmine_ckeditor/app/views/issues/update_form.js.erb b/plugins/redmine_ckeditor/app/views/issues/update_form.js.erb
index e7d3e2ad2..23bd5108b 100644
--- a/plugins/redmine_ckeditor/app/views/issues/update_form.js.erb
+++ b/plugins/redmine_ckeditor/app/views/issues/update_form.js.erb
@@ -9,3 +9,15 @@ $('#all_attributes').html('<%= escape_javascript(render :partial => 'form') %>')
 <% else %>
   $('#log_time').hide();
 <% end %>
+issue_desc_editor = KindEditor.create('#issue_description',
+        {"width":"85%",
+            "resizeType":0,
+            "no_label":true,
+            "autoHeightMode":true,
+            "afterCreate":"eval(function(){ if(typeof enablePasteImg ==='function'){enablePasteImg(self);} if(typeof enableAt ==='function'){enableAt(self);} this.loadPlugin(\"autoheight\"),$(this.toolbar.div).hide();})",
+            "afterFocus":"eval(function(){$(this.toolbar.div).show();})",
+            "afterBlur":"eval(function(){$(this.toolbar.div).hide();})",
+            "emotionsBasePath":"http://localhost:3000",
+            "height":300,"allowFileManager":true,
+            "uploadJson":"/kindeditor/upload",
+            "fileManagerJson":"/kindeditor/filemanager"});
\ No newline at end of file