From fe0414c83fa9256d5e1a2f6ff502f5fa8e2facbd Mon Sep 17 00:00:00 2001
From: cxt <pinecxt@163.com>
Date: Wed, 20 Jan 2016 10:53:05 +0800
Subject: [PATCH] =?UTF-8?q?=E7=BB=84=E7=BB=87=E6=96=87=E7=AB=A0=E5=92=8C?=
 =?UTF-8?q?=E5=8D=9A=E5=AE=A2=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/controllers/praise_tread_controller.rb    |  2 ++
 app/views/blog_comments/show.html.erb         | 24 +++++++++++++++----
 app/views/org_document_comments/show.html.erb | 24 +++++++++++++++----
 .../organizations/_show_org_document.html.erb | 20 ++++++++++++++--
 4 files changed, 60 insertions(+), 10 deletions(-)

diff --git a/app/controllers/praise_tread_controller.rb b/app/controllers/praise_tread_controller.rb
index 1a01a2f07..96eeab884 100644
--- a/app/controllers/praise_tread_controller.rb
+++ b/app/controllers/praise_tread_controller.rb
@@ -119,6 +119,8 @@ class PraiseTreadController < ApplicationController
         @obj = Journal.find_by_id(id)
       when 'BlogComment'
         @obj = BlogComment.find_by_id(id)
+      when 'OrgDocumentComment'
+        @obj = OrgDocumentComment.find_by_id(id)
       when 'User'
         @obj = User.find_by_id(id)
       when 'Issue'
diff --git a/app/views/blog_comments/show.html.erb b/app/views/blog_comments/show.html.erb
index 02f1ad1ad..6f4397569 100644
--- a/app/views/blog_comments/show.html.erb
+++ b/app/views/blog_comments/show.html.erb
@@ -116,9 +116,18 @@
       <% count=@article.children.count%>
   <% end %>
   <div class="homepagePostReply">
-    <% unless count == 0  %>
+    <%# unless count == 0  %>
         <div class="homepagePostReplyBanner">
-          <div class="homepagePostReplyBannerCount">回复（<%=count %>）</div>
+          <div class="homepagePostReplyBannerCount">回复
+            <sapn class="mr15"><%= count>0 ? "（#{count}）" : "" %></sapn><span style="color: #cecece;">▪</span>
+            <span id="praise_count_<%=@article.id %>">
+            <% if @article.author == User.current %>
+                <span class="ml15 likeButton" title="不能自己赞自己哦！"> <span class="likeText">赞</span><span class="likeNum"><%= get_praise_num(@article) > 0 ? "（#{get_praise_num(@article)}）" : "" %></span></span>
+            <% else %>
+                <%=render :partial=> "praise_tread/praise", :locals => {:activity=>@article, :user_activity_id=>@article.id,:type=>"activity"}%>
+            <% end %>
+            </span>
+          </div>
           <div class="homepagePostReplyBannerTime"></div>
           <!-- <div class="homepagePostReplyBannerMore">
         <%# if @reply_count > 2%>
@@ -150,7 +159,14 @@
                   </div>
                   <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 likeButton" 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>
