merged in changes from devel

[selectricity-live] / config / routes.rb

diff --git a/config/routes.rb b/config/routes.rb
index cce54e96e432cecbaf9710877ebddf5ce49090ad..f763da980f30581afe26449b168263812e239a0b 100644 (file)
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -11,9 +11,11 @@ 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 'index.html', :controller => "site", :action => "index"
-  map.connect '', :controller => "site", :action => "index"
+  map.connect '', :controller => "front"
+
   map.connect '/sitealizer/:action', :controller => 'sitealizer' 
+
+
   map.connect 'quickvote/:action/:id',
                :controller => 'quickvote',
                :requirements => { :action => /(create|add_candidate|sort_candidates|my_quickvotes)/ }