Replace the file_column plugin with paperclip

[rails.git] / config / routes.rb

diff --git a/config/routes.rb b/config/routes.rb
index cd7261cdf81a68f1759a835e458eae21448a128f..71af08b73d46a81d7dfa19939aef5126d83e32b9 100644 (file)
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -86,15 +86,17 @@ OpenStreetMap::Application.routes.draw do
   match '/browse/changeset/:id' => 'browse#changeset', :as => :changeset, :id => /\d+/
   match '/user/:display_name/edits' => 'changeset#list'
   match '/user/:display_name/edits/feed' => 'changeset#feed', :format => :atom
   match '/browse/changeset/:id' => 'browse#changeset', :as => :changeset, :id => /\d+/
   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' => 'changeset#list'
 
   # web site
   match '/browse/changesets' => 'changeset#list'
   match '/browse/changesets/feed' => 'changeset#feed', :format => :atom
   match '/browse' => 'changeset#list'
 
   # web site

-  match '/' => 'site#index'
+  root :to => 'site#index'

   match '/edit' => 'site#edit'
   match '/edit' => 'site#edit'

-  match '/copyright' => 'site#copyright'

   match '/copyright/:copyright_locale' => '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'
   match '/history' => 'changeset#list'
   match '/history/feed' => 'changeset#feed', :format => :atom
   match '/export' => 'site#export'


@@ -123,7 +125,7 @@ OpenStreetMap::Application.routes.draw do
   match '/forgot-password.html' => 'user#lost_password'
 
   # permalink
   match '/forgot-password.html' => 'user#lost_password'
 
   # permalink

-  match '/go/:code' => 'site#permalink', :code => /[a-zA-Z0-9_@]+[=-]*/
+  match '/go/:code' => 'site#permalink', :code => /[a-zA-Z0-9_@~]+[=-]*/

 
   # traces
   match '/user/:display_name/traces/tag/:tag/page/:page' => 'trace#list'
 
   # traces
   match '/user/:display_name/traces/tag/:tag/page/:page' => 'trace#list'


@@ -153,6 +155,8 @@ OpenStreetMap::Application.routes.draw do
 
   # diary pages
   match '/diary/new' => 'diary_entry#new'
 
   # 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/rss' => 'diary_entry#rss', :format => :rss
   match '/diary/:language/rss' => 'diary_entry#rss', :format => :rss
   match '/diary/rss' => 'diary_entry#rss', :format => :rss