From d73ed9e467d3e209f5fcbcf85304a97cb75980de Mon Sep 17 00:00:00 2001
From: alan <547533434@qq.com>
Date: Tue, 5 May 2015 14:32:40 +0800
Subject: [PATCH] =?UTF-8?q?=E9=A1=B9=E7=9B=AE=E8=AE=A8=E8=AE=BA=E5=8C=BA?=
 =?UTF-8?q?=E6=94=B9=E7=89=88=20Signed-off-by:=20alan=20<547533434@qq.com>?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/controllers/messages_controller.rb  |  7 +++--
 app/views/boards/_project_show.html.erb | 42 ++++++++++++++++++++++++-
 2 files changed, 46 insertions(+), 3 deletions(-)

diff --git a/app/controllers/messages_controller.rb b/app/controllers/messages_controller.rb
index 436418430..b524be0bb 100644
--- a/app/controllers/messages_controller.rb
+++ b/app/controllers/messages_controller.rb
@@ -131,9 +131,12 @@ class MessagesController < ApplicationController
       render_attachment_warning_if_needed(@reply)
      else
       #render file: 'messages#show', layout: 'base_courses'
+     end
+    if params[:is_board]
+      redirect_to project_boards_url(@project)
+    else
+      redirect_to board_message_url(@board, @topic, :r => @reply)
     end
-    redirect_to board_message_url(@board, @topic, :r => @reply)
-
   end
 
   # Edit a message
diff --git a/app/views/boards/_project_show.html.erb b/app/views/boards/_project_show.html.erb
index 061f25878..166f8a552 100644
--- a/app/views/boards/_project_show.html.erb
+++ b/app/views/boards/_project_show.html.erb
@@ -45,6 +45,7 @@
               <p class="problem_tit fl fb" style="word-break:break-all;" >
                 <%= topic.content %></p>
             </div>
+            <%= link_to (l(:label_short_reply) + " "+topic.replies_count.to_s), board_message_path(@board, topic), :class => "talk_btn fr c_white" %>
 
                 <div class="cl"></div>
              </div><!--讨论主类容 end-->
@@ -93,7 +94,17 @@
                 </div><!---留言内容-->
             <% end %>
            <% end %>
-
+        <% reply = Message.new(:subject => "RE: #{@message.subject}")%>
+        <% if !topic.locked? && authorize_for('messages', 'reply') %>
+            <div id="reply" style="display:none;">
+              <%= form_for reply, :as => :reply, :url => {:controller=>'messages',:action => 'reply', :id => topic.id, :board_id => topic.board_id, :is_board => 'true'}, :html => {:multipart => true, :id => 'message_form'} do |f| %>
+                  <p class="talk_top"><%= l(:label_message_reply) %></p>
+                  <%= render :partial => 'messages/form_project', :locals => {:f => f, :replying => true} %>
+                  <a href="#" onclick="submit_message_replay();"class="blue_btn fl c_white ml5" style="margin-left: 50px;"><%= l(:button_submit)%></a>
+              <% end %>
+              <div id="preview" class="wiki"></div>
+            </div>
+        <% end %>
        <% end %>
   <% else %>
       <p class="nodata"><%= l(:label_no_data) %></p>
@@ -112,3 +123,32 @@
 <% content_for :header_tags do %>
     <%= auto_discovery_link_tag(:atom, {:format => 'atom', :key => User.current.rss_key}, :title => "#{@project}: #{@board}") %>
 <% end %>
+<script type="text/javascript">
+    //    var flag = false;
+    //    jQuery(document).ready(function($) {
+    //        transpotUrl('#content');
+    //    });
+    function submit_message_replay()
+    {
+        if(flag)
+        {
+            $("#message_form").submit();
+        }
+    }
+    function regexContent()
+    {
+        var content = $.trim($("#message_content").val());
+        if(content.length ==0)
+        {
+            $("#message_content_span").text("<%= l(:label_reply_empty) %>");
+            $("#message_content_span").css('color','#ff0000');
+            flag =  false;
+        }
+        else
+        {
+            $("#message_content_span").text("<%= l(:label_field_correct) %>");
+            $("#message_content_span").css('color','#008000');
+            flag = true;
+        }
+    }
+</script>
\ No newline at end of file