Merged from Mako.

[selectricity] / app / controllers / site_controller.rb

diff --git a/app/controllers/site_controller.rb b/app/controllers/site_controller.rb
index e26a3688997dd1ff67b4b817b44a345ddc8d4cfa..80fdfc406c3247b16651ae5c6b0bada8c2d35625 100644 (file)
--- a/app/controllers/site_controller.rb
+++ b/app/controllers/site_controller.rb
@@ -1,6 +1,8 @@
 class SiteController < ApplicationController
-  layout 'hc'
-  model :user, :election, :account
+  layout 'main'
+  require_dependency "user"
+  require_dependency "election"
+  require_dependency "account"
 
   def index
     @quickvotes = QuickVote.find(:all).sort {|a,b| b.enddate <=> a.enddate}[0..1]
@@ -16,7 +18,7 @@ class SiteController < ApplicationController
           b.enddate <=> a.enddate
         end
       else
-        # if we have no record of them, set the session id back to
+        # if we have no record of them, set the user back to
              # nothing and start again
         session[:user] = nil