作业动态的点赞

app/controllers/praise_tread_controller.rb

@@ -20,7 +20,12 @@ class PraiseTreadController < ApplicationController
       @obj_type = params[:obj_type]
       #@horizontal = params[:horizontal].downcase == "false" ? false:true
       @obj = find_object_by_type_and_id(@obj_type,@obj_id)
-      unless @obj.author_id == User.current.id
+      if @obj.respond_to?("author_id")
+        author_id = @obj.author_id
+      elsif @obj.respond_to?("user_id")
+        author_id = @obj.user_id
+      end
+      unless author_id == User.current.id
         praise_tread_plus(@obj_type,@obj_id,1)
       end
       respond_to do |format|
@@ -102,6 +107,10 @@ class PraiseTreadController < ApplicationController
       @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)
     end
     return @obj
   end

app/views/organizations/_org_course_homework.html.erb

@@ -223,10 +223,16 @@
 
   <% count=activity.journals_for_messages.count %>
   <div class="homepagePostReply">
-    <div class="topBorder" style="display: <%= count>0 ? 'none': '' %>"></div>
-    <div class="homepagePostReplyBanner" style="display: <%= count>0 ? '': 'none' %>">
-      <div class="homepagePostReplyBannerCount">
-        回复（<%= 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.user == 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"></div>
       <%if count>3 %>
@@ -261,6 +267,19 @@
                           <%= link_to comment.try(:user).try(:realname), user_path(comment.user_id), :class => "newsBlue mr10 f14" %>
                       <% end %>
                       <%= format_time(comment.created_on) %>
+                      <span id="reply_praise_count_<%=comment.id %>">
+                          <% if comment.user == 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 id="message_edit_<%=comment.id %>" style="display: none" class="mr10 fr">
+                        <% if User.current.admin? ||is_teacher || comment.user == User.current%>
+                            <%= link_to('删除', {:controller => 'words', :action => 'destroy', :object_id => comment, :user_id => comment.user,:user_activity_id => user_activity_id, :is_in_course => -1,:course_activity=>course_activity},
+                                        :remote => true, :confirm => l(:text_are_you_sure), :method => 'delete', :class => "replyGrey fr ml10", :title => l(:button_delete))  %>
+                        <% end %>
+                      </div>
                     </div>
                     <div class="homepagePostReplyContent break_word list_style upload_img table_maxWidth" id="reply_content_<%= comment.id %>">
                       <%= comment.notes.html_safe %></div>

app/views/users/_course_homework.html.erb

@@ -223,10 +223,16 @@
 
   <% count=activity.journals_for_messages.count %>
   <div class="homepagePostReply">
-    <div class="topBorder" style="display: <%= count>0 ? 'none': '' %>"></div>
-    <div class="homepagePostReplyBanner" style="display: <%= count>0 ? '': 'none' %>">
-      <div class="homepagePostReplyBannerCount">
-        回复（<%= 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.user == 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"></div>
       <%if count>3 %>
@@ -261,12 +267,20 @@
                           <%= link_to comment.try(:user).try(:realname), user_path(comment.user_id), :class => "newsBlue mr10 f14" %>
                       <% end %>
                       <%= format_time(comment.created_on) %>
-                      <div id="message_edit_<%=comment.id %>" style="display: none" class="fr">
+                      <span id="reply_praise_count_<%=comment.id %>">
+                          <% if comment.user == 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 id="message_edit_<%=comment.id %>" style="display: none" class="mr10 fr">
                           <% if User.current.admin? ||is_teacher || comment.user == User.current%>
                               <%= link_to('删除', {:controller => 'words', :action => 'destroy', :object_id => comment, :user_id => comment.user,:user_activity_id => user_activity_id, :is_in_course => -1,:course_activity=>course_activity},
                                           :remote => true, :confirm => l(:text_are_you_sure), :method => 'delete', :class => "replyGrey fr ml10", :title => l(:button_delete))  %>
                           <% end %>
                       </div>
+
                     </div>
                     <div class="homepagePostReplyContent break_word list_style upload_img table_maxWidth" id="reply_content_<%= comment.id %>">
                       <%= comment.notes.html_safe %></div>

app/views/users/_user_homework_detail.html.erb

@@ -226,10 +226,16 @@
 
   <% count=homework_common.journals_for_messages.count %>
   <div class="homepagePostReply">
-    <div class="topBorder" style="display: <%= count>0 ? 'none': '' %>"></div>
-    <div class="homepagePostReplyBanner" style="display: <%= count>0 ? '': 'none' %>">
-      <div class="homepagePostReplyBannerCount">
-        回复（<%= count %>）
+    <div class="homepagePostReplyBanner">
+      <div class="homepagePostReplyBannerCount">回复
+        <sapn class="mr15"><%= count>0 ? "（#{count}）" : "" %></sapn><span style="color: #cecece;">▪</span>
+        <span id="praise_count_<%=homework_common.id %>">
+          <% if homework_common.user == User.current %>
+            <span class="ml15 likeButton"> <span class="likeText">赞</span><span class="likeNum"><%= get_praise_num(homework_common) > 0 ? "（#{get_praise_num(homework_common)}）" : "" %></span></span>
+          <% else %>
+            <%=render :partial=> "praise_tread/praise", :locals => {:activity=>homework_common, :user_activity_id=>homework_common.id,:type=>"activity"}%>
+          <% end %>
+        </span>
       </div>
       <div class="homepagePostReplyBannerTime"></div>
       <%if count>3 %>
@@ -263,8 +269,14 @@
                       <% else %>
                           <%= link_to comment.try(:user).try(:realname), user_path(comment.user_id), :class => "newsBlue mr10 f14" %>
                       <% end %>
-                      <%= format_time(comment.created_on) %>
-                      <div class="fr" id="message_edit_<%=comment.id %>" style="display: none">
+                      <%= format_time(comment.created_on) %><span id="reply_praise_count_<%=comment.id %>">
+                      <% if comment.user == 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 id="message_edit_<%=comment.id %>" style="display: none" class="mr10 fr">
                           <% if User.current.admin? ||is_teacher || comment.user == User.current%>
                               <%= link_to('删除', {:controller => 'words', :action => 'destroy', :object_id => comment, :user_id => comment.user,:is_in_course => is_in_course,:course_activity=>-1},
                                           :remote => true, :confirm => l(:text_are_you_sure), :method => 'delete', :class => "replyGrey fr ml10", :title => l(:button_delete))  %>