Commit 12fad801

mo khan <mo@mokhan.ca>
2014-01-18 06:34:25
load 20 most recent activities in descing order and make it look pretty.
1 parent 1349cdc
Changed files (4)
app/controllers/dashboard_controller.rb
@@ -1,5 +1,5 @@
 class DashboardController < ApplicationController
   def index
-    @activities = current_user.activities
+    @activities = current_user.recent_activities
   end
 end
app/models/user.rb
@@ -56,6 +56,10 @@ class User < ActiveRecord::Base
     UserMailer.delay.welcome_email(self)
   end
 
+  def recent_activities(limit = 20)
+    activities.includes(:subject).order(created_at: :desc).limit(limit)
+  end
+
   class << self
     def ordered
       User.order(:creations_count => :desc)
app/views/dashboard/_favorite.html.erb
@@ -1,4 +1,11 @@
-<dt><%= subject.created_at.to_s :foomat %></dt>
+<dt>
+<i class="icon-heart icon-large"></i>
+</dt>
 <dd>
-<%= 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.
+<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.
+</p>
 </dd>
app/views/dashboard/index.html.erb
@@ -1,3 +1,4 @@
+<% provide(:title, "Dashboard") -%>
 <div class="row">
   <div class="span12">
     <h1>Activity Feed</h1>