X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/48183e2d53d41bcdf32153e64dcea968f3d90ae3..7862c89a92a33077cea66c92c58214ba7bcf84ba:/app/views/user/account.rhtml
diff --git a/app/views/user/account.rhtml b/app/views/user/account.rhtml
index f969203a3..15a8f6827 100644
--- a/app/views/user/account.rhtml
+++ b/app/views/user/account.rhtml
@@ -1,184 +1,53 @@
-
User details
+<%= t 'user.account.my settings' %>
<%= error_messages_for 'user' %>
-<%= start_form_tag :controller => 'user', :action => 'edit', :display_name => @user.display_name %>
-
- Email | <%= @user.email %> |
- Mapper since | <%= @user.creation_time %> (<%= time_ago_in_words(@user.creation_time) %> ago) |
- Display Name | <%= text_field :user, :display_name, :value => @user.display_name %> |
- class="nohome" <%end%> >Your home | You have not entered your home location.Latitude: <%= text_field :user, :home_lat, :value => @user.home_lat, :size => 20, :id => "home_lat" %> Longitude <%= text_field :user, :home_lon, :value => @user.home_lon, :size => 20, :id => "home_lon" %> |
- Description | <%= text_area :user, :description, :value => @user.description, :class => "editDescription" %> |
-
-<%= submit_tag 'Save Changes' %>
-<%= end_form_tag %>
-
-<% nearest_str = "" %>
-<% if @user.home_lat and @user.home_lon %>
- Users in your area
-
- <% if @user.nearby.empty? %>
- There are no users who admit to mapping in your area. Better go out and spread the word about OSM!
- <% else %>
-
- These users are mapping in your area:
-
-
- Email |
- Name |
- Contact |
-
- <% @user.nearby(1,1).each do |nearby| %>
- <% nearest_str = "nearest.push( { 'display_name' : '#{nearby.display_name}', 'home_lat' : #{nearby.home_lat}, 'home_lon' : #{nearby.home_lon} } )" %>
-
-
- <%= nearby.email %> |
- <%= nearby.display_name %> |
- <%= link_to 'send message', :controller => 'message', :action => 'new', :display_name => nearby.display_name %> |
-
- <%end%>
-
-
- <%end%>
-
-<% end %>
-
-
-
-
-
-
Click on the map to (re)set your location
-
-
-<% if @user.home_lat and @user.home_lon %>
- <% marker = true %>
- <% mlon = @user.home_lon %>
- <% mlat = @user.home_lat %>
- <% lon = @user.home_lon %>
- <% lat = @user.home_lat %>
- <% zoom = '12' %>
-
+<% form_for :user, @user do |f| %>
+