merged changed in from devel to activate voting in full elections

also, fixed some typos in the merged code

diff --cc app/views/voter/full_vote.rhtml
index cfc20e3c0e40fbfd05cd935dec9238638ddfc906,5534090db12f11b5c38311dfb838e9854f98a92e..9d4f1d0675042eae322e577a5421c015e07f2941
--- 1/app/views/voter/full_vote.rhtml
--- 2/app/views/voter/full_vote.rhtml
+++ b/app/views/voter/full_vote.rhtml
@@@ -1,10 -1,41 +1,41 @@@
- <% %>
+ <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>Election:</strong> <%= @voter.election.name %></p>
- <p><strong>Voter:</strong> <%= @voter.email %></p>
  <p><strong>Description:</strong></p>
- <blockquote><%= @voter.election.description %></blockquote>
+ <p><%= @voter.election.description %></p>
  
- <%= render :partial => 'sortable_vote' %>
+ <div class="normal-header">
+   <span class="header">Current Voter</span>
+   <span class="subheader"></span>
+ </div>
  
- <%= button_to "Submit Vote", :action => 'review', :id => @voter.password %>
+ <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 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>
+ 
+ <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>

diff --cc app/views/voter/thanks.rhtml
index ab8992cd47345bf73a1c0ebc082b32d996a6ece5,b19cb04e694bdab2a0ae88b3e2d9e110fc6d1822..883b4fa78bc08ddd9b873c8b1710ebff5b8eaf5c
--- 1/app/views/voter/thanks.rhtml
--- 2/app/views/voter/thanks.rhtml
+++ b/app/views/voter/thanks.rhtml
@@@ -4,6 -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>