mergec minor changes from live

[selectricity-live] / config / routes.rb

diff --git a/config/routes.rb b/config/routes.rb
index 82474df671b63add51df0e59463c75874aaebf78..efd6a28e9fba914f696a9f78303ea6f3fc97ebc1 100644 (file)
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -11,8 +11,22 @@ 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 '', :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/:id',
                :controller => 'quickvote',
                :requirements => { :action => /(create|add_candidate|sort_candidates|my_quickvotes)/ }