merged in changes from devel

[selectricity-live] / app / views / voter_notify / votestart.rhtml

diff --git a/app/views/voter_notify/votestart.rhtml b/app/views/voter_notify/votestart.rhtml
index b844ee23477a9b05e16cbf5db8daf460ae95ebbf..216ddebf15b1df71b0b6a9b3ab838afa6d428a67 100644 (file)
--- a/app/views/voter_notify/votestart.rhtml
+++ b/app/views/voter_notify/votestart.rhtml
@@ -11,12 +11,12 @@ need to use the following token to log in to selectricity.media.mit.edu:
   <%= @voter.password %>
 
 Alternatively, you can just click this URL:
-  <%= url_for :controller => 'election', :action => 'show', :id => @voter.election.id %>
+  http://selectricity.media.mit.edu<%= url_for :controller => 'election', :action => 'show', :id => @voter.election %>
 
-If you have any questions or if you feel you have recieved this message
+If you have any questions or if you feel you have received this message
 in error, you should contact:
 
-  <%= @voter.election.user.name %> <<%= @voter.election.user.email %>>
+  <%= @voter.election.user.login %> <<%= @voter.election.user.email %>>
   (The initiator of this election)
 
 Alternatively, if you feel there is a technical error, please contact: