projects
/
selectricity
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
First major stab at the integration of Courtland's CSS into
[selectricity]
/
app
/
controllers
/
site_controller.rb
diff --git
a/app/controllers/site_controller.rb
b/app/controllers/site_controller.rb
index 776832218c2b9a611e874a50564f3efa42805696..522bbb2cf4dbe3b5e26145a9040b233ac3732187 100644
(file)
--- a/
app/controllers/site_controller.rb
+++ b/
app/controllers/site_controller.rb
@@
-1,9
+1,11
@@
class SiteController < ApplicationController
class SiteController < ApplicationController
- layout 'hc'
- model :user, :election, :account
+ layout 'frontpage'
+ require_dependency "user"
+ require_dependency "election"
+ require_dependency "account"
def index
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
+18,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
Benjamin Mako Hill
||
Want to submit a patch?