From 7445c64e46579211b4bce451fb985412cf8363e5 Mon Sep 17 00:00:00 2001
From: cxt <pinecxt@163.com>
Date: Fri, 29 Apr 2016 16:23:36 +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=9A=84=E5=B8=96=E5=AD=90=E8=AF=A6=E6=83=85=E9=A1=B5=E9=9D=A2?=
 =?UTF-8?q?=E6=B7=BB=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/messages/_course_show.html.erb  | 28 ++++++++++++++-------
 app/views/messages/_project_show.html.erb | 30 +++++++++++++++--------
 2 files changed, 39 insertions(+), 19 deletions(-)

diff --git a/app/views/messages/_course_show.html.erb b/app/views/messages/_course_show.html.erb
index f36f8a63c..33c9d7f8d 100644
--- a/app/views/messages/_course_show.html.erb
+++ b/app/views/messages/_course_show.html.erb
@@ -91,16 +91,19 @@
   </div>
   <div class="cl"></div>
   <div class="homepagePostReply">
-    <% unless @replies.empty? %>
     <div class="homepagePostReplyBanner">
-      <div class="homepagePostReplyBannerCount">回复（<%=@reply_count %>）</div>
-      <div class="homepagePostReplyBannerTime"></div>
-      <!-- <div class="homepagePostReplyBannerMore">
-        <%# if @reply_count > 2%>
-           <a href="javascript:void(0);" class="replyGrey"  id="reply_btn_<%#= @topic.id%>" onclick="expand_reply('#reply_div_<%#= @topic.id %>','#reply_btn_<%#= @topic.id%>')" data-count="<%#= @reply_count %>" data-init="0" >点击展开更多回复</a>
-        <%# end %>
-      </div>-->
+      <div class="homepagePostReplyBannerCount">回复
+        <sapn class="mr15"><%= @reply_count>0 ? "（#{@reply_count}）" : "" %></sapn><span style="color: #cecece;">▪</span>
+        <span id="praise_count_<%=@topic.id %>">
+          <% if @topic.author == User.current %>
+            <span class="ml15 likeButton" title="不能自己赞自己哦！"> <span class="likeText">赞</span><span class="likeNum"><%= get_praise_num(@topic) > 0 ? "（#{get_praise_num(@topic)}）" : "" %></span></span>
+          <% else %>
+            <%=render :partial=> "praise_tread/praise", :locals => {:activity=>@topic, :user_activity_id=>@topic.id,:type=>"activity"}%>
+          <% end %>
+        </span>
+      </div>
     </div>
+    <% unless @replies.empty? %>
     <div class="" id="reply_div_<%=  @topic.id %>">
       <% @replies.each_with_index  do |reply,i| %>
           <script type="text/javascript">
@@ -126,12 +129,19 @@
               <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(
                               l(:button_reply),
                               {:action => 'quote', :id => reply},
                               :remote => true,
                               :method => 'get',
-                              :class => 'fr newsBlue',
+                              :class => 'fr newsBlue mr10',
                               :title => l(:button_reply)) if !@topic.locked? && authorize_for('messages', 'reply') %>
                   <%= link_to(
                               l(:button_delete),
diff --git a/app/views/messages/_project_show.html.erb b/app/views/messages/_project_show.html.erb
index 3a306ba74..10046bce2 100644
--- a/app/views/messages/_project_show.html.erb
+++ b/app/views/messages/_project_show.html.erb
@@ -147,16 +147,19 @@
     </div>
     <div class="cl"></div>
     <div class="homepagePostReply">
+      <div class="homepagePostReplyBanner">
+        <div class="homepagePostReplyBannerCount">回复
+          <sapn class="mr15"><%= @reply_count>0 ? "（#{@reply_count}）" : "" %></sapn><span style="color: #cecece;">▪</span>
+          <span id="praise_count_<%=@topic.id %>">
+          <% if @topic.author == User.current %>
+            <span class="ml15 likeButton" title="不能自己赞自己哦！"> <span class="likeText">赞</span><span class="likeNum"><%= get_praise_num(@topic) > 0 ? "（#{get_praise_num(@topic)}）" : "" %></span></span>
+          <% else %>
+            <%=render :partial=> "praise_tread/praise", :locals => {:activity=>@topic, :user_activity_id=>@topic.id,:type=>"activity"}%>
+          <% end %>
+        </span>
+        </div>
+      </div>
       <% unless @replies.empty? %>
-          <div class="homepagePostReplyBanner">
-            <div class="homepagePostReplyBannerCount">回复（<%=@reply_count %>）</div>
-            <div class="homepagePostReplyBannerTime"></div>
-            <!-- <div class="homepagePostReplyBannerMore">
-        <%# if @reply_count > 2%>
-           <a href="javascript:void(0);" class="replyGrey"  id="reply_btn_<%#= @topic.id%>" onclick="expand_reply('#reply_div_<%#= @topic.id %>','#reply_btn_<%#= @topic.id%>')" data-count="<%#= @reply_count %>" data-init="0" >点击展开更多回复</a>
-        <%# end %>
-      </div>-->
-          </div>
           <div class="" id="reply_div_<%=  @topic.id %>">
             <% @replies.each_with_index  do |reply,i| %>
                 <script type="text/javascript">
@@ -182,12 +185,19 @@
                     <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(
                                     l(:button_reply),
                                     {:action => 'quote', :id => reply},
                                     :remote => true,
                                     :method => 'get',
-                                    :class => 'fr newsBlue',
+                                    :class => 'fr newsBlue mr10',
                                     :title => l(:button_reply)) if !@topic.locked? && authorize_for('messages', 'reply') %>
                         <%= link_to(
                                     l(:button_delete),