Merge Justin

[selectricity-live] / app / controllers / site_controller.rb

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

-  layout 'hc'
+  layout 'main'

   model :user, :election, :account
 
   def index
   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?
     # if the person claims they are logged in
    
     if logged_in?


@@ -16,7 +16,7 @@ class SiteController < ApplicationController
           b.enddate <=> a.enddate
         end
       else
           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
         
              # nothing and start again
         session[:user] = nil