innitial by tag / by user code

[rails.git] / config / routes.rb

diff --git a/config/routes.rb b/config/routes.rb
index c36984c11c437bf83cde1b347050e228290825f7..a8da5d59656e5a8d51139485417c5531378d67f6 100644 (file)
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -28,10 +28,18 @@ ActionController::Routing::Routes.draw do |map|
   map.connect '/logout.html', :controller => 'user', :action => 'logout'
   map.connect '/create-account.html', :controller => 'user', :action => 'new'
   map.connect '/forgot-password.html', :controller => 'user', :action => 'lost_password'
-  
+
+  # traces  
   map.connect '/traces', :controller => 'trace', :action => 'list'
+  map.connect '/traces/page/:page', :controller => 'trace', :action => 'list'
   map.connect '/traces/mine', :controller => 'trace', :action => 'mine'
-  map.connect '/traces/user/:user/:id', :controller => 'trace', :action => 'list', :id => nil
+  map.connect '/traces/rss', :controller => 'trace', :action => 'georss'
+  map.connect '/traces/user/:display_name/', :controller => 'trace', :action => 'list', :id => nil
+  map.connect '/traces/user/:display_name/:id', :controller => 'trace', :action => 'view', :id => nil
+  map.connect '/traces/user/:display_name/:id/picture', :controller => 'trace', :action => 'picture', :id => nil
+  map.connect '/traces/user/:display_name/:id/icon', :controller => 'trace', :action => 'icon', :id => nil
+  map.connect '/traces/tag/:tag/', :controller => 'trace', :action => 'list', :id => nil
 
+  # fall through
   map.connect ':controller/:action/:id'
 end