From: <mako@atdot.cc>
Date: Thu, 31 Jan 2008 02:06:07 +0000 (-0500)
Subject: merged changed in from devel to activate voting in full elections
X-Git-Url: https://projects.mako.cc/source/selectricity-live/commitdiff_plain/c35eb01007440d21ded1ec10e56406108fe44294?hp=5901217a8893619fbdb02d540c08390f92eae368

merged changed in from devel to activate voting in full elections

also, fixed some typos in the merged code
---

diff --git a/app/views/voter/full_vote.rhtml b/app/views/voter/full_vote.rhtml
index 5534090..9d4f1d0 100644
--- a/app/views/voter/full_vote.rhtml
+++ b/app/views/voter/full_vote.rhtml
@@ -1,6 +1,6 @@
 <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>
@@ -18,7 +18,7 @@
   <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>
diff --git a/app/views/voter/thanks.rhtml b/app/views/voter/thanks.rhtml
index b19cb04..883b4fa 100644
--- a/app/views/voter/thanks.rhtml
+++ b/app/views/voter/thanks.rhtml
@@ -8,6 +8,8 @@
 
 <p>Your unique token for this vote is: <strong><%= @voter.vote.token %></strong></p>
 
-<p>Please record this token for your records and keep it secret. You
-will be able to use this token to verify that your vote was used in the
-election and that your vote was recorded correctly.</p>
+<p>Please record this token for your records and keep it secret. This is
+<strong>not</strong> the same token that you recieved in email. At the
+end of the election, you will be able to use this token to verify that
+your vote was used in the election and that your vote was recorded
+correctly.</p>