From 7130347f390bfab26e3e7a7b711c1d76007befce Mon Sep 17 00:00:00 2001
From: yanxd <sxty32@hotmaill.com>
Date: Thu, 26 Dec 2013 10:52:16 +0800
Subject: [PATCH] =?UTF-8?q?=E5=9B=9E=E5=A4=8D=E6=A1=86=20=E8=AE=BE?=
 =?UTF-8?q?=E7=BD=AE=E5=A7=93=E5=90=8D=20=E4=B8=83=E5=85=AB=E7=B3=9F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/views/words/_journal_reply_items.html.erb | 13 +++++++++----
 app/views/words/_message.html.erb             |  6 +++++-
 public/javascripts/application.js             |  5 +++++
 3 files changed, 19 insertions(+), 5 deletions(-)

diff --git a/app/views/words/_journal_reply_items.html.erb b/app/views/words/_journal_reply_items.html.erb
index 9f5bceeef..1a92c79d2 100644
--- a/app/views/words/_journal_reply_items.html.erb
+++ b/app/views/words/_journal_reply_items.html.erb
@@ -2,7 +2,7 @@
 	<span class="portrait">
 		<%= image_tag url_to_avatar(reply.user), :class => "avatar-3" %>
 	</span>
-	<span class="body">
+	<div class="body">
 		    <% id = 'project_respond_form_'+ reply.id.to_s %>
 	    <span style="color: green;"><%= link_to reply.user.name, user_path(reply.user) %>:&nbsp;</span>
 	    <span style="max-width: 80%; word-wrap: break-word;"> <%= reply.notes %></span>
@@ -10,10 +10,15 @@
 		
 	    <p style="margin-top: 4px;">
 	    	<span style="color: rgb(172, 174, 177)"><%= format_time reply.created_on %></span>
-	    	<span style="float: right;"><%= toggle_link l(:label_projects_feedback_respond), id, {:focus => 'project_respond'} %></span>
+	    	<span style="float: right;">
+	    		<%#= toggle_link l(:label_projects_feedback_respond), id, {:focus => 'project_respond'} %>
+	    		<%= link_to l(:label_projects_feedback_respond),'',
+                    {:focus => 'project_respond', :onclick => "toggleAndSettingWordsVal($('##{id}'), $('##{id} textarea'), '#{l(:label_reply_plural)} #{reply.user.show_name}: '); return false;"}
+          %>
+	    	</span>
 	    </p>
-	</span>
-	<div id='<%=id%>' style="display: none;">
+	</div>
+	<div id='<%=id%>' style="clear:both; display: none;">
             <%= render :partial => "words/new_respond", :locals => {:journal => journal, :m_reply_id => m_reply_id} %>
     </div>
     <div style="clear: both;"></div>
diff --git a/app/views/words/_message.html.erb b/app/views/words/_message.html.erb
index c3e97b360..2f8d5ecc2 100644
--- a/app/views/words/_message.html.erb
+++ b/app/views/words/_message.html.erb
@@ -55,7 +55,11 @@ ul.message-for-user li {
 		</span>
 		<span class="font_lighter"> <%= l :label_comment_time %>：&nbsp; <%= format_time journal.created_on %></span>
 				<% ids = 'project_respond_form_'+ journal.id.to_s%>
-				<%= toggle_link l(:label_projects_feedback_respond), ids, {:focus => 'project_respond'} %>
+				<%#= toggle_link l(:label_projects_feedback_respond), ids, {:focus => 'project_respond'} %>
+                
+                <%= link_to l(:label_projects_feedback_respond),'',
+                    {:focus => 'project_respond', :onclick => "toggleAndSettingWordsVal($('##{ids}'), $('##{ids} textarea'), '#{l(:label_reply_plural)} #{journal.user.show_name}:'); return false;"}
+                %>
 		</span>
 		<div style="clear: both;"></div>
 		<div id=<%= ids %> style="display: none; width: 80%; margin: auto;">
diff --git a/public/javascripts/application.js b/public/javascripts/application.js
index fea17ee12..65af8714e 100644
--- a/public/javascripts/application.js
+++ b/public/javascripts/application.js
@@ -590,6 +590,11 @@ function blockEventPropagation(event) {
   event.preventDefault();
 }
 
+function toggleAndSettingWordsVal(parent_widget, text_widget, value){
+  text_widget.val(value)
+  parent_widget.toggle(400)
+}
+
 $(document).ready(setupAjaxIndicator);
 $(document).ready(hideOnLoad);
 $(document).ready(addFormObserversForDoubleSubmit);