diary / user bits

[rails.git] / config / routes.rb

diff --git a/config/routes.rb b/config/routes.rb
index b34948a6c770ad2417ad5b062829b5a403f04db6..8bfc36388086e2f84c3099864e53f4ae9dbd9c21 100644 (file)
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -30,7 +30,7 @@ ActionController::Routing::Routes.draw do |map|
   map.connect '/', :controller => 'site', :action => 'index'
   map.connect '/index.html', :controller => 'site', :action => 'index'
   map.connect '/edit.html', :controller => 'site', :action => 'edit'
-  map.connect '/search.html', :controller => 'site', :action => 'search'
+  map.connect '/search.html', :controller => 'way_tag', :action => 'search'
   map.connect '/login.html', :controller => 'user', :action => 'login'
   map.connect '/logout.html', :controller => 'user', :action => 'logout'
   map.connect '/create-account.html', :controller => 'user', :action => 'new'
@@ -44,18 +44,26 @@ ActionController::Routing::Routes.draw do |map|
   map.connect '/traces/mine/tag/:tag', :controller => 'trace', :action => 'mine'
   map.connect '/traces/mine/tag/:tag/page/:page', :controller => 'trace', :action => 'mine'
   map.connect '/traces/rss', :controller => 'trace', :action => 'georss'
-  map.connect '/traces/user/:display_name/', :controller => 'trace', :action => 'list', :id => nil\r
-  map.connect '/traces/user/:display_name/page/:page', :controller => 'trace', :action => 'list', :id => nil\r
-  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 '/user/:display_name/traces', :controller => 'trace', :action => 'list', :id => nil
+  map.connect '/user/:display_name/traces/page/:page', :controller => 'trace', :action => 'list', :id => nil
+  map.connect '/user/:display_name/traces/:id', :controller => 'trace', :action => 'view', :id => nil
+  map.connect '/user/:display_name/traces/:id/picture', :controller => 'trace', :action => 'picture', :id => nil
+  map.connect '/user/:display_name/traces/:id/icon', :controller => 'trace', :action => 'icon', :id => nil
   map.connect '/traces/tag/:tag', :controller => 'trace', :action => 'list', :id => nil
-  map.connect '/traces/tag/:tag/page/:page', :controller => 'trace', :action => 'list', :id => nil\r
+  map.connect '/traces/tag/:tag/page/:page', :controller => 'trace', :action => 'list', :id => nil
+
+  # user pages
+  
+  map.connect '/user/:display_name', :controller => 'user', :action => 'view'
+  map.connect '/user/:display_name/diary', :controller => 'diary', :action => 'view'
+  map.connect '/user/:display_name/edit', :controller => 'user', :action => 'edit'
+  map.connect '/user/:display_name/account', :controller => 'user', :action => 'account'
 
   # test pages
   map.connect '/test/populate/:table/:from/:count', :controller => 'test', :action => 'populate'
   map.connect '/test/populate/:table/:count', :controller => 'test', :action => 'populate', :from => 1
 
   # fall through
-  map.connect ':controller/:action/:id'
+  map.connect ':controller/:id/:action'
+  map.connect ':controller/:action'
 end