From: 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 @@
- Vote Recorded - + Vote + <%= @voter.election.name %>

Description:

@@ -18,7 +18,7 @@ -

Drag and drop the items on list in the right column +

Drag and drop the items on list in the left column 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.

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 @@

Your unique token for this vote is: <%= @voter.vote.token %>

-

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.

+

Please record this token for your records and keep it secret. This is +not 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.