From c5935a6a465fa647895c0d0a7253668e3ffa2a26 Mon Sep 17 00:00:00 2001
From: cxt <pinecxt@163.com>
Date: Mon, 18 Jan 2016 15:52:38 +0800
Subject: [PATCH] =?UTF-8?q?=E5=8D=9A=E5=AE=A2=E5=8A=A8=E6=80=81=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/controllers/praise_tread_controller.rb | 54 +++++++++++-----------
 app/views/blogs/_article.html.erb          | 32 +++++++++++--
 app/views/users/_user_blog.html.erb        | 30 ++++++++++--
 3 files changed, 81 insertions(+), 35 deletions(-)

diff --git a/app/controllers/praise_tread_controller.rb b/app/controllers/praise_tread_controller.rb
index 291a71f26..1a01a2f07 100644
--- a/app/controllers/praise_tread_controller.rb
+++ b/app/controllers/praise_tread_controller.rb
@@ -103,32 +103,34 @@ class PraiseTreadController < ApplicationController
   def find_object_by_type_and_id(type,id)
     @obj = nil
     case type
-    when 'User'
-      @obj = User.find_by_id(id)
-    when 'Issue'
-      @obj = Issue.find_by_id(id)
-    when 'Project'
-      @obj = Project.find_by_id(id)
-    when 'Bid'
-      @obj = Bid.find_by_id(id)
-    when 'Contest'
-      @obj = Contest.find_by_id(id)
-    when  'Memo'
-      @obj = Memo.find_by_id(id)
-    when 'Message'
-      @obj = Message.find_by_id(id)
-    when 'HomeworkCommon'
-      @obj = HomeworkCommon.find_by_id(id)
-    when 'JournalsForMessage'
-      @obj = JournalsForMessage.find_by_id(id)
-    when 'News'
-      @obj = News.find_by_id(id)
-    when 'Comment'
-      @obj = Comment.find_by_id(id)
-    when 'Journal'
-      @obj = Journal.find_by_id(id)
-    else
-      @obj = nil
+      when  'Memo'
+        @obj = Memo.find_by_id(id)
+      when 'Message'
+        @obj = Message.find_by_id(id)
+      when 'HomeworkCommon'
+        @obj = HomeworkCommon.find_by_id(id)
+      when 'JournalsForMessage'
+        @obj = JournalsForMessage.find_by_id(id)
+      when 'News'
+        @obj = News.find_by_id(id)
+      when 'Comment'
+        @obj = Comment.find_by_id(id)
+      when 'Journal'
+        @obj = Journal.find_by_id(id)
+      when 'BlogComment'
+        @obj = BlogComment.find_by_id(id)
+      when 'User'
+        @obj = User.find_by_id(id)
+      when 'Issue'
+        @obj = Issue.find_by_id(id)
+      when 'Project'
+        @obj = Project.find_by_id(id)
+      when 'Bid'
+        @obj = Bid.find_by_id(id)
+      when 'Contest'
+        @obj = Contest.find_by_id(id)
+      else
+        @obj = nil
     end
     return @obj
   end
diff --git a/app/views/blogs/_article.html.erb b/app/views/blogs/_article.html.erb
index 22df4499a..2c18a144c 100644
--- a/app/views/blogs/_article.html.erb
+++ b/app/views/blogs/_article.html.erb
@@ -125,11 +125,17 @@
       <% count=activity.children.count%>
   <% end %>
   <div class="homepagePostReply">
-    <div class="topBorder" style="display: <%= count<=0 && !activity.locked ? '': 'none' %>"></div>
-    <div class="homepagePostReplyBanner" style="display: <%= count>0 ? '': 'none' %>">
-      <div class="homepagePostReplyBannerCount" onclick="expand_reply_input('#reply_input_<%= user_activity_id %>');">回复(
-        <%= count %>
-        )</div>
+    <div class="homepagePostReplyBanner">
+      <div class="homepagePostReplyBannerCount">回复
+        <sapn class="mr15"><%= count>0 ? "（#{count}）" : "" %></sapn><span style="color: #cecece;">▪</span>
+        <span id="praise_count_<%=user_activity_id %>">
+          <% if activity.author == User.current %>
+            <span class="ml15 likeButton"> <span class="likeText">赞</span><span class="likeNum"><%= get_praise_num(activity) > 0 ? "（#{get_praise_num(activity)}）" : "" %></span></span>
+          <% else %>
+            <%=render :partial=> "praise_tread/praise", :locals => {:activity=>activity, :user_activity_id=>user_activity_id,:type=>"activity"}%>
+          <% end %>
+        </span>
+      </div>
       <div class="homepagePostReplyBannerTime"><%#=format_date(activity.updated_on)%></div>
       <%if count > 3 %>
           <div class="homepagePostReplyBannerMore">
