Regex fix merged

[selectricity] / app / controllers / site_controller.rb

diff --git a/app/controllers/site_controller.rb b/app/controllers/site_controller.rb
index a33a1fa16707403589ce4caebd0bb36161bb30d9..d432a03b9fb5457277d6dafc9a0660a369bd45eb 100644 (file)
--- a/app/controllers/site_controller.rb
+++ b/app/controllers/site_controller.rb
@@ -1,6 +1,10 @@
 class SiteController < ApplicationController
 class SiteController < ApplicationController

-  layout 'main'
-  model :user, :election, :account
+  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]
 
   def index
     @quickvotes = QuickVote.find(:all).sort {|a,b| b.enddate <=> a.enddate}[0..1]