- 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 '/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 '/trace/create', :controller => 'trace', :action => 'create'
+ map.connect '/trace/:id/data', :controller => 'trace', :action => 'data'
+ map.connect '/trace/:id/data.:format', :controller => 'trace', :action => 'data'
+ map.connect '/trace/:id/edit', :controller => 'trace', :action => 'edit'
+ map.connect '/trace/:id/delete', :controller => 'trace', :action => 'delete'
+ map.connect '/user/:display_name/traces', :controller => 'trace', :action => 'list'
+ map.connect '/user/:display_name/traces/page/:page', :controller => 'trace', :action => 'list'
+ map.connect '/user/:display_name/traces/rss', :controller => 'trace', :action => 'georss'
+ map.connect '/user/:display_name/traces/tag/:tag', :controller => 'trace', :action => 'list'
+ map.connect '/user/:display_name/traces/tag/:tag/page/:page', :controller => 'trace', :action => 'list'
+ map.connect '/user/:display_name/traces/tag/:tag/rss', :controller => 'trace', :action => 'georss'
+ map.connect '/user/:display_name/traces/:id', :controller => 'trace', :action => 'view'
+ map.connect '/user/:display_name/traces/:id/picture', :controller => 'trace', :action => 'picture'
+ map.connect '/user/:display_name/traces/:id/icon', :controller => 'trace', :action => 'icon'
+
+ # user pages
+ map.connect '/user/:display_name', :controller => 'user', :action => 'view'
+ map.connect '/user/:display_name/edits', :controller => 'changeset', :action => 'list'
+ map.connect '/user/:display_name/edits/feed', :controller => 'changeset', :action => 'list', :format =>:atom
+ map.connect '/user/:display_name/make_friend', :controller => 'user', :action => 'make_friend'
+ map.connect '/user/:display_name/remove_friend', :controller => 'user', :action => 'remove_friend'
+ map.connect '/user/:display_name/diary', :controller => 'diary_entry', :action => 'list'
+ map.connect '/user/:display_name/diary/:id', :controller => 'diary_entry', :action => 'view', :id => /\d+/
+ map.connect '/user/:display_name/diary/:id/newcomment', :controller => 'diary_entry', :action => 'comment', :id => /\d+/
+ map.connect '/user/:display_name/diary/rss', :controller => 'diary_entry', :action => 'rss'
+ map.connect '/user/:display_name/diary/:id/edit', :controller => 'diary_entry', :action => 'edit', :id => /\d+/
+ map.connect '/user/:display_name/diary/:id/hide', :controller => 'diary_entry', :action => 'hide', :id => /\d+/
+ map.connect '/user/:display_name/diary/:id/hidecomment/:comment', :controller => 'diary_entry', :action => 'hidecomment', :id => /\d+/, :comment => /\d+/
+ map.connect '/user/:display_name/account', :controller => 'user', :action => 'account'
+ map.connect '/user/:display_name/activate', :controller => 'user', :action => 'activate'
+ map.connect '/user/:display_name/deactivate', :controller => 'user', :action => 'deactivate'
+ map.connect '/user/:display_name/confirm', :controller => 'user', :action => 'confirm'
+ map.connect '/user/:display_name/hide', :controller => 'user', :action => 'hide'
+ map.connect '/user/:display_name/unhide', :controller => 'user', :action => 'unhide'
+ map.connect '/user/:display_name/delete', :controller => 'user', :action => 'delete'
+ map.connect '/diary/new', :controller => 'diary_entry', :action => 'new'
+ map.connect '/diary', :controller => 'diary_entry', :action => 'list'
+ map.connect '/diary/rss', :controller => 'diary_entry', :action => 'rss'
+ map.connect '/diary/:language', :controller => 'diary_entry', :action => 'list'
+ map.connect '/diary/:language/rss', :controller => 'diary_entry', :action => 'rss'