Merged from jdong; lots of escaping fixes

[selectricity] / config / routes.rb

diff --git a/config/routes.rb b/config/routes.rb
index 0b6d80a1740d11abc8c19e2f71fdfe483707aa76..96beafd4dde7af51ba160cde5e02fff5794c7dd0 100644 (file)
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -1,19 +1,42 @@
-ActionController::Routing::Routes.draw do |map|
-  # Add your own custom routes here.
+ActionController::Routing::Routes.draw do |map|  

   # The priority is based upon order of creation: first created -> highest priority.
   
   # The priority is based upon order of creation: first created -> highest priority.
   

-  # Here's a sample route:
+  # Sample of regular route:

   # map.connect 'products/:id', :controller => 'catalog', :action => 'view'
   # Keep in mind you can assign values other than :controller and :action
 
   # map.connect 'products/:id', :controller => 'catalog', :action => 'view'
   # Keep in mind you can assign values other than :controller and :action
 

+  # Sample of named route:
+  # map.purchase 'products/:id/purchase', :controller => 'catalog', :action => 'purchase'
+  # This route can be invoked with purchase_url(:id => product.id)
+

   # 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 => "welcome"
+  map.connect '', :controller => "site", :action => "index"
+ 
+  map.connect 'quickvote/:action/:id',
+               :controller => 'quickvote',
+               :requirements => { :action => /(create|add_candidate|sort_candidates)/ }
+
+  map.quickaction 'quickvote/:ident/:action',
+                  :controller => 'quickvote',
+                       :requirements => { :action => /(change|confirm|results)/ }
+
+  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'
 
 
   # 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.
   # Install the default route as the lowest priority.

+  map.connect ':controller/:action/:id.:format'

   map.connect ':controller/:action/:id'
 end
   map.connect ':controller/:action/:id'
 end