merge from live

[selectricity-live] / config / routes.rb

diff --git a/config/routes.rb b/config/routes.rb
index ee64eabaa4a50025e4a467d04ade5b11a782d1b9..8c52ca077ad23e90fea7493117831242c2b55d9f 100644 (file)
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -11,17 +11,31 @@ 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.
-  map.connect '', :controller => "site", :action => "index"
- 
-  map.connect 'quickvote/:action/:id',
+  map.connect '', :controller => "front"
+
+  map.connect '/sitealizer/:action', :controller => 'sitealizer' 
+
+  map.connect 'voter/:action',
+              :controller => 'voter',
+              :requirements => { :action => /(review|confirm|authenticate|index|login|reminder|results)/ }
+
+  map.voteopen 'voter/open.:election_id',
+                   :controller => 'voter',
+                   :action => 'index'
+
+  map.votepassword 'voter/:urlpassword',
+                   :controller => 'voter',
+                   :action => 'index'
+
+  map.connect 'quickvote/:action/(open.)?: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)/ }
 
-  map.quickvote 'quickvote/:votename',
+  map.quickvote 'quickvote/:ident',
                 :controller => 'quickvote', :action => 'index'
 
   # Allow downloading Web Service WSDL as a file with an extension