added favicon and fixed search pagination

chrismatthieu · Aug 7, 2011 · d0b4e67 · d0b4e67
1 parent b445b70
commit d0b4e67
Show file tree

Hide file tree

Showing 5 changed files with 7 additions and 1 deletion.
diff --git a/.DS_Store b/.DS_Store
diff --git a/app/controllers/podcasts_controller.rb b/app/controllers/podcasts_controller.rb
@@ -93,7 +93,9 @@ def search
     else
       conditions = ["poddesc ILIKE ? or podname ILIKE ?", @keywords, @keywords] unless @keywords == ""
     end
-    @podcasts = Podcast.find(:all, :conditions => conditions, :order => 'created_at desc')
+    # @podcasts = Podcast.find(:all, :conditions => conditions, :order => 'created_at desc')
+    @podcasts = Podcast.paginate :page => params[:page], :per_page => 3, :order => 'created_at DESC', :conditions => conditions
+
     render :action => 'index'    
   end
 

diff --git a/app/views/podcasts/index.html.erb b/app/views/podcasts/index.html.erb
@@ -52,7 +52,9 @@
 <br />
 
 <% if @current_user && @current_user.admin %>
+<div class="entry">
   <%= link_to 'New podcast', :action => 'new' %>
+</div>
 <% end %>
 
 

diff --git a/app/views/podcasts/show.html.erb b/app/views/podcasts/show.html.erb
@@ -48,7 +48,9 @@
 <br />
 
 <% if  @current_user && @current_user.admin %>
+<div class="entry">
   <%= link_to 'New podcast', :action => 'new' %>
+</div>
 <% end %>
 
 
diff --git a/public/favicon.ico b/public/favicon.ico