merged in changes from live version

[selectricity-live] / app / views / voter / review.rhtml

diff --git a/app/views/voter/review.rhtml b/app/views/voter/review.rhtml
index d9ecf19cdd427d9583103665a56d2d458d13f48d..b831aef225471db68e2181fd2c1b8a670bc202a5 100644 (file)
--- a/app/views/voter/review.rhtml
+++ b/app/views/voter/review.rhtml
@@ -24,13 +24,13 @@ preferred to least preferred:</p>
 <p>Please select from one of the following pages.</p>
 
 <div style="text-align: center;">
-  <p><%= button_to 'Confirm This Vote', :action => 'confirm', :id => @voter.password %></p>
+  <p><%= button_to 'Confirm This Vote', :action => 'confirm', :id => @password %></p>
 
   <p>If you choose, you will be able to go back<br />and change it up until
-  the end of hte voting period.</p>
-
+  the end of the voting period.</p>
+  
   <p><%= button_to 'Discard This Vote', votepassword_url(
-                   :action => 'index', :urlpassword => @voter.password) %></p>
+                   :action => 'index', :urlpassword => @password) %></p>
 
   <p>You will be returned to the voting page to vote<br /> again, if you choose.</p>