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/commitdiff_plain/c35eb01007440d21ded1ec10e56406108fe44294 merged changed in from devel to activate voting in full elections also, fixed some typos in the merged code --- c35eb01007440d21ded1ec10e56406108fe44294 diff --cc app/views/voter/full_vote.rhtml index cfc20e3,5534090..9d4f1d0 --- a/app/views/voter/full_vote.rhtml +++ b/app/views/voter/full_vote.rhtml @@@ -1,10 -1,41 +1,41 @@@ - <% %> +
- Vote Recorded - ++ Vote ++ <%= @voter.election.name %> +
-

Election: <%= @voter.election.name %>

-

Voter: <%= @voter.email %>

Description:

-
<%= @voter.election.description %>
+

<%= @voter.election.description %>

- <%= render :partial => 'sortable_vote' %> +
+ Current Voter + +
- <%= button_to "Submit Vote", :action => 'review', :id => @voter.password %> +

<%= @voter.email %>

+ +
+ Instructions + +
+ -

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.

+ +
+ Candidate List + +
+ + <% @voter.election.candidates.each do |candidate| %> + <% @current_candidate = candidate %> + +
+

<%=h @current_candidate.name -%>

+
+ <%=h (@current_candidate.description) %> +
+
+ <% end %> + diff --cc app/views/voter/thanks.rhtml index ab8992c,b19cb04..883b4fa --- a/app/views/voter/thanks.rhtml +++ b/app/views/voter/thanks.rhtml @@@ -4,6 -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.