@@ -164,6 +170,13 @@
                           <%= link_to reply.try(:author).try(:realname), user_path(reply.author_id,:host=>Setting.host_user), :class => "newsBlue mr10 f14" %>
                       <% end %>
                       <%= format_time(reply.created_on) %>
+                      <span id="reply_praise_count_<%=reply.id %>">
+                          <% if reply.author == User.current %>
+                            <span class="fr likeButton"> <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>
                     <div class="homepagePostReplyContent break_word list_style upload_img" id="reply_content_<%= reply.id %>">
                       <%= reply.content.html_safe %>
@@ -203,5 +216,14 @@
   </div>
 </div>
 <script type="text/javascript">
+    $("#moreProject_<%=user_activity_id %>").click(function(){
+        $("#relatePWrap_<%=user_activity_id %>").toggleClass('relatePWrap');
+        $("#relatePWrap_<%=user_activity_id %>").css("height","auto");
+        $(this).hide();
+    });
+    $("#hideProject_<%=user_activity_id %>").click(function(){
+        $("#relatePWrap_<%=user_activity_id %>").toggleClass('relatePWrap');
+        $("#moreProject_<%=user_activity_id %>").show();
+    });
     $(description_show_hide(<%=user_activity_id %>));
 </script>
diff --git a/app/views/users/_user_blog.html.erb b/app/views/users/_user_blog.html.erb
index 3ce0926a8..440bcb773 100644
--- a/app/views/users/_user_blog.html.erb
+++ b/app/views/users/_user_blog.html.erb
@@ -50,10 +50,16 @@
   </div>
   <% count=activity.children.count %>
   <div class="homepagePostReply">
-    <div class="topBorder" style="display: <%= count>0 ? 'none': '' %>"></div>
-    <div class="homepagePostReplyBanner" style="display: <%= count>0 ? '': 'none' %>">
-      <div class="homepagePostReplyBannerCount" onclick="expand_reply_input('#reply_input_<%= user_activity_id %>');">
-        回复（<%= count %>）
+    <div class="homepagePostReplyBanner">
+      <div class="homepagePostReplyBannerCount">回复
+        <sapn class="mr15"><%= count>0 ? "（#{count}）" : "" %></sapn><span style="color: #cecece;">▪</span>
+        <span id="praise_count_<%=user_activity_id %>">
+          <% if activity.author == User.current %>
+            <span class="ml15 likeButton"> <span class="likeText">赞</span><span class="likeNum"><%= get_praise_num(activity) > 0 ? "（#{get_praise_num(activity)}）" : "" %></span></span>
+          <% else %>
+            <%=render :partial=> "praise_tread/praise", :locals => {:activity=>activity, :user_activity_id=>user_activity_id,:type=>"activity"}%>
+          <% end %>
+        </span>
       </div>
       <div class="homepagePostReplyBannerTime"><%#= format_date(activity.updated_on) %></div>
       <%if count>3 %>
@@ -88,6 +94,13 @@
                           <%= link_to comment.try(:author).try(:realname), user_path(comment.author_id), :class => "newsBlue mr10 f14" %>
                       <% end %>
                       <%= format_time(comment.created_on) %>
+                      <span id="reply_praise_count_<%=comment.id %>">
+                          <% if comment.author == User.current %>
+                            <span class="fr likeButton"> <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>
                     <div class="homepagePostReplyContent break_word list_style upload_img table_maxWidth" id="reply_content_<%= comment.id %>">
                       <%= comment.content.html_safe %></div>
@@ -126,5 +139,14 @@
   </div>
 </div>
 <script type="text/javascript">
+    $("#moreProject_<%=user_activity_id %>").click(function(){
+        $("#relatePWrap_<%=user_activity_id %>").toggleClass('relatePWrap');
+        $("#relatePWrap_<%=user_activity_id %>").css("height","auto");
+        $(this).hide();
+    });
+    $("#hideProject_<%=user_activity_id %>").click(function(){
+        $("#relatePWrap_<%=user_activity_id %>").toggleClass('relatePWrap');
+        $("#moreProject_<%=user_activity_id %>").show();
+    });
     $(description_show_hide(<%=user_activity_id %>));
 </script>