fixed the layout on the account summary page

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

diff --git a/app/controllers/quickvote_controller.rb b/app/controllers/quickvote_controller.rb
index 768bdea261ba28000363e25e4da6d3c24b61e7e9..5bf89c775b18026810fa74b89bcea3fe5184ec0b 100644 (file)
--- a/app/controllers/quickvote_controller.rb
+++ b/app/controllers/quickvote_controller.rb
@@ -2,21 +2,11 @@
 # Copyright (C) 2007, 2008 Benjamin Mako Hill <mako@atdot.cc>
 # Copyright (C) 2007 Massachusetts Institute of Technology
 #
 # 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/>.
+# This program is free software. Please see the COPYING file for
+# details.

 
 class QuickvoteController < ApplicationController
 
 class QuickvoteController < ApplicationController

+  helper :sparklines

   layout 'main'
   require_dependency "quick_voter"
   require_dependency "quick_vote"
   layout 'main'
   require_dependency "quick_voter"
   require_dependency "quick_vote"


@@ -94,7 +84,7 @@ class QuickvoteController < ApplicationController
       end
     end
     flash.keep(:candidate_names)
       end
     end
     flash.keep(:candidate_names)

-    render_partial 'candidate_list'
+    render :partial => 'candidate_list'

   end
  
   #############################################################
   end
  
   #############################################################


@@ -163,9 +153,6 @@ class QuickvoteController < ApplicationController
       @voter.ipaddress = request.env["REMOTE_ADDR"]
       @voter.save
       
       @voter.ipaddress = request.env["REMOTE_ADDR"]
       @voter.save
       

-      # save the time the vote was made for statistical use
-      @voter.vote.time = Time.now
-      

       # toggle the confirmation bit      
       @voter.vote.confirm!
      
       # toggle the confirmation bit      
       @voter.vote.confirm!