Merge jdong

[selectricity] / app / controllers / site_controller.rb

diff --git a/app/controllers/site_controller.rb b/app/controllers/site_controller.rb
index 80fdfc406c3247b16651ae5c6b0bada8c2d35625..d432a03b9fb5457277d6dafc9a0660a369bd45eb 100644 (file)
--- a/app/controllers/site_controller.rb
+++ b/app/controllers/site_controller.rb
@@ -1,8 +1,10 @@
 class SiteController < ApplicationController
-  layout 'main'
+  layout 'frontpage'
   require_dependency "user"
   require_dependency "election"
   require_dependency "account"
+  include Sitealizer
+  before_filter :use_sitealizer
 
   def index
     @quickvotes = QuickVote.find(:all).sort {|a,b| b.enddate <=> a.enddate}[0..1]