-<% %>
+<div id="title-header">
+ <span class="header">Review</span>
+ <span class="subheader"><%= @voter.election.name %></span>
+</div>
-<h1>Please review your vote carefully before confirming it.</h1>
+<p><strong>Your vote will not be recorded until you confirm it on this
+page.</strong> Please review your vote carefully before clicking
+confirm.</p>
<p>You have ranked the candidates in the following order (from most
preferred to least preferred:</p>
<ol>
- <% for rank in @vote.rankings.sort %>
- <li><%= rank.candidate.name %> </li>
+ <% for rank in @voter.vote.rankings.sort %>
+ <li><%=h rank.candidate.name.capitalize %> </li>
<% end %>
</ol>
-<table>
-<tr>
- <td valign="top"><%= button_to 'Confirm', :action => 'confirm', :id => @voter.password %></td>
- <td valign="top">Confirm this vote now. You will be able to go back and
- change it.</td>
-</tr>
+<div class="normal-header">
+ <span class="header">Confirm/Discard</span>
+ <span class="subheader"></span>
+</div>
-<tr>
- <td valign="top"><%= button_to 'Change', :action => 'index', :id => @voter.password %></td>
- <td valign="top">Go back to the voting page and vote again.</td>
-</tr>
+<p>Please select from one of the following pages.</p>
-<tr>
- <td valign="top"><%= button_to 'Discard', :action => 'discard' %></td>
- <td valign="top">Discard this tentative vote and log out.</td>
-</tr>
+<div style="text-align: center;">
+ <p><% if @voter.election.kiosk? and params[:kiosk] == 'true' %>
+ <%= button_to 'Confirm This Vote', :action => 'confirm', :id => @password,
+ :kiosk => true %>
+ <% else %>
+ <%= button_to 'Confirm This Vote', :action => 'confirm', :id => @password %>
+ <% end %>
+ </p>
-</table>
+ <% unless @voter.election.kiosk? %>
+ <p>If you choose, you will be able to go back<br />and change it up until
+ the end of the voting period.</p>
+ <% end %>
+
+ <p><% if @voter.election.kiosk? and params[:kiosk] == 'true' %>
+ <%= button_to 'Discard This Vote',
+ votepassword_url(:action => 'index', :urlpassword => @password,
+ :kiosk => true) %>
+ <% else %>
+ <%= button_to 'Discard This Vote',
+ votepassword_url(:action => 'index', :urlpassword => @password) %>
+ <% end %>
+ </p>
+
+</tr>
+</div>