diff --git a/app/views/users/_all_replies.html.erb b/app/views/users/_all_replies.html.erb index 45404ed84..a74acc77c 100644 --- a/app/views/users/_all_replies.html.erb +++ b/app/views/users/_all_replies.html.erb @@ -13,7 +13,7 @@
<%= link_to comment.creator_user.show_name, user_url_in_org(comment.creator_user.id), :class => "newsBlue mr10 f14" %> - <%= time_from_now(comment.created_on) %> + <%= time_from_now(comment.created_time) %> <%=render :partial=> "praise_tread/praise", :locals => {:activity=>comment, :user_activity_id=>comment.id,:type=>"reply"}%> diff --git a/app/views/users/_journal_reply_banner.html.erb b/app/views/users/_journal_reply_banner.html.erb index 31934328f..c231f473d 100644 --- a/app/views/users/_journal_reply_banner.html.erb +++ b/app/views/users/_journal_reply_banner.html.erb @@ -10,7 +10,7 @@
<%#= format_date(activity.updated_on) %>
<%if count>3 %> diff --git a/app/views/users/all_journals.js.erb b/app/views/users/all_journals.js.erb index d4c42368d..6d227e93b 100644 --- a/app/views/users/all_journals.js.erb +++ b/app/views/users/all_journals.js.erb @@ -3,5 +3,5 @@ $('#reply_div_<%= params[:div_id].to_i %>').html('<%=escape_javascript(render :p <% elsif params[:type] == 'JournalsForMessage' %> $('#reply_div_<%= @user_activity_id %>').html('<%=escape_javascript(render :partial => 'users/journal_replies', :locals => {:comments => @journals,:user_activity_id => @user_activity_id, :type => @type, :allow_delete => @allow_delete, :activity_id =>params[:id].to_i}) %>'); <% else %> -$('#reply_div_<%= @user_activity_id %>').html('<%=escape_javascript(render :partial => 'users/all_replies', :locals => {:comments => @journals,:user_activity_id => @user_activity_id, :type => @type, :allow_delete => @allow_delete, :activity_id =>params[:id].to_i}) %>'); +$('#reply_div_<%= params[:div_id].to_i %>').html('<%=escape_javascript(render :partial => 'users/all_replies', :locals => {:comments => @journals}) %>'); <% end %> diff --git a/public/javascripts/application.js b/public/javascripts/application.js index 2b674b60d..66ead54ba 100644 --- a/public/javascripts/application.js +++ b/public/javascripts/application.js @@ -1289,7 +1289,40 @@ function clear_data(k,mdu){ } } -function expand_reply(container, btnid, id, type, div_id, allow_delete) { +function expand_reply(container, btnid, id, type, div_id) { + var target = $(container); + var btn = $(btnid); + if (btn.data('init') == '0') { + btn.data('init', 1); + $.get( + '/users/all_journals', + { + type: type, + id: id, + div_id: div_id + }, + function(data) { + + } + ); + btn.html('收起回复'); + //target.show(); + } else if(btn.data('init') == '1') { + btn.data('init', 3); + btn.html('展开更多'); + target.hide(); + target.eq(0).show(); + target.eq(1).show(); + target.eq(2).show(); + } + else { + btn.data('init', 1); + btn.html('收起回复'); + target.show(); + } +} + +function expand_journal_reply(container, btnid, id, type, div_id, allow_delete) { var target = $(container); var btn = $(btnid); if (btn.data('init') == '0') {