X-Git-Url: https://git.openstreetmap.org/rails.git/blobdiff_plain/d70fd8ab1a07d842603b820d8ce7d0e5be9f976d..d9d515bf18e85f02c0d11571e298586a90003d77:/app/views/user/account.html.erb diff --git a/app/views/user/account.html.erb b/app/views/user/account.html.erb index 0da8b2530..80c8c0e49 100644 --- a/app/views/user/account.html.erb +++ b/app/views/user/account.html.erb @@ -1,4 +1,8 @@
<%= t 'user.account.profile description' %> | -<%= f.text_area :description, :rows => '5', :cols => '60' %> | +<%= richtext_area :user, :description, :rows => '15', :cols => '80' %> | |||||
- <% if @user.image.nil? %>
- <%= hidden_field_tag "image_action", "new" %>
- <%= t 'user.account.new image' %> <%= file_column_field "user", "image" %> <%= t 'user.account.image size hint' %> - <% else %> + <% if @user.image.file? %>
<%= f.file_field :image %> <%= t 'user.account.image size hint' %> <% end %> |
<%= t 'user.account.update home location on click' %> checked="checked" <% end %> id="updatehome" /> - + <% content_for :head do %> + <%= javascript_include_tag "user" %> + <% end %> + <% + home = @user.home_lat && @user.home_lon + data = { + :lon => @user.home_lon || 0, + :lat => @user.home_lat || 20, + :zoom => home ? 12 : 1, + :marker => !!home + } + %> + <%= content_tag "div", "", :id => "map", :class => "user_map set_location", :data => data %> |
@@ -124,16 +140,9 @@