Merge branch 'master' of git://gitorious.org/~ruinar/selectricity/ruinar-selectricity

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

diff --git a/app/views/voter/_vote_sidebar.rhtml b/app/views/voter/_vote_sidebar.rhtml
index 2f250e077e536b65c6f7dbdc25ee1554f6cee276..58b1e56c9c34bdab70ceea90cb2d1bee6bd23b03 100644 (file)
--- a/app/views/voter/_vote_sidebar.rhtml
+++ b/app/views/voter/_vote_sidebar.rhtml
@@ -6,5 +6,9 @@ order.</p>
 <%= render :partial => 'common/sortable_vote' %>
 
 <div style="margin-left: 30pt;">
-<%= button_to "Submit Vote", :action => 'review', :id => @password %>
+<% if @voter.election.kiosk and params[:kiosk] == "true" %>
+  <%= button_to "Submit Vote", :action => 'review', :id => @password, :kiosk => true %>
+<% else %>
+  <%= button_to "Submit Vote", :action => 'review', :id => @password %>
+<% end %>
 </div>