X-Git-Url: https://projects.mako.cc/source/selectricity-live/blobdiff_plain/37ccb3a5511504b6b58c3fe70135e016d0a61bfd..6a935d078f20d2b1b0d60f0a30c41a642d40758a:/app/controllers/election_controller.rb

diff --git a/app/controllers/election_controller.rb b/app/controllers/election_controller.rb
index 1affe0f..5949f56 100644
--- a/app/controllers/election_controller.rb
+++ b/app/controllers/election_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 ElectionController < ApplicationController
   require_dependency "raw_voter_list"
   require_dependency "voter"
@@ -5,8 +23,6 @@ class ElectionController < ApplicationController
   require_dependency "candidate"
   layout 'main'
 
-  #before_filter :login_required
-
   ## methods for displaying, creating,
   ## and manipulating election overview data
   ####################################################################
@@ -45,6 +61,9 @@ class ElectionController < ApplicationController
   end
 
   def show
+    @sidebar_content = render_to_string :partial => 'progress',
+                                        :locals => { :page => 'review' }
+
     @election = Election.find(params[:id])
   end
 
@@ -96,34 +115,6 @@ class ElectionController < ApplicationController
     candidate.destroy
   end
 
-  def lessinfo_candidate
-    @show_details = false
-    @current_candidate = Candidate.find( params[:id] )
-    render :partial => 'candidate_line'
-  end
-
-  def moreinfo_candidate
-    @show_details = true
-    @current_candidate = Candidate.find( params[:id] )
-    render :partial => 'candidate_line'
-  end
-
-  def edit_candidate
-    @candidate = Candidate.find( params[:id] )
-    @election = @candidate.election
-  end
-
-  def update_candidate
-    @candidate = Candidate.find(params[:id])
-    @election = @candidate.election
-
-    if @candidate.update_attributes(params[:candidate])
-      redirect_to :action => 'edit_candidates', :id => @candidate.election.id
-    else
-      render :action => 'edit_candidate'
-    end
-  end
-
   def candidate_picture
     candidate = Candidate.find( params[:id] )
     send_data( candidate.picture.data,
@@ -136,10 +127,13 @@ class ElectionController < ApplicationController
   ## for a particular election
   ####################################################################
   def new_voters
-    edit_voters
+    redirect_to :action => 'edit_voters', :id => params[:id]
   end
   
   def edit_voters
+    @sidebar_content = render_to_string :partial => 'progress',
+                                        :locals => { :page => 'voters' }
+
     @election = Election.find( params[:id] )
     if params.has_key?( :raw_voter_list )
       process_incoming_voters( params[:raw_voter_list] )
@@ -152,14 +146,6 @@ class ElectionController < ApplicationController
     voter.destroy
   end
   
-  def remind_voter
-    voter_array= FullVoter.find(:all, :conditions => ["email = ?", params[:email]])
-    voter_array.delete_if {|voter| voter.election.active == 0}
-    unless voter_array.empty?
-      VoterNotify.deliver_reminder(voter_array)
-    end
-  end
-  
   ## methods for computing and printing results
   ####################################################################
   def results