From b9f3bbdefb7bb1abd63193e2162aae1e78e1a1cb Mon Sep 17 00:00:00 2001 From: Date: Wed, 8 Aug 2007 10:51:56 -0400 Subject: [PATCH] Renamed CSS and layout to move from the old name (HC) to the new name (Selectricity). --- app/controllers/account_controller.rb | 2 +- app/controllers/election_controller.rb | 2 +- app/controllers/quickvote_controller.rb | 2 +- app/controllers/site_controller.rb | 2 +- app/controllers/user_controller.rb | 2 +- app/controllers/voter_controller.rb | 2 +- app/views/layouts/{hc.rhtml => main.rhtml} | 11 +++++------ public/selectricity-anywhere.html | 2 +- public/stylesheets/{hc.css => main.css} | 0 9 files changed, 12 insertions(+), 13 deletions(-) rename app/views/layouts/{hc.rhtml => main.rhtml} (84%) rename public/stylesheets/{hc.css => main.css} (100%) diff --git a/app/controllers/account_controller.rb b/app/controllers/account_controller.rb index 031368b..bb614de 100644 --- a/app/controllers/account_controller.rb +++ b/app/controllers/account_controller.rb @@ -1,5 +1,5 @@ class AccountController < ApplicationController - layout 'hc' + layout 'main' # Be sure to include AuthenticationSystem in Application Controller instead include AuthenticatedSystem diff --git a/app/controllers/election_controller.rb b/app/controllers/election_controller.rb index a418c49..e950153 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 'hc' + layout 'main' #before_filter :login_required diff --git a/app/controllers/quickvote_controller.rb b/app/controllers/quickvote_controller.rb index 5482a25..c7e52d6 100644 --- a/app/controllers/quickvote_controller.rb +++ b/app/controllers/quickvote_controller.rb @@ -1,5 +1,5 @@ class QuickvoteController < ApplicationController - layout 'hc' + layout 'main' model :quick_voter model :quick_vote model :vote diff --git a/app/controllers/site_controller.rb b/app/controllers/site_controller.rb index e26a368..e86624e 100644 --- a/app/controllers/site_controller.rb +++ b/app/controllers/site_controller.rb @@ -1,5 +1,5 @@ class SiteController < ApplicationController - layout 'hc' + layout 'main' model :user, :election, :account def index diff --git a/app/controllers/user_controller.rb b/app/controllers/user_controller.rb index a674be1..11cf095 100644 --- a/app/controllers/user_controller.rb +++ b/app/controllers/user_controller.rb @@ -1,5 +1,5 @@ class UserController < ApplicationController - layout 'hc' + layout 'main' def home redirect_to :controller => 'site', :action => 'index' diff --git a/app/controllers/voter_controller.rb b/app/controllers/voter_controller.rb index 0e03a52..779e83f 100644 --- a/app/controllers/voter_controller.rb +++ b/app/controllers/voter_controller.rb @@ -1,5 +1,5 @@ class VoterController < ApplicationController - layout 'hc' + layout 'main' model :voter model :vote model :election diff --git a/app/views/layouts/hc.rhtml b/app/views/layouts/main.rhtml similarity index 84% rename from app/views/layouts/hc.rhtml rename to app/views/layouts/main.rhtml index c04eb87..0b9d5cb 100644 --- a/app/views/layouts/hc.rhtml +++ b/app/views/layouts/main.rhtml @@ -2,7 +2,7 @@ <%= @page_title || "Selectricity" %> - <%= stylesheet_link_tag "hc", :media => "all" %> + <%= stylesheet_link_tag "main", :media => "all" %> <%= javascript_include_tag "prototype", "effects", "dragdrop", "controls" %> @@ -29,7 +29,6 @@ <% end %> <%= link_to("Help/About", :controller => "site", :action => "about") %> - <%= link_to( "Home", :controller => 'site', :action => 'index' )%> @@ -43,10 +42,10 @@ diff --git a/public/selectricity-anywhere.html b/public/selectricity-anywhere.html index 10e36e4..ffc32b1 100644 --- a/public/selectricity-anywhere.html +++ b/public/selectricity-anywhere.html @@ -1,5 +1,5 @@ - +

Selectricity Anywhere
Voting Machinery for the Mobile Masses

diff --git a/public/stylesheets/hc.css b/public/stylesheets/main.css similarity index 100% rename from public/stylesheets/hc.css rename to public/stylesheets/main.css -- 2.30.2