Merged from jdong

[selectricity] / app / views / voter / _vote.rhtml

diff --git a/app/views/voter/_vote.rhtml b/app/views/voter/_vote.rhtml
index e74202104929f63f7acabe19b89e12714ea72465..914077ce1d50783317fdf7cb1616bb19083eb441 100644 (file)
--- a/app/views/voter/_vote.rhtml
+++ b/app/views/voter/_vote.rhtml
@@ -1,37 +1,18 @@
 <% %>
 
-<% 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>
-
-<% if @voter.election.quickvote? %>
-  <%= form_tag quickconfirm_url( :votename => @voter.election.name ) %>
-<% else %>
-  <%= form_tag :action => 'review', :id => @voter.password %>
-<% end %>
+<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>
 
+<%= form_tag :action => 'review', :id => @voter.password %>
 <%= text_field :vote, :votestring -%>
-<%= submit_tag "Submit!" %>
-<%= end_form_tag %>
+<%= submit_tag "Vote!" %>
+