diff --git a/app/views/boards/_form_project.html.erb b/app/views/boards/_form_project.html.erb
index 58bb5501c..ca23193b4 100644
--- a/app/views/boards/_form_project.html.erb
+++ b/app/views/boards/_form_project.html.erb
@@ -15,7 +15,7 @@
 <% replying ||= false %>
 <% extra_option = replying ? { readonly: true} : { maxlength: 200 } %>
 <% if replying %>
-<li style="display: none">
+<li style="display: none;">
   <label><span class="c_red">*</span>&nbsp;<%= l(:field_subject) %>&nbsp;&nbsp;：</label>
 
       <%= f.text_field :subject, { size: 60, id: "message_subject#{f.object.id}",:class=>"talk_input w585", :nhname=>'inputsubject' }.merge(extra_option) %>
@@ -47,11 +47,11 @@
   <div class="cl"></div>
 </li>
 <li>
-  <div id="message_quote" class="wiki" style="width: 100%;word-break: break-all;word-wrap: break-word;"></div>
+  <div nhname="quote_show" id="message_quote" class="wiki" style="width: 100%;word-break: break-all;word-wrap: break-word;"></div>
   <% unless replying %>
       <label class="fl ml3" ><span class="c_red">*</span>&nbsp;<%= l(:field_description) %>&nbsp;：</label>
   <% end %>
-  <%= text_area :quote,:quote,:style => 'display:none' %>
+  <%= text_area :quote,:quote,:style => 'display:none',:nhname=>"quote_input" %>
   <div class="content">
   <% if replying%>
 
diff --git a/app/views/boards/_project_show.html.erb b/app/views/boards/_project_show.html.erb
index dc1cff634..b0fd4049f 100644
--- a/app/views/boards/_project_show.html.erb
+++ b/app/views/boards/_project_show.html.erb
@@ -79,7 +79,7 @@
         </div>
         <div class="cl"></div>
         <div class="talkWrapBox">
-          <% reply = Message.new(:subject => "RE: #{@message.subject}")%>
+          <% reply = Message.new(:subject => "RE: #{topic.subject}")%>
           <% if !topic.locked? && authorize_for('messages', 'reply') %>
             <em class="talkWrapArrow"></em>
             <div class="cl"></div>
@@ -97,39 +97,107 @@
           <% end %>
         </div>
         <div class="cl"></div>
+        <% replies_all = topic.children.includes(:author, :attachments, {:board => :project}).
+                reorder("#{Message.table_name}.id asc").all %>
+        <% unless replies_all.empty? %>
+          <div class="talkWrapMsg">
+            <ul>
+              <% replies_all_i = 0 %>
+              <% replies_all.each do |message| %>
+                <% replies_all_i=replies_all_i+1 %>
+                <li nhname="reply_rec" style="display:<%= replies_all_i>2?'none':'' %>">
+                  <%= link_to image_tag(url_to_avatar(message.author), :width => '34',:height => '34'), user_path(message.author), :class =>'Msg_pic' %>
+                  <div class="Msg_txt">
+                    <%= link_to_user_header message.author,false,:class => 'fl c_orange ' %>
+                    <br/>
+                    <p class="fl break_word"><%= textAreailizable message,:content,:attachments => message.attachments %></p>
+                    <br/>
+                    <span class=" c_grey fl"><%= format_time(message.created_on) %></span>
+                    <%= link_to(
+
+                                l(:button_delete),
+                                {:controller => 'messages', :action => 'destroy',  :id => message.id, :board_id => message.board_id, :is_board => 'true'},
+                                :method => :post,
+                                :data => {:confirm => l(:text_are_you_sure)},
+                                :title => l(:button_delete),
+                                :class => ' c_dblue fr'
+                        ) if message.course_destroyable_by?(User.current) %>
+                    <%= link_to(
+                                l(:button_reply),
+                                'javascript:;',
+                                :nhname =>'showbtn_child_reply',
+                                :class => ' c_dblue fr',
+                                :style => 'margin-right: 10px;',
+                                :title => l(:button_reply)) if !topic.locked? && authorize_for('messages', 'reply') %>
+                  </div>
+                  <div class="cl"></div>
+                </li>
+              <% end %>
+            </ul>
+          </div>
+          <%if topic.replies_count>2 %>
+            <div class="talkWrapMsg">
+              <a nhname="reply_ex_btn" data-count="<%= topic.replies_count %>" data-init="0" href="javascript:void(0)" class="ml258 c_dblue lh23">展开回复(<%= topic.replies_count.to_s%>)</a>
+            </div>
+          <% end %>
+        <% end %>
       </div>
     <% end %>
