Merge from head

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

diff --git a/app/views/voter/_vote.rhtml b/app/views/voter/_vote.rhtml
old mode 100755 (executable)
new mode 100644 (file)
index dc240af..914077c
--- a/app/views/voter/_vote.rhtml
+++ b/app/views/voter/_vote.rhtml
@@ -11,13 +11,8 @@
 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') %>
-<% else %>
-  <%= form_tag :action => 'review', :id => @voter.password %>
-<% end %>
-
+<%= form_tag :action => 'review', :id => @voter.password %>
 <%= text_field :vote, :votestring -%>
 <%= submit_tag "Vote!" %>
-<%= end_form_tag %>
+