Remove deprecated start_form_tag and end_form_tags. Now you're supposed to do form_ta...

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

diff --git a/app/views/voter/_vote.rhtml b/app/views/voter/_vote.rhtml
index b9a2688c9c001d8b59f26a03051cd9cb7706c081..b95fc96209151e9c27ade5fce98d281fb940689c 100644 (file)
--- a/app/views/voter/_vote.rhtml
+++ b/app/views/voter/_vote.rhtml
@@ -3,20 +3,21 @@
 <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
-least preferred.  <em>(For example, 123 or 321 or 213, etc.)</em></p>
+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 quickaction_url( :votename => @voter.election.name, :action => 'confirm') %>
+  <% 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 "Vote!" %>
-<%= end_form_tag %>
+<% end %>