X-Git-Url: https://projects.mako.cc/source/selectricity/blobdiff_plain/d207da8dfc3f315f7758d1f5307c700ce4c25156..0f9228bed08f8f5e472b27a46ce05de27afd880b:/app/controllers/election_controller.rb

diff --git a/app/controllers/election_controller.rb b/app/controllers/election_controller.rb
index 7e8273e..3a43c8e 100644
--- a/app/controllers/election_controller.rb
+++ b/app/controllers/election_controller.rb
@@ -1,6 +1,6 @@
 class ElectionController < ApplicationController
   model :raw_voter_list, :voter, :vote, :candidate
-  layout 'vb'
+  layout 'hc'
 
   before_filter :login_required
 
@@ -52,11 +52,12 @@ class ElectionController < ApplicationController
     @election = Election.find(params[:id])
     
     @election.voters.each do |voter|
-      email = VoterNotify.create_votestart(voter)
-      render(:text => "<pre>" + email.encoded + "</pre>")
+      email = VoterNotify.deliver_votestart(voter)
+      #render(:text => "<pre>" + email.encoded + "</pre>")
     end
 
-    #@election.activate!
+    @election.activate!
+    redirect_to :action => 'show', :id => @election.id
   end
 
   # methods fod display, adding, deleting, and manipulating candidate
@@ -213,7 +214,10 @@ class ElectionController < ApplicationController
       @raw_voter_list.email = incoming_voters.email
     end
 
-    def email_voter
+    def email_voter(email=nil)
+      if email
+        
+      end
     end
 
 end