Added a link to open elections off the election's 'show' page

[selectricity] / config / environment.rb

diff --git a/config/environment.rb b/config/environment.rb
index 82c746617b7da09e2ca108fe147f9e934ca55afd..32d313b2ed47ea9e358256050c62d6f38f1519cd 100644 (file)
--- a/config/environment.rb
+++ b/config/environment.rb
@@ -59,17 +59,17 @@ end
 
 # Include your application configuration below
 
-MAIL_CONFIG = { :from => 'Selectricity <info@selectricity.media.mit.edu>'} 
+MAIL_CONFIG = { :from => 'Selectricity <team@selectricity.org>'} 
 
 require 'uniq_token'
 require 'randarray'
 require 'gruff-0.2.8/lib/gruff'
 require 'sparklines'
 require 'rubyvote'
-ELECTION_TYPES = {'ssd' => "Schulze Sequential Dropping",
-                  'plurality' => "Plurality/First Past the Post",
-                  'approval' => "Approval (Top Two)",
-                  'condorcet' => "Simple Condorcet",
+ELECTION_TYPES = {'ssd' => "Schulze Method",
+                  'plurality' => "Plurality",
+                  'approval' => "Approval",
+                  'condorcet' => "Condorcet",
                   'borda' => "Borda Count"}
 
 class String