X-Git-Url: https://projects.mako.cc/source/selectricity-live/blobdiff_plain/feb38c08f5cbda03d540aef83fc056070e4b7b68..212820ba71e7fce006507fe1ce233ff12875510b:/app/controllers/site_controller.rb diff --git a/app/controllers/site_controller.rb b/app/controllers/site_controller.rb index 7768322..a33a1fa 100644 --- a/app/controllers/site_controller.rb +++ b/app/controllers/site_controller.rb @@ -1,9 +1,9 @@ class SiteController < ApplicationController - layout 'hc' + layout 'main' model :user, :election, :account def index - @quickvotes = QuickVote.find(:all, ["quickvote = 1"]).sort {|a,b| b.enddate <=> a.enddate}[0..1] + @quickvotes = QuickVote.find(:all).sort {|a,b| b.enddate <=> a.enddate}[0..1] # if the person claims they are logged in if logged_in? @@ -16,7 +16,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