app/views/activities/_activity_feed.html.erb in muck-activities-0.1.19 vs app/views/activities/_activity_feed.html.erb in muck-activities-0.1.20

- old
+ new

@@ -1,19 +1,15 @@ <div id="activity-feed"> <div id="activity-feed-content"> - <%= render( :partial => "activities/cached_activities", :locals => {:activities => activities}) %> + <%= cached_activities(activities, limited) %> </div> </div> <%= will_paginate activities, :previous_label => t('muck.activities.paging_newer'), :next_label => t('muck.activities.paging_older') -%> -<% content_for :head do -%> - <%= javascript_tag %[var COMMENT_PROMPT = '#{t('muck.activities.write_prompt')}';] %> - <%= javascript_tag %[var ADD_COMMENT_MESSAGE = '#{t('muck.activities.adding_comment_message')}';] %> -<% end -%> <% content_for :javascript do -%> jQuery(document).ready(function(){ setup_submit_delete(); <% if GlobalConfig.enable_live_activity_updates -%> setInterval(function() {jQuery.ajax({success:function(request){update_feed(request);}, type: "GET", url:'<%= activities_path(:parent_id => activities_object, :parent_type => activities_object.type, :activity_filter => params[:activity_filter], :format => 'js') %>&amp;latest_activity_id=' + get_latest_activity_id()})}, <%=GlobalConfig.live_activity_update_interval%> * 1000) <% end -%> }); <% end -%> -<%= javascript_include_tag 'muck_activities' %> \ No newline at end of file +<%= activity_scripts %>