X-Git-Url: https://git.openstreetmap.org/rails.git/blobdiff_plain/4769eec5aab27cdb0ae6ac1b7bb713da720feb93..bd5793f7a6eb8f2c49f08f7fd66bd35abd4a37c3:/config/routes.rb

diff --git a/config/routes.rb b/config/routes.rb
index 8f1dc9230..bc7f08b5b 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -45,8 +45,6 @@ ActionController::Routing::Routes.draw do |map|
   map.connect '/user/confirm', :controller => 'user', :action => 'confirm'
   map.connect '/user/go_public', :controller => 'user', :action => 'go_public'
   map.connect '/user/reset_password', :controller => 'user', :action => 'reset_password'
-  map.connect '/user/login/:next_controller/:next_action', :controller => 'user', :action => 'login'
-  map.connect '/user/logout/:next_controller/:next_action', :controller => 'user', :action => 'logout'
   map.connect '/index.html', :controller => 'site', :action => 'index'
   map.connect '/edit.html', :controller => 'site', :action => 'edit'
   map.connect '/search.html', :controller => 'way_tag', :action => 'search'
@@ -76,11 +74,14 @@ ActionController::Routing::Routes.draw do |map|
   map.connect '/user/:display_name/make_friend', :controller => 'user', :action => 'make_friend'
   map.connect '/user/:display_name', :controller => 'user', :action => 'view'
   map.connect '/user/:display_name/diary', :controller => 'user', :action => 'diary'
+  map.connect '/user/:display_name/diary/rss', :controller => 'user', :action => 'rss'
   map.connect '/user/:display_name/diary/newpost', :controller => 'diary_entry', :action => 'new'
-  map.connect '/user/:display_name/edit', :controller => 'user', :action => 'edit'
   map.connect '/user/:display_name/account', :controller => 'user', :action => 'account'
   map.connect '/user/:display_name/set_home', :controller => 'user', :action => 'set_home'
   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'
 
   # test pages
   map.connect '/test/populate/:table/:from/:count', :controller => 'test', :action => 'populate'
@@ -93,6 +94,7 @@ ActionController::Routing::Routes.draw do |map|
 
   # messages
 
+  map.connect '/user/:display_name/inbox', :controller => 'message', :action => 'inbox'
   map.connect '/message/new/:user_id', :controller => 'message', :action => 'new'
   map.connect '/message/read/:message_id', :controller => 'message', :action => 'read'
   map.connect '/message/mark/:message_id', :controller => 'message', :action => 'mark'