merge everything back from mainline branch

[selectricity] / app / controllers / front_controller.rb

diff --git a/app/controllers/front_controller.rb b/app/controllers/front_controller.rb
index 4e36ad4fd60a0288bbff7f724440d0bccf2762c9..f84d39672bad9b2cc37af05f264946e120a9c65a 100644 (file)
--- a/app/controllers/front_controller.rb
+++ b/app/controllers/front_controller.rb
@@ -1,3 +1,10 @@
+# Selectricity: Voting Machinery for the Masses
+# Copyright (C) 2007, 2008 Benjamin Mako Hill <mako@atdot.cc>
+# Copyright (C) 2007 Massachusetts Institute of Technology
+#
+# This program is free software. Please see the COPYING file for
+# details.
+

 class FrontController < ApplicationController
   layout 'frontpage'
   require_dependency "user"
 class FrontController < ApplicationController
   layout 'frontpage'
   require_dependency "user"


@@ -5,7 +12,7 @@ class FrontController < ApplicationController
   require_dependency "account"
 
   def index
   require_dependency "account"
 
   def index

-    @quickvotes = QuickVote.find(:all).sort {|a,b| a.enddate <=> b.enddate}[0..1]
+    @quickvotes = QuickVote.find(:all).sort {|a,b| b.startdate <=> a.startdate}[0..1]

     # if the person claims they are logged in
    
     if logged_in?
     # if the person claims they are logged in
    
     if logged_in?