merged changes back from the production version

[selectricity] / config / routes.rb

diff --git a/config/routes.rb b/config/routes.rb
index af9820fdab90256d33fe6a0b7b17ed8ac4023b52..f763da980f30581afe26449b168263812e239a0b 100644 (file)
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -1,4 +1,4 @@
-ActionController::Routing::Routes.draw do |map|
+ActionController::Routing::Routes.draw do |map|  

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


@@ -11,24 +11,35 @@ 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 '', :controller => "front"

 
 

-  map.connect 'quickvote/create',
-             :controller => 'site',
-             :action => 'create_quickvote'
-             
-  map.quickconfirm 'quickvote/:votename/confirm',
-              :controller => 'voter',
-             :action => 'confirm'
+  map.connect '/sitealizer/:action', :controller => 'sitealizer' 

 
 

-  map.quickvote 'quickvote/:votename',
-                :controller => 'voter',
-               :action => 'quickvote'
+
+  map.connect 'quickvote/:action/:id',
+               :controller => 'quickvote',
+               :requirements => { :action => /(create|add_candidate|sort_candidates|my_quickvotes)/ }
+
+  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