X-Git-Url: https://projects.mako.cc/source/selectricity-live/blobdiff_plain/04f827dd4647f3a7d6e5bd8f5e9083c730a8dccc..5f51982916827b84d73bfa8f3a98a9ee1d48d3ce:/config/routes.rb

diff --git a/config/routes.rb b/config/routes.rb
index d1092a0..7a7b101 100644
--- 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:
@@ -13,22 +13,22 @@ ActionController::Routing::Routes.draw do |map|
   # -- just remember to delete public/index.html.
   map.connect '', :controller => "site"
  
-  map.connect 'quickvote/create',
-              :controller => 'quickvote',
-	      :action => 'create'
+  map.connect 'quickvote/:action/:id',
+               :controller => 'quickvote',
+               :requirements => { :action => /(create|add_candidate|sort_candidates)/ }
 
   map.quickaction 'quickvote/:votename/:action',
                   :controller => 'quickvote',
-	          :requirements => { :action => /(change|confirm|results)/ }
+	                :requirements => { :action => /(change|confirm|results)/ }
 
   map.quickvote 'quickvote/:votename',
-                :controller => 'quickvote',
-	        :action => 'index'
+                :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'
 
   # Install the default route as the lowest priority.
+  map.connect ':controller/:action/:id.:format'
   map.connect ':controller/:action/:id'
 end