merged in changes from live version

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

diff --git a/app/views/voter/full_vote.rhtml b/app/views/voter/full_vote.rhtml
index e6ccb26d16f8e55a04cc7d7bc601150a5ebb07ab..5e8a8d1695669256b4a963212fd0eb6e0c1332dc 100644 (file)
--- a/app/views/voter/full_vote.rhtml
+++ b/app/views/voter/full_vote.rhtml
@@ -1,13 +1,39 @@
-<% %>
+<div id="title-header">
+  <span class="header">Vote</span>
+  <span class="subheader"><%= @voter.election.name %></span>
+</div>
 
-<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>
+<p><%= @voter.election.description %></p>
 
-<%= render :partial => 'vote' %>
+<div class="normal-header">
+  <span class="header">Current Voter</span>
+  <span class="subheader"></span>
+</div>
 
-<%= render :partial => 'sortable_vote' %>
+<p><strong><%= @voter.email %></strong></p>
 
-<%= button_to "Submit Vote", :action => 'review', :id => @voter.password %>
+<div class="normal-header">
+  <span class="header">Instructions</span>
+  <span class="subheader"></span>
+</div>
+
+<p>Drag and drop the items on <strong>list in the left column</strong>
+until they are in order from most preferred at the top to least
+preferred at the bottom. When you are done, press confirm to record your
+vote.</p>
+
+<div class="normal-header">
+  <span class="header">Candidate List</span>
+  <span class="subheader"></span>
+</div>
+
+<% @voter.election.candidates.each do |candidate| %>
+  <% @current_candidate = candidate %>
+  <div id="cand<%= @current_candidate.id %>">
+  <h3><%= h @current_candidate.name %></h3>
+  <%= render :partial => 'election/candidate_box_info' %>
+  </div>
+    <% end %>
+</ul>