From 8ccedaa62236afebb287d4fa70c665f425a4b121 Mon Sep 17 00:00:00 2001
From: cxt <pinecxt@163.com>
Date: Tue, 3 May 2016 14:13:01 +0800
Subject: [PATCH] =?UTF-8?q?=E9=80=9A=E7=9F=A5=E8=AF=A6=E6=83=85=E6=B7=BB?=
 =?UTF-8?q?=E5=8A=A0=E7=82=B9=E8=B5=9E?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/views/news/_course_show.html.erb | 25 ++++++++++++++++++++-----
 1 file changed, 20 insertions(+), 5 deletions(-)

diff --git a/app/views/news/_course_show.html.erb b/app/views/news/_course_show.html.erb
index 3236aa6a0..ee9d63720 100644
--- a/app/views/news/_course_show.html.erb
+++ b/app/views/news/_course_show.html.erb
@@ -97,11 +97,19 @@
   </div>
   <div class="cl"></div>
   <div class="homepagePostReply">
+    <div class="homepagePostReplyBanner">
+      <div class="homepagePostReplyBannerCount">回复
+        <sapn class="mr15"><%= @comments.count>0 ? "（#{@comments.count}）" : "" %></sapn><span style="color: #cecece;">▪</span>
+        <span id="praise_count_<%=@news.id %>">
+          <% if @news.author == User.current %>
+            <span class="ml15 likeButton" title="不能自己赞自己哦！"> <span class="likeText">赞</span><span class="likeNum"><%= get_praise_num(@news) > 0 ? "（#{get_praise_num(@news)}）" : "" %></span></span>
+          <% else %>
+            <%=render :partial=> "praise_tread/praise", :locals => {:activity=>@news, :user_activity_id=>@news.id,:type=>"activity"}%>
+          <% end %>
+        </span>
+      </div>
+    </div>
     <% unless @comments.empty? %>
-        <div class="homepagePostReplyBanner">
-          <div class="homepagePostReplyBannerCount">回复（<%=@comments.count %>）</div>
-          <div class="homepagePostReplyBannerTime"></div>
-        </div>
         <div class="" id="reply_div_<%=@news.id %>">
           <% @comments.each_with_index  do |reply,i| %>
               <script type="text/javascript">
@@ -127,13 +135,20 @@
                   <div style="margin-top: -7px; margin-bottom: 5px">
                     <%= format_time(reply.created_on) %>
                     <div class="fr" id="reply_edit_menu_<%= reply.id%>" style="display: none">
+                      <span id="reply_praise_count_<%=reply.id %>">
+                          <% if reply.author == User.current %>
+                            <span class="fr newsGrey" title="不能自己赞自己哦！"> <span class="likeText">赞</span><span class="likeNum"><%= get_praise_num(reply) > 0 ? "（#{get_praise_num(reply)}）" : "" %></span></span>
+                          <% else %>
+                            <%=render :partial=> "praise_tread/praise", :locals => {:activity=>reply, :user_activity_id=>reply.id,:type=>"reply"}%>
+                          <% end %>
+                      </span>
                       <%= link_to_if_authorized_course(
                                   l(:button_delete),
                                   {:controller => 'comments',
                                   :action => 'destroy', :id => @news,
                                   :comment_id => reply},
                                   :method => :delete,
-                                  :class => 'fr newsGrey',
+                                  :class => 'fr newsGrey mr10',
                                   :data => {:confirm => l(:text_are_you_sure)},
                                   :title => l(:button_delete)
                           ) %>