From: Date: Thu, 12 Oct 2006 14:22:00 +0000 (-0400) Subject: rebranded from votingbooth to hyperchad X-Git-Url: https://projects.mako.cc/source/selectricity/commitdiff_plain/607f3a343ea400e558cc47a7c6dc508f9bafcfd2?hp=50b1cf56bf89fb9bb510481918d3c9d53a4bbad5 rebranded from votingbooth to hyperchad --- diff --git a/app/controllers/election_controller.rb b/app/controllers/election_controller.rb index 7e8273e..7145d3d 100644 --- a/app/controllers/election_controller.rb +++ b/app/controllers/election_controller.rb @@ -1,6 +1,6 @@ class ElectionController < ApplicationController model :raw_voter_list, :voter, :vote, :candidate - layout 'vb' + layout 'hc' before_filter :login_required diff --git a/app/controllers/quickvote_controller.rb b/app/controllers/quickvote_controller.rb index 9ae1748..c16755a 100644 --- a/app/controllers/quickvote_controller.rb +++ b/app/controllers/quickvote_controller.rb @@ -1,5 +1,5 @@ class QuickvoteController < ApplicationController - layout 'vb' + layout 'hc' model :quick_voter model :vote model :election diff --git a/app/controllers/site_controller.rb b/app/controllers/site_controller.rb index 41eb136..daa74f8 100644 --- a/app/controllers/site_controller.rb +++ b/app/controllers/site_controller.rb @@ -1,5 +1,5 @@ class SiteController < ApplicationController - layout 'vb' + layout 'hc' model :user, :election def index diff --git a/app/controllers/user_controller.rb b/app/controllers/user_controller.rb index 25f827c..a674be1 100644 --- a/app/controllers/user_controller.rb +++ b/app/controllers/user_controller.rb @@ -1,5 +1,5 @@ class UserController < ApplicationController - layout 'vb' + layout 'hc' def home redirect_to :controller => 'site', :action => 'index' diff --git a/app/controllers/voter_controller.rb b/app/controllers/voter_controller.rb index 1b00b8b..0e03a52 100644 --- a/app/controllers/voter_controller.rb +++ b/app/controllers/voter_controller.rb @@ -1,5 +1,5 @@ class VoterController < ApplicationController - layout 'vb' + layout 'hc' model :voter model :vote model :election diff --git a/app/views/layouts/vb.rhtml b/app/views/layouts/hc.rhtml similarity index 91% rename from app/views/layouts/vb.rhtml rename to app/views/layouts/hc.rhtml index 71003b5..4daac12 100644 --- a/app/views/layouts/vb.rhtml +++ b/app/views/layouts/hc.rhtml @@ -2,7 +2,7 @@ <%= @page_title || "HyperChad" %> - <%= stylesheet_link_tag "vb", :media => "all" %> + <%= stylesheet_link_tag "hc", :media => "all" %> <% #engine_stylesheet 'login_engine' %> <%= javascript_include_tag "prototype", "effects", "dragdrop", "controls" %> @@ -42,7 +42,7 @@ diff --git a/app/views/voter_notify/votestart.rhtml b/app/views/voter_notify/votestart.rhtml index c2730bf..c2918da 100644 --- a/app/views/voter_notify/votestart.rhtml +++ b/app/views/voter_notify/votestart.rhtml @@ -1,13 +1,13 @@ Voter! -This is an automated message sent by votingbooth.mako.cc. +This is an automated message sent by hyperchad.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 votingboth.mako.cc: +need to use the following token to log in to hyperchad.media.mit.edu: <%= @voter.password %> Alternatively, you can just click this URL: @@ -20,10 +20,10 @@ in error, you should contact: Alternatively, if you feel there is a technical error, please contact: - help@votingbooth.mako.cc - (VotingBooth Tech Support) + help@hyperchad.media.mit.edu + (HyperChad Tech Support) Thanks and happy voting! -VotingBooth Staff +HyperChad Staff diff --git a/config/environment.rb b/config/environment.rb index 9eb4d57..66e5c62 100644 --- a/config/environment.rb +++ b/config/environment.rb @@ -50,7 +50,7 @@ end # inflect.uncountable %w( fish sheep ) # end -MAIL_CONFIG = { :from => 'VotingBooth '} +MAIL_CONFIG = { :from => 'HyperChad '} # Include your application configuration below require 'uniq_token' diff --git a/public/stylesheets/vb.css b/public/stylesheets/hc.css similarity index 100% rename from public/stylesheets/vb.css rename to public/stylesheets/hc.css