Merged jdong

[selectricity] / config / routes.rb

diff --git a/config/routes.rb b/config/routes.rb
index 735f5d7c92f2448bf9ba945c624652a0e0b6e67c..cce54e96e432cecbaf9710877ebddf5ce49090ad 100644 (file)
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -11,8 +11,9 @@ ActionController::Routing::Routes.draw do |map|
 
   # You can have the root of your site routed by hooking up '' 
   # -- just remember to delete public/index.html.
 
   # You can have the root of your site routed by hooking up '' 
   # -- just remember to delete public/index.html.

+  map.connect 'index.html', :controller => "site", :action => "index"

   map.connect '', :controller => "site", :action => "index"
   map.connect '', :controller => "site", :action => "index"

- 
+  map.connect '/sitealizer/:action', :controller => 'sitealizer' 

   map.connect 'quickvote/:action/:id',
                :controller => 'quickvote',
                :requirements => { :action => /(create|add_candidate|sort_candidates|my_quickvotes)/ }
   map.connect 'quickvote/:action/:id',
                :controller => 'quickvote',
                :requirements => { :action => /(create|add_candidate|sort_candidates|my_quickvotes)/ }