+                    <div class="fr mr10" id="reply_edit_menu_<%= reply.id%>" style="display: none">
                       <%= link_to(
                                   l(:button_reply),
                                   {:controller => 'blog_comments',:action => 'quote',:user_id=>reply.author_id,:blog_id=>reply.blog_id, :id => reply.id},
@@ -175,7 +191,7 @@
           <% end %>
         </div>
 
-    <% end %>
+    <%# end %>
     <div class="cl"></div>
     <% if !@article.locked? && User.current.logged?%>
         <div class="talkWrapMsg" nhname="about_talk_reply">
diff --git a/app/views/org_document_comments/show.html.erb b/app/views/org_document_comments/show.html.erb
index d8df6a439..26d04924a 100644
--- a/app/views/org_document_comments/show.html.erb
+++ b/app/views/org_document_comments/show.html.erb
@@ -65,9 +65,18 @@
   <% count = @document.children.count() %>
 
   <div class="homepagePostReply fl" style="background-color: #f1f1f1;" id="<%= @document.id %>">
-    <% if count > 0 %>
+    <%# if count > 0 %>
         <div class="homepagePostReplyBanner">
-          <div class="homepagePostReplyBannerCount">回复（<%= count %>）</div>
+          <div class="homepagePostReplyBannerCount">回复
+            <sapn class="mr15"><%= count>0 ? "（#{count}）" : "" %></sapn><span style="color: #cecece;">▪</span>
+            <span id="praise_count_<%=@document.id %>">
+            <% if @document.creator_id.to_i == User.current.id.to_i %>
+                <span class="ml15 likeButton" title="不能自己赞自己哦！"> <span class="likeText">赞</span><span class="likeNum"><%= get_praise_num(@document) > 0 ? "（#{get_praise_num(@document)}）" : "" %></span></span>
+            <% else %>
+                <%=render :partial=> "praise_tread/praise", :locals => {:activity=>@document, :user_activity_id=>@document.id,:type=>"activity"}%>
+            <% end %>
+            </span>
+          </div>
         </div>
         <div class="" id="reply_div_<%=  @document.id %>">
           <% comments_for_doc.each_with_index  do |reply,i| %>
@@ -88,13 +97,20 @@
                   </div>
                   <div style="margin-top: -7px; margin-bottom: 5px">
                     <%= format_time(reply.created_at) %>
+                    <span id="reply_praise_count_<%=reply.id %>">
+                          <% if reply.creator_id.to_i == User.current.id.to_i %>
+                            <span class="fr likeButton" 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>
                     <div class="fr" id="reply_edit_menu_<%= reply.id%>" style="display: none">
                       <%= link_to(
                                   l(:button_reply),
                                   {:controller => 'org_document_comments',:action => 'quote',:user_id=>reply.creator_id, :id => reply.id},
                                   :remote => true,
                                   :method => 'get',
-                                  :class => 'fr newsBlue',
+                                  :class => 'fr newsBlue mr10',
                                   :title => l(:button_reply)) if User.current.logged? %>
                       <%= link_to(
                                   l(:button_delete),
@@ -113,7 +129,7 @@
           <% end %>
         </div>
         <div class="cl"></div>
-    <% end %>
+    <%# end %>
     <% if User.current.logged?%>
         <div class="talkWrapMsg" nhname="about_talk_reply">
           <em class="talkWrapArrow"></em>
diff --git a/app/views/organizations/_show_org_document.html.erb b/app/views/organizations/_show_org_document.html.erb
index 3f0ef8db1..e9db0e43f 100644
--- a/app/views/organizations/_show_org_document.html.erb
+++ b/app/views/organizations/_show_org_document.html.erb
@@ -60,8 +60,17 @@
   <% count = document.children.count() %>
 
   <div class="homepagePostReply fl" style="background-color: #f1f1f1;" id="<%= document.id %>">
-    <div class="homepagePostReplyBanner" style="display:<%= count == 0 ? 'none' : 'block' %>">
-      <div class="homepagePostReplyBannerCount">回复（<%= count %>）</div>
+    <div class="homepagePostReplyBanner">
+      <div class="homepagePostReplyBannerCount">回复
+        <sapn class="mr15"><%= count>0 ? "（#{count}）" : "" %></sapn><span style="color: #cecece;">▪</span>
+        <span id="praise_count_<%=document.id %>">
+          <% if document.creator_id.to_i == User.current.id.to_i %>
+            <span class="ml15 likeButton" title="不能自己赞自己哦！"> <span class="likeText">赞</span><span class="likeNum"><%= get_praise_num(document) > 0 ? "（#{get_praise_num(document)}）" : "" %></span></span>
+          <% else %>
+            <%=render :partial=> "praise_tread/praise", :locals => {:activity=>document, :user_activity_id=>document.id,:type=>"activity"}%>
+          <% end %>
+        </span>
+      </div>
       <% if count > 3 %>
           <div class="homepagePostReplyBannerMore">
             <a id="reply_btn_<%= document.id %>" onclick="expand_reply('#reply_div_<%= document.id %> li','#reply_btn_<%=document.id%>')" data-count="<%= count %>" data-init="0" class=" replyGrey" href="javascript:void(0)" value="show_help">
@@ -81,6 +90,13 @@
                 <div class="homepagePostReplyPublisher">
                   <%= link_to User.find(comment.creator_id), user_path(comment.creator_id), :class => "newsBlue mr10 f14" %>
                   <%= format_activity_day(comment.created_at) %> <%= format_time(comment.created_at, false) %>
+                  <span id="reply_praise_count_<%=comment.id %>">
+                          <% if comment.creator_id.to_i == User.current.id.to_i %>
+                            <span class="fr likeButton" title="不能自己赞自己哦！"> <span class="likeText">赞</span><span class="likeNum"><%= get_praise_num(comment) > 0 ? "（#{get_praise_num(comment)}）" : "" %></span></span>
+                          <% else %>
+                            <%=render :partial=> "praise_tread/praise", :locals => {:activity=>comment, :user_activity_id=>comment.id,:type=>"reply"}%>
+                          <% end %>
+                  </span>
                 </div>
                 <% unless comment.content.blank? %>
                     <div class="homepagePostReplyContent"><%= comment.content.html_safe %></div>