Commit 49d489c7

@@ -2,13 +2,12 @@
 <i class="icon-comment icon-large"></i>
 </dt>
 <dd>
-<p><%= time_ago_in_words(subject.created_at) %> ago.</p>
 <p>
 <%= avatar_for(subject.user, size: 24) %> 
-<%= link_to subject.user.name, profile_path(subject.user) %> said
+<%= link_to subject.user.name, profile_path(subject.user) %> commented on <%= link_to subject.creation.name, creation_path(subject.creation) %>
+<small><%= time_ago_in_words(subject.created_at) %> ago.</small>
 <blockquote>
   <%= subject.text %>
 </blockquote>
-about <%= link_to subject.creation.name, creation_path(subject.creation) %>.
 </p>
 </dd>

@@ -2,10 +2,10 @@
 <i class="icon-heart icon-large"></i>
 </dt>
 <dd>
-<p><%= time_ago_in_words(subject.created_at) %> ago.</p>
 <p>
 <%= avatar_for(subject.user, size: 24) %> 
 <%= link_to subject.user.name, profile_path(subject.user) %> added 
-<%= link_to subject.creation.name, creation_path(subject.creation) %> to their favorites.
+<%= link_to subject.creation.name, creation_path(subject.creation) %> to their favorites
+<small><%= time_ago_in_words(subject.created_at) %> ago.</small>
 </p>
 </dd>

@@ -1,7 +1,7 @@
 <% provide(:title, "Dashboard") -%>
 <div class="row">
   <div class="span12">
-    <h1>Activity Feed</h1>
+    <h1>News Feed</h1>
     <dl class="dl-horizontal">
       <% @activities.each do |activity| %>
         <%= render activity.subject.class.to_s.downcase, subject: activity.subject %>