From c05dd4f900f8a73405bf5fc9c8988cc25ede13d3 Mon Sep 17 00:00:00 2001
From: nieguanghui <hust.ud.hui@gmail.com>
Date: Wed, 25 Dec 2013 21:00:40 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E7=94=A8=E6=88=B7=E9=A1=B5?=
 =?UTF-8?q?=E9=9D=A2=E7=95=99=E8=A8=80=E6=98=BE=E7=A4=BA=E6=A0=B7=E5=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/views/words/_journal_reply.html.erb       | 33 +++----------------
 app/views/words/_journal_reply_items.html.erb | 20 +++++++++++
 app/views/words/_message.html.erb             | 27 ++++++++++++---
 app/views/words/_new_respond.html.erb         |  2 +-
 public/stylesheets/application.css            |  2 ++
 .../stylesheets/application.css               | 15 +++++++--
 6 files changed, 63 insertions(+), 36 deletions(-)
 create mode 100644 app/views/words/_journal_reply_items.html.erb

diff --git a/app/views/words/_journal_reply.html.erb b/app/views/words/_journal_reply.html.erb
index 3acf762db..eed80421d 100644
--- a/app/views/words/_journal_reply.html.erb
+++ b/app/views/words/_journal_reply.html.erb
@@ -1,32 +1,7 @@
-<style>
-	.avatar-3{
-		width: 35px;
-		height: 35px;
-	}
-	.inner-right{
-		float: left;
-	}
-</style>
-<ul>
+
+<% id = "journal_reply_ul_" + journal.id.to_s%>
+<ul class="messages-for_user-reply" id = <%= id %> >
            <% fetch_user_leaveWord_reply(journal).each do |reply|%>
-			<li style="display: block; padding-bottom: 4px;">
-				<div class="inner-right" style="float: left; height: 100%; ">
-					<%= image_tag url_to_avatar(reply.user), :class => "avatar-3" %>
-				</div>
-				<div class="inner-right" style="float: left; width:86%; height: 100%; ">
-					    <% id = reply.id %>
-				    <span style="color: green;"><a href="/users/4245" style="color:green;"><%= reply.user.name %></a>:&nbsp;</span>
-				        <%= reply.notes %>
-				        <% if @user == User.current %>
-				        <% ids = 'project_respond_form_'+ journal.id.to_s%>
-					       <%= toggle_link l(:label_projects_feedback_respond), id, {:focus => 'project_respond'} %>
-				        <% end %>
-				   <p style="margin-top: 4px;"><span style="color: rgb(172, 174, 177)"><%= reply.created_on %></span></p>
-				</div>
-				<div id=<%= id %> style="display: none;">
-	                    <%= render :partial => "words/new_respond", :locals => {:journal => journal} %>
-                </div>
-                <div style="clear: both;"></div>
-			</li>
+             <%= render :partial => "words/journal_reply_items", :locals => {:reply => reply, :journal => journal, :m_reply_id => reply.id} %>
 			<% end %>
 </ul>
diff --git a/app/views/words/_journal_reply_items.html.erb b/app/views/words/_journal_reply_items.html.erb
new file mode 100644
index 000000000..406ead1db
--- /dev/null
+++ b/app/views/words/_journal_reply_items.html.erb
@@ -0,0 +1,20 @@
+<li style="display: block; padding-bottom: 4px;">
+	<span class="portrait">
+		<%= image_tag url_to_avatar(reply.user), :class => "avatar-3" %>
+	</span>
+	<span class="body">
+		    <% id = reply.id %>
+	    <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>
+	        <% ids = 'project_respond_form_'+ journal.id.to_s%>
+		
+	    <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>
+	    </p>
+	</span>
+	<div id=<%= id %> style="display: none;">
+            <%= render :partial => "words/new_respond", :locals => {:journal => journal, :m_reply_id => m_reply_id} %>
+    </div>
+    <div style="clear: both;"></div>
+</li>
\ No newline at end of file
diff --git a/app/views/words/_message.html.erb b/app/views/words/_message.html.erb
index 31e05cbdb..c3e97b360 100644
--- a/app/views/words/_message.html.erb
+++ b/app/views/words/_message.html.erb
@@ -1,5 +1,23 @@
 <!-- fq -->
 <style>
