merged changed in from devel to activate voting in full elections

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

diff --git a/app/views/voter/full_vote.rhtml b/app/views/voter/full_vote.rhtml
index 5534090db12f11b5c38311dfb838e9854f98a92e..9d4f1d0675042eae322e577a5421c015e07f2941 100644 (file)
--- a/app/views/voter/full_vote.rhtml
+++ b/app/views/voter/full_vote.rhtml
@@ -1,6 +1,6 @@
 <div id="title-header">
 <div id="title-header">

-  <span class="header">Vote Recorded</span>
-  <span class="subheader"></span>
+  <span class="header">Vote</span>
+  <span class="subheader"><%= @voter.election.name %></span>

 </div>
 
 <p><strong>Description:</strong></p>
 </div>
 
 <p><strong>Description:</strong></p>


@@ -18,7 +18,7 @@
   <span class="subheader"></span>
 </div>
 
   <span class="subheader"></span>
 </div>
 

-<p>Drag and drop the items on <strong>list in the right column</strong>
+<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>
 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>