Merge branch 'master' into openstreetbugs

[rails.git] / config / routes.rb

diff --git a/config/routes.rb b/config/routes.rb
index 62c263f0d45c4fd1dd97e8c8ec0c8fdd003b9dde..fb4fcd426a6b952b00657d4f35dbd49053c73ce8 100644 (file)
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -104,6 +104,7 @@ OpenStreetMap::Application.routes.draw do
   match '/user/:display_name/edits' => 'changeset#list'
   match '/user/:display_name/edits/feed' => 'changeset#feed', :format => :atom
   match '/browse/friends' => 'changeset#list', :friends => true
+  match '/browse/nearby' => 'changeset#list', :nearby => true
   match '/browse/changesets' => 'changeset#list'
   match '/browse/changesets/feed' => 'changeset#feed', :format => :atom
   match '/browse/note/:id' => 'browse#note', :id => /\d+/
@@ -111,10 +112,10 @@ OpenStreetMap::Application.routes.draw do
   match '/browse' => 'changeset#list'
 
   # web site
-  match '/' => 'site#index'
+  root :to => 'site#index'
   match '/edit' => 'site#edit'
-  match '/copyright' => 'site#copyright'
   match '/copyright/:copyright_locale' => 'site#copyright'
+  match '/copyright' => 'site#copyright'
   match '/history' => 'changeset#list'
   match '/history/feed' => 'changeset#feed', :format => :atom
   match '/export' => 'site#export'
@@ -173,9 +174,13 @@ OpenStreetMap::Application.routes.draw do
 
   # diary pages
   match '/diary/new' => 'diary_entry#new'
+  match '/diary/friends' => 'diary_entry#list', :friends => true
+  match '/diary/nearby' => 'diary_entry#list', :nearby => true  
   match '/user/:display_name/diary/rss' => 'diary_entry#rss', :format => :rss
   match '/diary/:language/rss' => 'diary_entry#rss', :format => :rss
   match '/diary/rss' => 'diary_entry#rss', :format => :rss
+  match '/user/:display_name/diary/comments/:page' => 'diary_entry#comments', :page => /\d+/
+  match '/user/:display_name/diary/comments/' => 'diary_entry#comments'
   match '/user/:display_name/diary' => 'diary_entry#list'
   match '/diary/:language' => 'diary_entry#list'
   match '/diary' => 'diary_entry#list'