X-Git-Url: https://projects.mako.cc/source/selectricity-live/blobdiff_plain/7963fe06622ddbda89c0b6d6431339f26b9d6ecf..0283f11b7fec9fcfb81093f9458e759ee7f91707:/app/controllers/election_controller.rb

diff --git a/app/controllers/election_controller.rb b/app/controllers/election_controller.rb
index eff920f..acf47cc 100644
--- a/app/controllers/election_controller.rb
+++ b/app/controllers/election_controller.rb
@@ -5,8 +5,6 @@ class ElectionController < ApplicationController
   require_dependency "candidate"
   layout 'main'
 
-  #before_filter :login_required
-
   ## methods for displaying, creating,
   ## and manipulating election overview data
   ####################################################################
@@ -45,6 +43,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 +97,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 +109,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] )