<% %>
-<% if @voter.election.quickvote? %>
- <h1>QuickVote: <em><%= @voter.election.name %></em></h1>
- <p><strong>Description:</strong></p>
- <blockquote><%= @voter.election.description %></blockquote>
-<% else %>
- <p><strong>Election:</strong> <%= @voter.election.name %></p>
- <p><strong>Voter:</strong> <%= @voter.email %></p>
- <p><strong>Description:</strong></p>
- <blockquote><%= @voter.election.description %></blockquote>
-<% end %>
-
-<p><strong>Candidates:</strong></p>
+<p><strong>Candidates or choices:</strong></p>
<ol>
<% for candidate in @voter.election.candidates.sort %>
- <li><%= candidate.name %></li>
+ <li><%= candidate.name.capitalize %></li>
<% end %>
</ol>
-<hr />
-
-<h2>Place Your Vote Here</h2>
-
-<p>Rank each candidate in order of more preferred to least
-preferred. (e.g., 123 or 321 or 213, etc.)</p>
+<p>In the box below, list each choice in order of most preferred to
+least preferred. Please list <em>all</em> choices in every vote.
+<em>(For example, 123 or 321 or 213, etc.)</em></p>
<% if @voter.election.quickvote? %>
- <%= form_tag quickconfirm_url( :votename => @voter.election.name ) %>
+ <% form_tag(quickaction_url( :ident => @voter.election.name, :action => 'confirm')) do %>
<% else %>
<%= form_tag :action => 'review', :id => @voter.password %>
<% end %>
<%= text_field :vote, :votestring -%>
-<%= submit_tag "Submit!" %>
-<%= end_form_tag %>
+<%= submit_tag "Vote!" %>
+<% end %>