merged changed in from devel to activate voting in full elections

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

diff --git a/app/views/voter/full_vote.rhtml b/app/views/voter/full_vote.rhtml
index 599308f795d30830327d9dfbf4a787e42023d344..9d4f1d0675042eae322e577a5421c015e07f2941 100644 (file)
--- a/app/views/voter/full_vote.rhtml
+++ b/app/views/voter/full_vote.rhtml
@@ -1,5 +1,41 @@
-<% %>
+<div id="title-header">
+  <span class="header">Vote</span>
+  <span class="subheader"><%= @voter.election.name %></span>
+</div>
 
-<%= render_partial 'vote' %>
+<p><strong>Description:</strong></p>
+<p><%= @voter.election.description %></p>
 
+<div class="normal-header">
+  <span class="header">Current Voter</span>
+  <span class="subheader"></span>
+</div>
 
+<p><strong><%= @voter.email %></strong></p>
+
+<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>
+      <blockquote>
+      <%=h (@current_candidate.description) %>
+      </blockquote>
+  </div>
+    <% end %>
+</ul>