+  <% else %>
+      <p class="nodata"><%= l(:label_no_data) %></p>
+  <% end %>
+  <ul class="wlist">
+    <%= pagination_links_full @topic_pages, @topic_count, :per_page_links => false, :remote => false, :flag => true %>
+  </ul>
+  <!--讨论主类容 end-->
+
+<%# other_formats_links do |f| %>
+  <%#= f.link_to 'Atom', :url => {:key => User.current.rss_key} %>
+<%# end %>
+  <% html_title @board.name %>
+  <% content_for :header_tags do %>
+      <%= auto_discovery_link_tag(:atom, {:format => 'atom', :key => User.current.rss_key}, :title => "#{@project}: #{@board}") %>
   <% end %>
 </div>
+<div style="display:none;"><a href="#" id="nhjump"></a></div>
 
 <script type="text/javascript">
   function nh_check_field(params){
       var result=true;
-
-      if($.trim(params.subject.val()) == ""){
-          params.subjectmsg.html('主题不能为空');
-          params.subjectmsg.css({color:'#ff0000'});
-          result=false;
-      }else{
-          params.subjectmsg.html('填写正确');
-          params.subjectmsg.css({color:'#008000'});
+      if(params.subject!=undefined){
+          if($.trim(params.subject.val()) == ""){
+              params.subjectmsg.html('主题不能为空');
+              params.subjectmsg.css({color:'#ff0000'});
+              result=false;
+          }else{
+              params.subjectmsg.html('填写正确');
+              params.subjectmsg.css({color:'#008000'});
+          }
+          params.subjectmsg.show();
       }
-      params.subjectmsg.show();
 
-      if($.trim(params.content.html()) == ""){
-          params.contentmsg.html('内容不能为空');
-          params.contentmsg.css({color:'#ff0000'});
-          result=false;
-      }else{
-          params.contentmsg.html('填写正确');
-          params.contentmsg.css({color:'#008000'});
+      if(params.content!=undefined){
+          if($.trim(params.content.html()) == ""){
+              result=false;
+          }
+          if(params.content.html()!=params.textarea.html()){
+              params.content.sync();
+              if($.trim(params.content.html()) == ""){
+                  params.contentmsg.html('内容不能为空');
+                  params.contentmsg.css({color:'#ff0000'});
+              }else{
+                  params.contentmsg.html('填写正确');
+                  params.contentmsg.css({color:'#008000'});
+              }
+              params.contentmsg.show();
+          }
       }
-      params.contentmsg.show();
 
       return result;
   }
   function nh_init_board(params){
-      params.showbtn.click(function(){//发帖/编辑/回复按钮的click
+      //发帖/编辑/回复按钮的click
+      params.showbtn.click(function(){
           if(params.textarea.data('init') == undefined){
               //初始化编辑器
               var editor = params.kindutil.create(params.textarea, {
@@ -138,8 +206,15 @@
                   allowImageUpload : false,
                   minWidth:"1px",
                   width:"565px",
-                  items : []
+                  items : [],
+                  afterChange:function(){//按键事件
+                      nh_check_field({content:this,contentmsg:params.contentmsg,textarea:params.textarea});
+                  }
               });
+              //主题输入框按键事件
+              params.inputsubject.keydown(function(){
+                  nh_check_field({subject:params.inputsubject,subjectmsg:params.subjectmsg});
+              })
               //表单提交
               params.form.submit(function(){
                   var is_checked = nh_check_field({
@@ -147,12 +222,12 @@
                       subjectmsg:params.subjectmsg,
                       content:editor,
                       contentmsg:params.contentmsg,
+                      textarea:params.textarea
                   });
                   if(is_checked){
                       alert('submit');
-                      params.textarea.html(editor.html());
-                      return false;
-//                      return true;
+//                      return false;
+                      return true;
                   }
                   return false;
               });
@@ -165,20 +240,57 @@
                   params.about_talk.toggle();//显示/隐藏编辑区
                   if(params.about_talk.is(':hidden')){//隐藏时reset表单数据
                       params.form[0].reset();
+                      params.textarea.empty();
                       editor.html(params.textarea.html());
                       params.subjectmsg.hide();
                       params.contentmsg.hide();
+                      params.quote_show.empty();
+                      params.quote_input.empty();
                   }else{
-                      if(params.type=='reply'){editor.focus();}//有bug 页面不跟着跳
-                      else params.inputsubject.focus();
+                      if(params.type=='reply'){
+                          params.jumphref.attr('href','#'+params.form.attr('id'));
+                          params.jumphref[0].click();
+                      }else params.inputsubject.focus();
                   }
               });
               params.textarea.data('init','1');//标记为已经初始化
           }
           params.cancelbtn.click();//显示/隐藏编辑区
       });
+      if(params.type == 'reply'){
+          params.showbtn_child.click(function(){
+              if(params.textarea.data('init') == undefined){
+                  params.showbtn.click();
+              }else{
+                  params.cancelbtn.click();
+                  if(params.about_talk.is(':hidden')){
+                      params.cancelbtn.click();
+                  }
+              }
+              var ref_str = params.get_ref_str_call($(this));
+              params.quote_show.html(ref_str);
+              params.quote_input.html(ref_str);
+          });
+      }
   }
   $(function(){
+      $(".talkmain_box").each(function(){
+          var target = $("li[nhname='reply_rec']",$(this));
+          var btn = $("a[nhname='reply_ex_btn']",$(this));
+          btn.click(function(){
+              if($(this).data('init')=='0'){
+                  $(this).data('init',1);
+                  $(this).html('收起回复('+$(this).data('count')+')');
+                  target.show();
+              }else{
+                  $(this).data('init',0);
+                  $(this).html('展开回复('+$(this).data('count')+')');
+                  target.hide();
+                  target.eq(0).show();
+                  target.eq(1).show();
+              }
+          });
+      });
       KindEditor.ready(function(K){
           $("div[nhname='container_board']").each(function(){
               var container = $(this);
@@ -199,10 +311,11 @@
           $("div[mhname='container_board_reply']").each(function(){
               var container = $(this);
               var about_talk = $("div[nhname='about_talk_reply']",container);
-              nh_init_board({
+              var params = {
                   type:'reply',
                   kindutil:K,
                   showbtn:$("a[nhname='showbtn_reply']",container),
+                  showbtn_child:$("a[nhname='showbtn_child_reply']",container),
                   about_talk:about_talk,
                   inputsubject:$("input[nhname='inputsubject']",about_talk),
                   subjectmsg:$("p[nhname='subjectmsg']",about_talk),
@@ -210,8 +323,17 @@
                   contentmsg:$("p[nhname='contentmsg']",about_talk),
                   submitbtn:$("a[nhname='submitbtn']",about_talk),
                   cancelbtn:$("a[nhname='cancelbtn']",about_talk),
-                  form:$("form[nhname='form']",about_talk)
-              });
+                  form:$("form[nhname='form']",about_talk),
+                  quote_show:$("div[nhname='quote_show']",about_talk),
+                  quote_input:$("textarea[nhname='quote_input']",about_talk),
+                  jumphref:$("#nhjump")
+              };
+              params.get_ref_str_call=function(btn){
+                  var div = btn.parent('div');
+                  var str = '<blockquote>'+$('a',div).filter(':first').html()+' 写到： <br/>'+$('p',div).filter(':first').html()+'</blockquote>';
+                  return str;
+              }
+              nh_init_board(params);
           });
       });
   });