projects / selectricity-live / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 50b1cf5)
rebranded from votingbooth to hyperchad
author<mako@atdot.cc> <>
Thu, 12 Oct 2006 14:22:00 +0000 (10:22 -0400)
committer<mako@atdot.cc> <>
Thu, 12 Oct 2006 14:22:00 +0000 (10:22 -0400)
app/controllers/election_controller.rb patch | blob | history
app/controllers/quickvote_controller.rb patch | blob | history
app/controllers/site_controller.rb patch | blob | history
app/controllers/user_controller.rb patch | blob | history
app/controllers/voter_controller.rb patch | blob | history
app/views/layouts/hc.rhtml [moved from app/views/layouts/vb.rhtml with 91% similarity] patch | blob | history
app/views/voter_notify/votestart.rhtml patch | blob | history
config/environment.rb patch | blob | history
public/stylesheets/hc.css [moved from public/stylesheets/vb.css with 100% similarity] patch | blob | history

diff --git a/app/controllers/election_controller.rb b/app/controllers/election_controller.rb
index 7e8273efcf5048ed4874eef2b90edd41a1e50364..7145d3d20c3ce4198fcb9d5d88bbc1747967e0fe 100644 (file)
--- 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
 class ElectionController < ApplicationController
   model :raw_voter_list, :voter, :vote, :candidate
-  layout 'vb'
+  layout 'hc'
 
   before_filter :login_required
 
 
   before_filter :login_required
 
diff --git a/app/controllers/quickvote_controller.rb b/app/controllers/quickvote_controller.rb
index 9ae174800bc2ae2506bc0a5bbb6871a725732832..c16755a0a8636da9d8598f2bc65edc9afa004a6e 100644 (file)
--- a/app/controllers/quickvote_controller.rb
+++ b/app/controllers/quickvote_controller.rb
@@ -1,5 +1,5 @@
 class QuickvoteController < ApplicationController
 class QuickvoteController < ApplicationController
-  layout 'vb'
+  layout 'hc'
   model :quick_voter
   model :vote
   model :election
   model :quick_voter
   model :vote
   model :election
diff --git a/app/controllers/site_controller.rb b/app/controllers/site_controller.rb
index 41eb136a3758256cd066c32cb885ba2259aed2eb..daa74f8cb866feaa7050999a026896d93457b79f 100644 (file)
--- a/app/controllers/site_controller.rb
+++ b/app/controllers/site_controller.rb
@@ -1,5 +1,5 @@
 class SiteController < ApplicationController
 class SiteController < ApplicationController
-  layout 'vb'
+  layout 'hc'
   model :user, :election
 
   def index
   model :user, :election
 
   def index
diff --git a/app/controllers/user_controller.rb b/app/controllers/user_controller.rb
index 25f827c07072c051c3635622451ea7ac0a4316bf..a674be1d170beb01648a80f3277093f8a4a1c3a8 100644 (file)
--- a/app/controllers/user_controller.rb
+++ b/app/controllers/user_controller.rb
@@ -1,5 +1,5 @@
 class UserController < ApplicationController
 class UserController < ApplicationController
-  layout 'vb'
+  layout 'hc'
 
   def home
     redirect_to :controller => 'site', :action => 'index'
 
   def home
     redirect_to :controller => 'site', :action => 'index'
diff --git a/app/controllers/voter_controller.rb b/app/controllers/voter_controller.rb
index 1b00b8b00b664ac46d6e9f15303fecf282c38189..0e03a5213300d02edd0b7c0b2ab99afefc916307 100644 (file)
--- a/app/controllers/voter_controller.rb
+++ b/app/controllers/voter_controller.rb
@@ -1,5 +1,5 @@
 class VoterController < ApplicationController
 class VoterController < ApplicationController
-  layout 'vb'
+  layout 'hc'
   model :voter
   model :vote
   model :election
   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 71003b502d2927ca8b3e7696487bd3afbafec576..4daac12ab792e52a52f5edf5b9d3980f5760484c 100644 (file)
--- a/app/views/layouts/vb.rhtml
+++ b/app/views/layouts/hc.rhtml
@@ -2,7 +2,7 @@
 <html>
     <head>
         <title><%= @page_title || "HyperChad" %></title>
 <html>
     <head>
         <title><%= @page_title || "HyperChad" %></title>
-        <%= stylesheet_link_tag "vb", :media => "all" %>
+        <%= stylesheet_link_tag "hc", :media => "all" %>
         <% #engine_stylesheet 'login_engine' %>
  
         <%= javascript_include_tag "prototype", "effects", "dragdrop", "controls" %>
         <% #engine_stylesheet 'login_engine' %>
  
         <%= javascript_include_tag "prototype", "effects", "dragdrop", "controls" %>
@@ -42,7 +42,7 @@
 
         <div id="footer">
           <hr />
 
         <div id="footer">
           <hr />
-         Copyleft 2006 |
+         <%= link_to "Copyleft", "http://mako.cc/projects/hyperchad" %> 2006 |
          <%= link_to "MIT Media Lab", "http://www.media.mit.edu" %> and
          <a href="http://mako.cc">Benjamin Mako Hill</a>
        </div>
          <%= link_to "MIT Media Lab", "http://www.media.mit.edu" %> and
          <a href="http://mako.cc">Benjamin Mako Hill</a>
        </div>
diff --git a/app/views/voter_notify/votestart.rhtml b/app/views/voter_notify/votestart.rhtml
index c2730bf08d83de9f6de1c5be725b2aa78c971e6b..c2918da3c11ad5fcdd2839761971bd4f06d60ef9 100644 (file)
--- a/app/views/voter_notify/votestart.rhtml
+++ b/app/views/voter_notify/votestart.rhtml
@@ -1,13 +1,13 @@
 Voter!
 
 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
 
 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:
   <%= @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:
 
 
 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!
 
 Thanks and happy voting!
-VotingBooth Staff
+HyperChad Staff
   
   
   
   
diff --git a/config/environment.rb b/config/environment.rb
index 9eb4d577520bf0a0b9e88f03194f77398807d4ab..66e5c62f960f2bd1e11a4211fcd8a0ebb1151555 100644 (file)
--- a/config/environment.rb
+++ b/config/environment.rb
@@ -50,7 +50,7 @@ end
 #   inflect.uncountable %w( fish sheep )
 # end
 
 #   inflect.uncountable %w( fish sheep )
 # end
 
-MAIL_CONFIG = { :from => 'VotingBooth <info@votingbooth.mako.cc>'} 
+MAIL_CONFIG = { :from => 'HyperChad <info@hyperchad.media.mit.edu>'} 
 
 # Include your application configuration below
 require 'uniq_token'
 
 # Include your application configuration below
 require 'uniq_token'
Voting machinery for the masses!

Benjamin Mako Hill || Want to submit a patch?