merge from live

[selectricity-live] / config / routes.rb

diff --git a/config/routes.rb b/config/routes.rb
index f763da980f30581afe26449b168263812e239a0b..8c52ca077ad23e90fea7493117831242c2b55d9f 100644 (file)
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -15,8 +15,19 @@ ActionController::Routing::Routes.draw do |map|
 
   map.connect '/sitealizer/:action', :controller => 'sitealizer' 
 
 
   map.connect '/sitealizer/:action', :controller => 'sitealizer' 
 

+  map.connect 'voter/:action',
+              :controller => 'voter',
+              :requirements => { :action => /(review|confirm|authenticate|index|login|reminder|results)/ }

 
 

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