diff options
| -rw-r--r-- | app/views/user/set_crop_profile_photo.rhtml | 2 | ||||
| -rw-r--r-- | app/views/user/set_draft_profile_photo.rhtml | 2 | ||||
| -rw-r--r-- | config/routes.rb | 11 |
3 files changed, 9 insertions, 6 deletions
diff --git a/app/views/user/set_crop_profile_photo.rhtml b/app/views/user/set_crop_profile_photo.rhtml index 503d1fbab..7390f78a6 100644 --- a/app/views/user/set_crop_profile_photo.rhtml +++ b/app/views/user/set_crop_profile_photo.rhtml @@ -9,7 +9,7 @@ <div id="set_crop_profile_photo"> -<% form_tag 'set_profile_photo', :id => 'set_crop_profile_photo_form', :multipart => true do %> +<% form_tag 'set_photo', :id => 'set_crop_profile_photo_form', :multipart => true do %> <table> <tr> diff --git a/app/views/user/set_draft_profile_photo.rhtml b/app/views/user/set_draft_profile_photo.rhtml index 16a729948..de8566651 100644 --- a/app/views/user/set_draft_profile_photo.rhtml +++ b/app/views/user/set_draft_profile_photo.rhtml @@ -8,7 +8,7 @@ <div id="set_draft_profile_photo"> -<% form_tag 'set_profile_photo', :id => 'set_draft_profile_photo_form', :multipart => true do %> +<% form_tag 'set_photo', :id => 'set_draft_profile_photo_form', :multipart => true do %> <p> <label class="form_label" for="file_1">Photo of you:</label> <%= file_field_tag :file, :size => 35, :id => 'file_1' %> diff --git a/config/routes.rb b/config/routes.rb index 1b9f01eb4..b5da135e7 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -58,14 +58,17 @@ ActionController::Routing::Routes.draw do |map| user.signout '/signout', :action => 'signout' user.signchangepassword '/signchangepassword', :action => 'signchangepassword' user.signchangeemail '/signchangeemail', :action => 'signchangeemail' + user.confirm '/c/:email_token', :action => 'confirm' user.show_user '/user/:url_name', :action => 'show' user.contact_user '/user/contact/:id', :action => 'contact' - user.river '/river', :action => 'river' - user.set_profile_photo '/set_profile_photo', :action => 'set_profile_photo' + + user.set_profile_photo '/profile/set_photo', :action => 'set_profile_photo' user.get_profile_photo '/user/:url_name/photo.png', :action => 'get_profile_photo' - user.get_draft_profile_photo '/draft_profile_photo/:id.png', :action => 'get_draft_profile_photo' - user.set_profile_about_me '/set_profile_about_me', :action => 'set_profile_about_me' + user.get_draft_profile_photo '/profile/draft_photo/:id.png', :action => 'get_draft_profile_photo' + user.set_profile_about_me '/profile/set_about_me', :action => 'set_profile_about_me' + + user.river '/river', :action => 'river' end map.with_options :controller => 'public_body' do |body| |