app/views/activity_templates/_generic.html.erb in muck-activities-0.1.16 vs app/views/activity_templates/_generic.html.erb in muck-activities-0.1.17

- old
+ new

@@ -1,10 +1,12 @@ <div class="activity <%= activity_css_class %> delete-container" id="<%= activity.dom_id %>"> <div class="actor-icon"><%= icon activity.source %></div> <div class="activity-content"> - <p><span class="actor"><%= link_to activity.source.display_name, activity.source %></span> <%= activity.content %></p> + <p><span class="actor"><%= link_to activity.source.display_name, activity.source %></span> + <%= body %> + </p> <%= delete_activity(activity, :image) %> - <span class="activity-time"><%= t("muck.activities.time_ago", :time_in_words => time_ago_in_words(activity.created_at)) %></span> + <span class="activity-time"><%= t("muck.general.time_ago", :time_in_words => time_ago_in_words(activity.created_at)) %></span> <% if !activity.has_comments? -%> <span><a id="make_comment_<%=activity.dom_id%>" class="make-comment" href="#"><%=t('muck.activities.make_comment')%></a></span> <% end -%> </div> <%= activity_comments(activity) %> \ No newline at end of file