various diary bits

[rails.git] / config / routes.rb

diff --git a/config/routes.rb b/config/routes.rb
index 039eea09fe841845efb045689cb6539330a927bb..ff42dbfa409a754eb0c1a421a22ab73c83df5f89 100644 (file)
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -33,7 +33,6 @@ ActionController::Routing::Routes.draw do |map|
   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 '/account', :controller => 'user', :action => 'account'
   map.connect '/create-account.html', :controller => 'user', :action => 'new'
   map.connect '/forgot-password.html', :controller => 'user', :action => 'lost_password'
 
@@ -56,7 +55,10 @@ ActionController::Routing::Routes.draw do |map|
   # 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/diary', :controller => 'user', :action => 'diary'
+  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'
 
   # test pages
   map.connect '/test/populate/:table/:from/:count', :controller => 'test', :action => 'populate'