From 49c5f3879b3453e97bcd69998376e02e8d33752c Mon Sep 17 00:00:00 2001
From: yutao <283765470@qq.com>
Date: Tue, 26 May 2015 17:01:25 +0800
Subject: [PATCH] ...

---
 app/views/boards/_edit.html.erb              |  2 ++
 app/views/boards/_form_project.html.erb      |  2 +-
 app/views/boards/_project_new_topic.html.erb |  1 +
 app/views/boards/_project_show.html.erb      | 23 ++++++++++++++++----
 4 files changed, 23 insertions(+), 5 deletions(-)

diff --git a/app/views/boards/_edit.html.erb b/app/views/boards/_edit.html.erb
index 562319e56..909689edd 100644
--- a/app/views/boards/_edit.html.erb
+++ b/app/views/boards/_edit.html.erb
@@ -12,6 +12,7 @@
                            } do |f| %>
             <%= render :partial => 'form_project',
                      :locals => {:f => f, :replying => !topic.parent.nil?, :topic => topic} %>
+            <div class="ml55 fl" nhname="toolbar_container"></div>
             <a href="javascript:void(0)" nhname='cancelbtn' class="blue_btn grey_btn fr c_white ml10"><%= l(:button_cancel) %></a>
             <a href="javascript:void(0)" nhname='submitbtn' class="blue_btn fr c_white" ><%= l(:button_submit)%></a>
           <%#= link_to l(:button_cancel), board_message_url(topic.board, topic.root, :r => (topic.parent_id && topic.id)), :class => "blue_btn grey_btn fl c_white"  %>
@@ -31,6 +32,7 @@
                                } do |f| %>
               <%= render :partial => 'form_course',
                          :locals => {:f => f, :replying => !topic.parent.nil?, :topic => topic} %>
+              <div class="ml55 fl" nhname="toolbar_container"></div>
               <a href="javascript:void(0)"  nhname='cancelbtn' class="blue_btn grey_btn fr c_white ml10"><%= l(:button_cancel) %></a>
               <a href="javascript:void(0)"  nhname='submitbtn' class="blue_btn fr c_white"><%= l(:button_submit)%></a>
 
diff --git a/app/views/boards/_form_project.html.erb b/app/views/boards/_form_project.html.erb
index 13bc7bc87..fd63689bb 100644
--- a/app/views/boards/_form_project.html.erb
+++ b/app/views/boards/_form_project.html.erb
@@ -52,7 +52,7 @@
       <label class="fl ml3" ><span class="c_red">*</span>&nbsp;<%= l(:field_description) %>&nbsp;：</label>
   <% end %>
   <%= text_area :quote,:quote,:style => 'display:none',:nhname=>"quote_input" %>
-  <div class="content">
+  <div class="content ml55">
   <% if replying%>
 
       <%= f.text_area :content,
diff --git a/app/views/boards/_project_new_topic.html.erb b/app/views/boards/_project_new_topic.html.erb
index d7c8972fc..00a3d2016 100644
--- a/app/views/boards/_project_new_topic.html.erb
+++ b/app/views/boards/_project_new_topic.html.erb
@@ -2,6 +2,7 @@
 
     <%= render :partial => 'form_project', :locals => {:f => f,  :topic => @message} %>
     <li>
+      <div class="ml55 fl" nhname="toolbar_container"></div>
       <a href="javascript:void(0)"  nhname="cancelbtn" class="grey_btn fr ml10"><%= l(:button_cancel) %></a>
 
       <a href="javascript:void(0)" nhname="submitbtn" class="blue_btn fr " style="margin-left: 55px"><%= l(:button_submit)%></a>
diff --git a/app/views/boards/_project_show.html.erb b/app/views/boards/_project_show.html.erb
index 633602de8..c8d28cee2 100644
--- a/app/views/boards/_project_show.html.erb
+++ b/app/views/boards/_project_show.html.erb
@@ -52,6 +52,9 @@
             <% if topic.sticky? %>
                 <a href="javascript:void(0)" class="talk_up fr c_red" style="margin-right: 10px;"><%= l(:label_board_sticky)%></a>
             <% end %>
