Merge routes change

[selectricity] / config / routes.rb

diff --git a/config/routes.rb b/config/routes.rb
index 7a7b1013c146c7564fec40abc96932d36bff9b53..cce54e96e432cecbaf9710877ebddf5ce49090ad 100644 (file)
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -11,23 +11,32 @@ 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 '', :controller => "site"
- 
+  map.connect 'index.html', :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/:votename/:action',
+  map.quickaction 'quickvote/:ident/:action',

                   :controller => 'quickvote',
                        :requirements => { :action => /(change|confirm|results)/ }
 
                   :controller => 'quickvote',
                        :requirements => { :action => /(change|confirm|results)/ }
 

-  map.quickvote 'quickvote/:votename',
+  map.quickvote 'quickvote/:ident',

                 :controller => 'quickvote', :action => 'index'
 
   # Allow downloading Web Service WSDL as a file with an extension
   # instead of a file named 'wsdl'
   map.connect ':controller/service.wsdl', :action => 'wsdl'
 
                 :controller => 'quickvote', :action => 'index'
 
   # Allow downloading Web Service WSDL as a file with an extension
   # instead of a file named 'wsdl'
   map.connect ':controller/service.wsdl', :action => 'wsdl'
 

+  # The following pertain to caching and accessing Gruff graphs
+  # To make caching easier, add a line like this to config/routes.rb:
+  # map.graph "graph/:action/:id/image.png", :controller => "graph"
+  #
+  # Then reference it with the named route:
+  #   image_tag graph_url(:action => 'show', :id => 42)
+  map.graph "graph/:action/:id/graph.png", :controller => "graph"
+  

   # Install the default route as the lowest priority.
   map.connect ':controller/:action/:id.:format'
   map.connect ':controller/:action/:id'
   # Install the default route as the lowest priority.
   map.connect ':controller/:action/:id.:format'
   map.connect ':controller/:action/:id'