]> projects.mako.cc - selectricity-live/commitdiff
projects / selectricity-live / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (from parent 1: c65b1e1)
Renamed CSS and layout to move from the old name (HC) to the new name
author<mako@atdot.cc> <>
Wed, 8 Aug 2007 14:51:56 +0000 (10:51 -0400)
committer<mako@atdot.cc> <>
Wed, 8 Aug 2007 14:51:56 +0000 (10:51 -0400)
(Selectricity).

app/controllers/account_controller.rb patch | blob | history
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/main.rhtml [moved from app/views/layouts/hc.rhtml with 84% similarity] patch | blob | history
public/selectricity-anywhere.html patch | blob | history
public/stylesheets/main.css [moved from public/stylesheets/hc.css with 100% similarity] patch | blob | history

diff --git a/app/controllers/account_controller.rb b/app/controllers/account_controller.rb
index 031368b84327d7a1f5d397362686462b0f974859..bb614dec3cc0d93f0aef84d82f0bc4c37c4d0f06 100644 (file)
--- a/app/controllers/account_controller.rb
+++ b/app/controllers/account_controller.rb
@@ -1,5 +1,5 @@
 class AccountController < ApplicationController
 class AccountController < ApplicationController
-  layout 'hc'
+  layout 'main'
   
   # Be sure to include AuthenticationSystem in Application Controller instead
   include AuthenticatedSystem
   
   # 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 a418c49337682a523fc418d9a450395ddb0c1289..e950153e7eae013345c1c79670c1bd18a68ced4b 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 'hc'
+  layout 'main'
 
   #before_filter :login_required
 
 
   #before_filter :login_required
 
diff --git a/app/controllers/quickvote_controller.rb b/app/controllers/quickvote_controller.rb
index 5482a25c99f3d46d12149a4c84ab02725c622f1b..c7e52d6b12fc5d9040629bd183069cc9b157b8ff 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 'hc'
+  layout 'main'
   model :quick_voter
   model :quick_vote
   model :vote
   model :quick_voter
   model :quick_vote
   model :vote
diff --git a/app/controllers/site_controller.rb b/app/controllers/site_controller.rb
index e26a3688997dd1ff67b4b817b44a345ddc8d4cfa..e86624e5f9f985772fc9a9a0f22eb8b8b419fe6d 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 'hc'
+  layout 'main'
   model :user, :election, :account
 
   def index
   model :user, :election, :account
 
   def index
diff --git a/app/controllers/user_controller.rb b/app/controllers/user_controller.rb
index a674be1d170beb01648a80f3277093f8a4a1c3a8..11cf095f032b8ef997088b0a400efeb9de3a4551 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 'hc'
+  layout 'main'
 
   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 0e03a5213300d02edd0b7c0b2ab99afefc916307..779e83f15aa8bc6eb8862fc0420e34685d241112 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 'hc'
+  layout 'main'
   model :voter
   model :vote
   model :election
   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 c04eb87b058656a5bbd00ff1b173deefd302215a..0b9d5cb9d5f2a18494ff4392da386561273525e2 100644 (file)
--- a/app/views/layouts/hc.rhtml
+++ b/app/views/layouts/main.rhtml
@@ -2,7 +2,7 @@
 <html>
     <head>
         <title><%= @page_title || "Selectricity" %></title>
 <html>
     <head>
         <title><%= @page_title || "Selectricity" %></title>
-        <%= stylesheet_link_tag "hc", :media => "all" %>
+        <%= stylesheet_link_tag "main", :media => "all" %>
  
         <%= javascript_include_tag "prototype", "effects", "dragdrop", "controls" %>
     </head>
  
         <%= javascript_include_tag "prototype", "effects", "dragdrop", "controls" %>
     </head>
@@ -29,7 +29,6 @@
              <% end %>
              
             <%= link_to("Help/About", :controller => "site", :action => "about") %>
              <% end %>
              
             <%= link_to("Help/About", :controller => "site", :action => "about") %>
-            <%= link_to( "Home", :controller => 'site', :action => 'index' )%>
            </div>
         </div>
         
            </div>
         </div>
         
@@ -43,10 +42,10 @@
 
         <div id="footer">
           <hr />
 
         <div id="footer">
           <hr />
-         <%= link_to "Copyleft", "http://mako.cc/projects/selectricity"
-         %> 2006, 2007 |
-         <%= link_to "MIT Media Lab", "http://www.media.mit.edu" %> and
-         <a href="http://mako.cc">Benjamin Mako Hill</a>
+         <%= link_to "Copyleft", "http://code.selectricity.org/"
+         %> 2006, 2007 || 
+         <%= link_to "MIT Media Lab", "http://www.media.mit.edu" %> and the
+         <a href="http://code.selectricity.org/team">Selectricity Team</a>
        </div>
 
     </body>
        </div>
 
     </body>
diff --git a/public/selectricity-anywhere.html b/public/selectricity-anywhere.html
index 10e36e47691d16fb4fc891f4dab7d3951ea43333..ffc32b14742acde71c9e1f2383670832552893f9 100644 (file)
--- a/public/selectricity-anywhere.html
+++ b/public/selectricity-anywhere.html
@@ -1,5 +1,5 @@
 <html>
 <html>
-   <link rel="stylesheet" type="text/css" href="stylesheets/hc.css" />
+   <link rel="stylesheet" type="text/css" href="stylesheets/main.css" />
    <div id="top">
   <h3>Selectricity Anywhere<br />
   <font size="-1">Voting Machinery for the <em>Mobile</em> Masses</font></h3>
    <div id="top">
   <h3>Selectricity Anywhere<br />
   <font size="-1">Voting Machinery for the <em>Mobile</em> Masses</font></h3>
Voting machinery for the masses!

Benjamin Mako Hill || Want to submit a patch?