merged in changes from live version

[selectricity] / app / controllers / front_controller.rb

diff --git a/app/controllers/front_controller.rb b/app/controllers/front_controller.rb
index 4e36ad4fd60a0288bbff7f724440d0bccf2762c9..4bcbd0a8cf37a4689618f0b6fb0b18c29a9700e0 100644 (file)
--- a/app/controllers/front_controller.rb
+++ b/app/controllers/front_controller.rb
@@ -1,3 +1,21 @@
+# 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: you can redistribute it and/or modify
+# it under the terms of the GNU Affero General Public License as
+# published by the Free Software Foundation, either version 3 of the
+# License, or (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful, but
+# WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+# Affero General Public License for more details.
+#
+# You should have received a copy of the GNU Affero General Public
+# License along with this program.  If not, see
+# <http://www.gnu.org/licenses/>.
+
 class FrontController < ApplicationController
   layout 'frontpage'
   require_dependency "user"
@@ -5,7 +23,7 @@ class FrontController < ApplicationController
   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?