From 8257770ec902b6a2dee0895cbf7a00840f05eaff Mon Sep 17 00:00:00 2001
From: cxt <pinecxt@163.com>
Date: Wed, 25 May 2016 16:20:01 +0800
Subject: [PATCH] =?UTF-8?q?=E8=AF=BE=E7=A8=8B=E5=92=8C=E9=A1=B9=E7=9B=AE?=
 =?UTF-8?q?=E7=95=99=E8=A8=80=E7=9A=84=E7=82=B9=E8=B5=9E?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/views/courses/_history.html.erb           | 3 +++
 app/views/projects/_history.html.erb          | 4 +++-
 app/views/words/_journal_reply_items.html.erb | 3 +++
 public/stylesheets/courses.css                | 1 +
 public/stylesheets/project.css                | 1 +
 5 files changed, 11 insertions(+), 1 deletion(-)

diff --git a/app/views/courses/_history.html.erb b/app/views/courses/_history.html.erb
index 864509546..ba89db0f9 100644
--- a/app/views/courses/_history.html.erb
+++ b/app/views/courses/_history.html.erb
@@ -23,6 +23,9 @@
             <div class="ping_disfoot f14">
               <% ids = 'project_respond_form_'+ journal.id.to_s%>
 
+              <span id="reply_praise_count_<%=journal.id %>">
+                <%=render :partial=> "praise_tread/praise", :locals => {:activity=>journal, :user_activity_id=>journal.id,:type=>"reply"}%>
+              </span>
               <% if journal.user == User.current|| User.current.admin? || (@course && User.current.allowed_to?(:as_teacher,@course)) %>
                   <%= link_to(l(:label_bid_respond_delete),
                               {:controller => 'words', :action => 'destroy', :object_id => journal, :user_id => @user},
diff --git a/app/views/projects/_history.html.erb b/app/views/projects/_history.html.erb
index b31445fdc..88cf8f344 100644
--- a/app/views/projects/_history.html.erb
+++ b/app/views/projects/_history.html.erb
@@ -14,6 +14,9 @@
                 </div>
                 <div class="ping_disfoot f14">
                   <% ids = 'project_respond_form_'+ journal.id.to_s%>
+                  <span id="reply_praise_count_<%=journal.id %>">
+                    <%=render :partial=> "praise_tread/praise", :locals => {:activity=>journal, :user_activity_id=>journal.id,:type=>"reply"}%>
+                  </span>
                     <% if journal.user == User.current|| User.current.admin? %>
                       <%= link_to(l(:label_bid_respond_delete),
                                   {:controller => 'words', :action => 'destroy', :object_id => journal, :user_id => @user},
@@ -26,7 +29,6 @@
                         <%= link_to l(:label_bid_respond_quote),'javascript:;', {:nhname=>"reply_btn"} %>
 
                     <% end %>
-                </span>
                 </div>
                 <div class="cl"></div>
                 <% ids = 'project_respond_form_'+ journal.id.to_s%>
diff --git a/app/views/words/_journal_reply_items.html.erb b/app/views/words/_journal_reply_items.html.erb
index db848d2cd..2616cfd24 100644
--- a/app/views/words/_journal_reply_items.html.erb
+++ b/app/views/words/_journal_reply_items.html.erb
@@ -29,6 +29,9 @@
               <%= format_time reply.created_on %>
             </span>
         <div class="ping_disfoot" style="display: none; margin-left: 4px;" id='<%=ids_r%>' >
+          <span id="reply_praise_count_<%=reply.id %>">
+            <%=render :partial=> "praise_tread/praise", :locals => {:activity=>reply, :user_activity_id=>reply.id,:type=>"reply"}%>
+          </span>
           <% if User.current.admin? || reply.user.id == User.current.id || allow_delete%>
               <%= 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))  %>
diff --git a/public/stylesheets/courses.css b/public/stylesheets/courses.css
index a55755740..55f2a0ffc 100644
--- a/public/stylesheets/courses.css
+++ b/public/stylesheets/courses.css
@@ -439,6 +439,7 @@ a:hover.ping_sub{ background:#14a8b9;}
 /*.ping_distop span{ float:left;}*/
 .ping_distop p{ color:#5f5f5f;word-break: break-all;word-wrap: break-word;}
 .ping_disfoot a{ float:right; color: #6883b6; margin-left:5px; margin-bottom:5px;}
+.ping_disfoot span a span{ color: #6883b6;}
 /*.ping_distop span a{ float:right; width:20px; height:20px; background:url(images/star.png) -24px 0 no-repeat; margin-right:3px;}*/
 .list_style ol li{list-style-type: decimal;margin-left: 40px;}
 .list_style ul li{list-style-type: disc;margin-left: 40px;}
diff --git a/public/stylesheets/project.css b/public/stylesheets/project.css
index 09f7075f7..76228ceb7 100644
--- a/public/stylesheets/project.css
+++ b/public/stylesheets/project.css
@@ -332,6 +332,7 @@ a:hover.ping_sub{ background:#14a8b9;}
 /*.ping_distop span{ float:left;}*/
 .ping_distop p{ color:#5f5f5f;word-break: break-all;word-wrap: break-word;}
 .ping_disfoot a{ float:right; color: #6883b6; margin-left:5px; margin-bottom:5px;}
+.ping_disfoot span a span{ color: #6883b6;}
 /*.ping_distop span a{ float:right; width:20px; height:20px; background:url(images/star.png) -24px 0 no-repeat; margin-right:3px;}*/
 .list_style ol li{list-style-type: decimal;margin-left: 40px;}
 .list_style ul li{list-style-type: disc;margin-left: 40px;}