From 4ce1ac9f945120ab0bb74d69f38d7bf51a4a0a81 Mon Sep 17 00:00:00 2001
From: z9hang <z9hang@126.com>
Date: Sun, 2 Nov 2014 12:12:41 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E7=95=99=E8=A8=80=E5=9B=9E?=
 =?UTF-8?q?=E5=A4=8D=E7=9A=84=E6=A0=B7=E5=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/views/homework_attach/_history.erb        |  4 +--
 app/views/words/_journal_reply.html.erb       |  2 +-
 app/views/words/_journal_reply_items.html.erb | 29 +++++++++----------
 public/stylesheets/css.css                    |  4 ++-
 4 files changed, 20 insertions(+), 19 deletions(-)

diff --git a/app/views/homework_attach/_history.erb b/app/views/homework_attach/_history.erb
index f455d864d..6897ef6b5 100644
--- a/app/views/homework_attach/_history.erb
+++ b/app/views/homework_attach/_history.erb
@@ -39,11 +39,11 @@
                                     :remote => true,:method => 'post', :title => l(:button_quote))%>
                     <% end %>
                 </span>
-              <span class="font_lighter" style="float: right">
+                <span class="font_lighter" style="float: right">
                   <%= l(:label_bids_published) %>&nbsp;
                 <%= time_tag(journal.created_on).html_safe %>&nbsp;
                 <%= l(:label_bids_published_ago) %>
-              </span>
+                </span>
                 </div>
                 <div style="clear: both;"></div>
                 <% ids = 'project_respond_form_'+ journal.id.to_s%>
diff --git a/app/views/words/_journal_reply.html.erb b/app/views/words/_journal_reply.html.erb
index 5ddfe195c..51de1d539 100644
--- a/app/views/words/_journal_reply.html.erb
+++ b/app/views/words/_journal_reply.html.erb
@@ -1,6 +1,6 @@
 
 <% id = "journal_reply_ul_" + journal.id.to_s%>
-<div class="messages-for-user-reply" id = '<%= id %>' >
+<div id = '<%= id %>' >
     <% fetch_user_leaveWord_reply(journal).each do |reply|%>
         <%= render :partial => "words/journal_reply_items", :locals => {:reply => reply, :journal => journal, :m_reply_id => reply} %>
     <% end %>
diff --git a/app/views/words/_journal_reply_items.html.erb b/app/views/words/_journal_reply_items.html.erb
index 656d5d912..3b018ddb5 100644
--- a/app/views/words/_journal_reply_items.html.erb
+++ b/app/views/words/_journal_reply_items.html.erb
@@ -1,16 +1,15 @@
 <% reply_allow = JournalsForMessage.create_by_user? User.current %>
 <% ids_r = 'reply_respond_form_'+ reply.id.to_s %>
-<div id='word_li_<%=reply.id.to_s%>' onmouseover="$('#<%= ids_r %>').show()" onmouseout="$('#<%= ids_r %>').hide()">
-	<span class="portrait">
-        <%= image_tag url_to_avatar(reply.user), :class => "avatar-3" %>
-	</span>
-	<div class="message-body">
+<div class="recall" id='word_li_<%=reply.id.to_s%>' onmouseover="$('#<%= ids_r %>').show()" onmouseout="$('#<%= ids_r %>').hide()">
+	<div class="recall_head">
+        <%= image_tag url_to_avatar(reply.user) %>
+	</div>
+	<div class="recall_con">
 		<% id = 'project_respond_form_'+ reply.id.to_s %>
-		<p>
-		    <span>
-              <%= link_to reply.user.name, user_path(reply.user) %>
-              :&nbsp;
-            </span>
+          <%= link_to reply.user.name, user_path(reply.user) %>
+              回复
+          <%= link_to reply.at_user.name,user_path(reply.at_user) %>
+        <p>
 		    <span class="message-notes">
               <%= reply.notes %>
             </span>
@@ -19,15 +18,15 @@
             <span class="time">
               <%= format_time reply.created_on %>
             </span>
-            <span style="display: none; margin-left: 4px;" id='<%=ids_r%>' >
-                <% if reply_allow %>
-                         <%= link_to l(:label_projects_feedback_respond),'',
-                            {:focus => 'project_respond', :onclick => "toggleAndSettingWordsVal($('##{id}'), $('##{id} textarea'), '#{l(:label_reply_plural)} #{m_reply_id.user.name}: '); return false;"} %>
-                <% end %>
+            <span class="ping_disfoot" style="display: none; margin-left: 4px;" id='<%=ids_r%>' >
                 <% if @user == User.current || User.current.admin? || reply.user.id == User.current.id %>
                   <%= link_to(l(:label_newfeedback_delete), {:controller => 'words', :action => 'destroy', :object_id => reply, :user_id => reply.user},
                              :remote => true, :confirm => l(:text_are_you_sure), :method => 'delete', :class => "delete", :title => l(:button_delete))  %>
                 <% end %>
+              <% if reply_allow %>
+                         <%= link_to l(:label_projects_feedback_respond),'',
+                                     {:focus => 'project_respond', :onclick => "toggleAndSettingWordsVal($('##{id}'), $('##{id} textarea'), '#{l(:label_reply_plural)} #{m_reply_id.user.name}: '); return false;"} %>
+                <% end %>
             </span>
 	    </p>
 	</div>
diff --git a/public/stylesheets/css.css b/public/stylesheets/css.css
index 2a1ae81a7..e401b59da 100644
--- a/public/stylesheets/css.css
+++ b/public/stylesheets/css.css
@@ -91,8 +91,10 @@ a:hover.ping_sub{ background:#14a8b9;}
 .recall{ border-top:1px solid #CCC; padding:5px 0;}
 .recall_head{ float:left;}
 .recall_head a{ display:block; width:30px; height:30px; border:1px solid #CCC; padding:1px;}
+.recall_head img{ height:30px; width:30px;}
 .recall_head a:hover{border:1px solid #15bccf;}
-.recall_con{ float:left;color:#777777; width:335px; margin-left:10px; }
+.recall_head img:hover{border:1px solid #15bccf;}
+.recall_con{ float:left;color:#777777; width:90%; margin-left:10px; }
 .recall_con a{ color:#15bccf; }
 
 .ping_list{ margin-top:15px;}