diff --git a/app/controllers/categories_controller.rb b/app/controllers/categories_controller.rb
index 0c36596..def87a0 100644
--- a/app/controllers/categories_controller.rb
+++ b/app/controllers/categories_controller.rb
@@ -3,11 +3,11 @@ class CategoriesController < ApplicationController
# GET /categories
# GET /categories.xml
def index
- @categories = Category.paginate :all, :page => params[:page], :per_page => 4
+ @categories = Category.order('sort ASC').paginate :all, :page => params[:page], :per_page => 4
@num_categories = @categories.count
- @photos = Photo.all(:limit => 2, :order => 'RANDOM()', :conditions => { :featured => true, :enabled => true })
+ @photos = Photo.where(:enabled => true).where(:featured => true).limit(2).order('RANDOM()')
respond_to do |format|
format.html # index.html.erb
diff --git a/app/controllers/pages_controller.rb b/app/controllers/pages_controller.rb
index 0702ecb..a70964f 100644
--- a/app/controllers/pages_controller.rb
+++ b/app/controllers/pages_controller.rb
@@ -2,7 +2,7 @@ class PagesController < ApplicationController
layout "photos"
def index
- @photo = Photo.first(:order => 'RANDOM()', :conditions => { :featured => true, :enabled => true })
+ @photo = Photo.where(:featured => true).where(:enabled => true).order('RANDOM()').first
end
def about
diff --git a/app/controllers/photos_controller.rb b/app/controllers/photos_controller.rb
index aace989..7ae5be4 100644
--- a/app/controllers/photos_controller.rb
+++ b/app/controllers/photos_controller.rb
@@ -7,7 +7,7 @@ class PhotosController < ApplicationController
def index
if params[:category_id]
@category = Category.find_by_id(params[:category_id])
- @photos = @category.photos.paginate :page => params[:page], :conditions => { :enabled => true }, :per_page => 11
+ @photos = @category.photos.where(:enabled => true).paginate(:page => params[:page], :per_page => 11)
@num_photos = @photos.count
else
@photos = Photo.paginate :all, :page => params[:page], :per_page => 11
diff --git a/app/views/layouts/photos.html.erb b/app/views/layouts/photos.html.erb
index 4563638..63d088e 100644
--- a/app/views/layouts/photos.html.erb
+++ b/app/views/layouts/photos.html.erb
@@ -2,7 +2,7 @@
- Photos
+ Dan Barber Photography