+ul.message-for-user {
+	list-style-type: none;
+	margin: 0px;
+    padding: 0px;
+    font-family: 微软雅黑,Verdana,sans-serif,宋体;
+    text-align: left;
+    font-size: 10pt;
+    width: 100%;
+
+}
+
+ul.message-for-user li {
+	margin-left: 20px;
+	border-bottom: 1px dashed rgb(204, 204, 204);
+	margin-bottom: 10px;
+    margin-top: 10px;
+}
+
 .portrait{
     float: left;
     width: 40px;
@@ -10,17 +28,18 @@
   }
 .body{
     float: left;
-    width: 405px;
+    width: 80%;
     overflow: hidden;
     font-size: 9pt;
     margin: 0px 10px;
     padding: 0px;
     display: block;
+    margin-left: 20px;
   }
 </style>
 <% if jour.size >0 %>
 <% remove_allowed = (User.current.id == jour.first.user_id) %>
-<ul>
+<ul class="message-for-user">
 <% for journal in jour%>
     <li>
 	    <span class="portrait"><%= image_tag(url_to_avatar(journal.user), :class => "avatar") %></span>
@@ -40,10 +59,10 @@
 		</span>
 		<div style="clear: both;"></div>
 		<div id=<%= ids %> style="display: none; width: 80%; margin: auto;">
-            <%= render :partial => 'words/new_respond', :locals => {:journal => journal} %>
+            <%= render :partial => 'words/new_respond', :locals => {:journal => journal, :m_reply_id => journal.id} %>
         </div>
         <div>
-	        <%= render :partial => "words/journal_reply", :locals => {:journal => journal} %>
+	        <%= render :partial => "words/journal_reply", :locals => {:journal => journal } %>
         </div>
     </li>
 <% end %>
diff --git a/app/views/words/_new_respond.html.erb b/app/views/words/_new_respond.html.erb
index 30babb3eb..dd3886812 100644
--- a/app/views/words/_new_respond.html.erb
+++ b/app/views/words/_new_respond.html.erb
@@ -4,7 +4,7 @@
 
 <%= hidden_field_tag 'reference_id', params[:reference_id], :value => journal.id %>
 <%= hidden_field_tag 'reference_user_id', params[:reference_user_id], :value => journal.user.id %>
-<%= hidden_field_tag 'reference_message_id', params[:reference_message_id], :value => 1 %>
+<%= hidden_field_tag 'reference_message_id', params[:reference_message_id], :value => m_reply_id %>
 <%= submit_tag l(:button_projects_feedback_respond), :name => nil , :class => "bid_btn", :style => "margin-top: 1px;"%> 
 
 <% end %>
\ No newline at end of file
diff --git a/public/stylesheets/application.css b/public/stylesheets/application.css
index 533126eb2..65c8be921 100644
--- a/public/stylesheets/application.css
+++ b/public/stylesheets/application.css
@@ -2676,3 +2676,5 @@ div.repos_explain{
 #admin-index{
 	 margin-left: -220px;
 }
+
+
diff --git a/public/themes/redpenny-master/stylesheets/application.css b/public/themes/redpenny-master/stylesheets/application.css
index cf1a76d72..7c7f648a5 100644
--- a/public/themes/redpenny-master/stylesheets/application.css
+++ b/public/themes/redpenny-master/stylesheets/application.css
@@ -2035,7 +2035,7 @@ div.avatar_user{
 .teacher {
 	display: inline-block;
 	word-spacing: 22px;
-	width: 55px;
+	width: 60px;
 	text-justify:inter-ideograph;
 	text-align: justify;
 }
@@ -2048,4 +2048,15 @@ div.avatar_user{
 	white-space: nowrap;
 	text-overflow: ellipsis;
 	-o-text-overflow: ellipsis;
-}
\ No newline at end of file
+}
+
+	.avatar-3{
+		width: 35px;
+		height: 35px;
+	}
+	.inner-right{
+		float: left;
+	}
+	.messages-for_user-reply{
+		margin-top: 10px;
+	}