+            <script>
+                $(function(){if($("#contentmessage<%=topic.id %>").height()>182){$("#project_show_<%= topic.id%>").show();}});
+            </script>
           </div>
           <div class="cl"></div>
           <div  class="project_board_content break_word" id="content_<%=topic.id%>">
@@ -59,7 +62,7 @@
               <%= topic.content.html_safe %>
             </div>
           </div>
-          <p style="display: none" id="project_show_<%= topic.id%>">
+          <p style="display: none;" id="project_show_<%= topic.id%>">
             <a  id="expend_more_information<%= topic.id%>" style="color: #0781b4;"   href="javascript:void(0)"  onclick="show_more_reply('#content_<%=topic.id%>','#expend_more_information<%= topic.id%>','#arrow<%=topic.id%>');"  value="show_more">[展开]</a>
             <span class="g-arr-down">
               <img id="arrow<%=topic.id%>" src="/images/jiantou.jpg" width="12" height="6" />
@@ -87,6 +90,7 @@
               <%= form_for reply, :as => :reply, :url => {:controller=>'messages',:action => 'reply', :id => topic.id, :board_id => topic.board_id, :is_board => 'true'},
                               :html => {:nhname=>"form",:multipart => true, :id => 'message_form' + topic.id.to_s, :name=>'message-form'} do |f| %>
                 <%= render :partial => 'form_project', :locals => {:f => f, :replying => true} %>
+                <div class="fl" nhname="toolbar_container"></div>
                 <div style="padding-top:5px;" class="fr">
                   <a href="javascript:void(0)" nhname="cancelbtn" class="blue_btn fr ml10" style=""><%= l(:button_cancel)%></a>
                   <a href="javascript:void(0)" nhname="submitbtn" class="blue_btn fr " style=""><%= l(:label_memo_create)%></a>
@@ -161,6 +165,9 @@
 </div>
 <div style="display:none;"><a href="#" id="nhjump"></a></div>
 
+<style>
+  .ke-toolbar{display:none;width:400px;border:none;background:none;}
+</style>
 <script type="text/javascript">
   function nh_check_field(params){
       var result=true;
@@ -206,13 +213,18 @@
                   allowImageUpload : false,
                   minWidth:"1px",
                   width:"565px",
-                  items : [],
+                  items : ['emoticons'],
                   afterChange:function(){//按键事件
                       nh_check_field({content:this,contentmsg:params.contentmsg,textarea:params.textarea});
+                  },
+                  afterCreate:function(){
+                      var toolbar = $("div[class='ke-toolbar']",params.about_talk);
+                      params.toolbar_container.append(toolbar);
                   }
               });
+
               //主题输入框按键事件
-              params.inputsubject.keydown(function(){
+              params.inputsubject.keyup(function(){
                   nh_check_field({subject:params.inputsubject,subjectmsg:params.subjectmsg});
               })
               //表单提交
@@ -300,7 +312,7 @@
           $("div[nhname='container_board']").each(function(){
               var container = $(this);
               var about_talk = $("div[nhname='about_talk']",container);
-              nh_init_board({
+              var params = ({
                   kindutil:K,
                   showbtn:$("a[nhname='showbtn']",container),
                   about_talk:about_talk,
@@ -311,8 +323,10 @@
                   submitbtn:$("a[nhname='submitbtn']",about_talk),
                   cancelbtn:$("a[nhname='cancelbtn']",about_talk),
                   form:$("form[nhname='form']",about_talk),
+                  toolbar_container:$("div[nhname='toolbar_container']",about_talk),
                   init_content_val:$("input[nhname='init_content_val']",about_talk)
               });
+              nh_init_board(params);
           });
           $("div[mhname='container_board_reply']").each(function(){
               var container = $(this);
@@ -332,6 +346,7 @@
                   form:$("form[nhname='form']",about_talk),
                   quote_show:$("div[nhname='quote_show']",about_talk),
                   quote_input:$("textarea[nhname='quote_input']",about_talk),
+                  toolbar_container:$("div[nhname='toolbar_container']",about_talk),
                   jumphref:$("#nhjump")
               };
               params.get_ref_str_call=function(btn){