minor changes to clustering software

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

diff --git a/app/views/voter/_vote.rhtml b/app/views/voter/_vote.rhtml
index b9a2688c9c001d8b59f26a03051cd9cb7706c081..bd1040efc842dfa48b2d774753d3d7237abae46a 100644 (file)
--- a/app/views/voter/_vote.rhtml
+++ b/app/views/voter/_vote.rhtml
@@ -3,20 +3,16 @@
 <p><strong>Candidates or choices:</strong></p>
 <ol>
 <% for candidate in @voter.election.candidates.sort %>
 <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>
 
 <p>In the box below, list each choice in order of most preferred to
 <% end %>
 </ol>
 
 <p>In the box below, list each choice in order of most preferred to

-least preferred.  <em>(For example, 123 or 321 or 213, etc.)</em></p>
-
-<% if @voter.election.quickvote? %>
-  <%= form_tag quickaction_url( :votename => @voter.election.name, :action => 'confirm') %>
-<% else %>
-  <%= form_tag :action => 'review', :id => @voter.password %>
-<% end %>
+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 => @password %>

 <%= text_field :vote, :votestring -%>
 <%= submit_tag "Vote!" %>
 <%= text_field :vote, :votestring -%>
 <%= submit_tag "Vote!" %>

-<%= end_form_tag %>
+