base/app/views/activities/_root.html.erb in social_stream-1.1.12 vs base/app/views/activities/_root.html.erb in social_stream-2.0.0.beta1

@@ -1,40 +1,39 @@
-<%= div_for activity, :class => 'super_activity' do %>
-
-  <div class="actor_logo">
-    <%= link_to image_tag(activity.sender_subject.logo.url(:actor),
-                          :alt => activity.sender_subject.name),
-                 activity.sender_subject %>
+<%= div_for activity, :class => 'root media' do %>
+  <div class="avatar pull-left">
+    <div class="media-object">
+      <%= link_to image_tag(activity.sender_subject.logo.url('small'),
+        :alt => activity.sender_subject.name), activity.sender_subject %>
+    </div>
   </div>
+  <header class="media-heading">
+    <%= activity.title(self) %>
 
-  <div class="activity_content">
-  	
-    <div class="actor_name">
-      <%= activity.title(self) %>
+    <% if activity.direct_object && can?(:destroy, activity.direct_object) %>
+    <div class="x" style="float: right"> 
+      <%= link_to ('X'), activity.direct_object , :confirm => t('confirm_delete', 
+                    :scope => activity.direct_object.class.to_s.underscore), :method => :delete,  
+                    :remote => true %> 
     </div>
+    <% end %>
+  </header>
 
-    <div class="activity_objects">
-      <%= render activity.activity_objects %>
-    </div>
+  <div class="media-body">
+    <section class="objects">
+      <%= render partial: 'activity_objects/timeline', 
+                 collection: activity.activity_objects,
+                 as: :object %>
+    </section>
 
-    <%= render :partial => 'activities/options',
+    <%= render :partial => 'activities/actions',
                :locals => { :activity => activity } %>
 
     <%= render :partial => 'activities/likes',
                :locals => { :activity => activity } %>
 
     <%= render :partial => 'activities/comments',
                :locals => { :activity => activity } %>
 
     <%= render :partial => 'comments/new',
                :locals => { :activity => activity } %>
-
-  </div>
-
-  <div class="space_activities">
-    <% if activity.activity_objects.count > 1 %>
-      <div class="space_sub"></div>
-    <%else %>
-      <div class="#"></div>
-    <%end%>
   </div>
 <% end %>