Merge from head

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

diff --git a/app/views/voter_notify/votestart.rhtml b/app/views/voter_notify/votestart.rhtml
old mode 100755 (executable)
new mode 100644 (file)
index ead6a43..216ddeb
--- a/app/views/voter_notify/votestart.rhtml
+++ b/app/views/voter_notify/votestart.rhtml
@@ -1,30 +1,30 @@
 Voter!
 
-This is an automated message sent by hyperchad.media.mit.edu.
+This is an automated message sent by selectricity.media.mit.edu.
 
 You have been listed as a voter in an upcoming election.
 
 The election title: <%= @voter.election.name %>
 
 To read more about the election, the candidates, and to vote, you will
-need to use the following token to log in to hyperchad.media.mit.edu:
+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:
 
-  help@hyperchad.media.mit.edu
-  (HyperChad Tech Support)
+  help@selectricity.media.mit.edu
+  (Selectricity Tech Support)
 
 Thanks and happy voting!
-HyperChad Staff
+Selectricity Staff