Merge routes change

[selectricity] / config / routes.rb

diff --git a/config/routes.rb b/config/routes.rb
index 96beafd4dde7af51ba160cde5e02fff5794c7dd0..cce54e96e432cecbaf9710877ebddf5ce49090ad 100644 (file)
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -11,11 +11,12 @@ 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',
   map.connect 'quickvote/:action/:id',
                :controller => 'quickvote',

-               :requirements => { :action => /(create|add_candidate|sort_candidates)/ }
+               :requirements => { :action => /(create|add_candidate|sort_candidates|my_quickvotes)/ }

 
   map.quickaction 'quickvote/:ident/:action',
                   :controller => 'quickvote',
 
   map.quickaction 'quickvote/:ident/:action',
                   :controller => 'quickvote',