Variety of small changes (mostly to properties) plus a few "in the

[selectricity-live] / config / routes.rb

diff --git a/config/routes.rb b/config/routes.rb
old mode 100644 (file)
new mode 100755 (executable)
index 0b6d80a..e400b5d
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -1,14 +1,29 @@
 ActionController::Routing::Routes.draw do |map|
-  # Add your own custom routes here.
   # 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
 
+  # 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.
-  # map.connect '', :controller => "welcome"
+  map.connect '', :controller => "site"
+ 
+  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)/ }
+
+  map.quickvote 'quickvote/:votename',
+                :controller => 'quickvote',
+               :action => 'index'
 
   # Allow downloading Web Service WSDL as a file with an extension
   # instead of a file named 'wsdl'