merged in from code from the other master

[selectricity] / config / routes.rb

diff --git a/config/routes.rb b/config/routes.rb
index 8c52ca077ad23e90fea7493117831242c2b55d9f..8ff6992d906468ba45e6c5bfea0afceeae3573e6 100644 (file)
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -27,7 +27,11 @@ ActionController::Routing::Routes.draw do |map|
                    :controller => 'voter',
                    :action => 'index'
 
                    :controller => 'voter',
                    :action => 'index'
 

-  map.connect 'quickvote/:action/(open.)?:id',
+  map.kiosk_ready 'voter/kiosk_ready/:urlpassword',
+                  :controller => 'voter',
+                  :action => 'kiosk_ready'
+
+  map.connect 'quickvote/:action/:id',

                :controller => 'quickvote',
                :requirements => { :action => /(create|add_candidate|sort_candidates|my_quickvotes)/ }
 
                :controller => 'quickvote',
                :requirements => { :action => /(create|add_candidate|sort_candidates|my_quickvotes)/ }