Merge from devel

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

diff --git a/app/views/voter/full_vote.rhtml b/app/views/voter/full_vote.rhtml
index 599308f795d30830327d9dfbf4a787e42023d344..cfc20e3c0e40fbfd05cd935dec9238638ddfc906 100644 (file)
--- a/app/views/voter/full_vote.rhtml
+++ b/app/views/voter/full_vote.rhtml
@@ -1,5 +1,10 @@
 <% %>
 
-<%= render_partial 'vote' %>
+<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>
 
+<%= render :partial => 'sortable_vote' %>
 
+<%= button_to "Submit Vote", :action => 'review', :id => @voter.password %>