cst1/openstreetmap-website
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge remote-tracking branch 'upstream/pull/3257'

Browse source
This commit is contained in:
Tom Hughes 2021-07-21 19:24:31 +01:00
commit f1935b1c57
20 changed files with 380 additions and 181 deletions
Download patch file Download diff file Expand all files Collapse all files

51
app/views/users/account.html.erb
View file

@ -58,57 +58,6 @@
</span>
</div>
<%= f.select :preferred_editor, [[t("editor.default", :name => t("editor.#{Settings.default_editor}.name")), "default"]] + Editors::AVAILABLE_EDITORS.collect { |e| [t("editor.#{e}.description"), e] } %>
<%= f.richtext_field :description, :cols => 80, :rows => 20 %>
<%= f.text_field :languages %>
<fieldset class="form-group">
<%= f.label t(".image") %>
<div class="form-row">
<div class="col-sm-2">
<%= user_image current_user %>
</div>
<div class="col-sm-10">
<% if current_user.avatar.attached? %>
<%= f.radio_button "avatar_action", "keep", :name => "avatar_action", :label => t(".keep image"), :checked => !current_user.image_use_gravatar %>
<% end %>
<% if current_user.avatar.attached? || current_user.image_use_gravatar? %>
<%= f.radio_button "avatar_action", "delete", :name => "avatar_action", :label => t(".delete image"), :checked => false %>
<% end %>
<% if current_user.avatar.attached? %>
<%= f.form_group :help => t(".image size hint"), :class => "mb-0" do %>
<%= f.radio_button "avatar_action", "new", :name => "avatar_action", :label => t(".replace image"), :checked => false %>
<%= f.file_field :avatar, :hide_label => true, :wrapper => { :class => "mb-0" } %>
<% end %>
<% else %>
<%= f.form_group :help => t(".image size hint"), :class => "mb-0" do %>
<%= f.radio_button "avatar_action", "new", :name => "avatar_action", :label => t(".new image"), :checked => false %>
<%= f.file_field :avatar, :hide_label => true, :wrapper => { :class => "mb-0" } %>
<% end %>
<% end %>
<%= f.form_group :help => link_to(t(".gravatar.what_is_gravatar"), t(".gravatar.link")) do %>
<%= f.radio_button "avatar_action", "gravatar", :name => "avatar_action", :label => t(".gravatar.gravatar"), :checked => current_user.image_use_gravatar %>
<% end %>
</div>
</div>
</fieldset>
<fieldset>
<legend><%= t ".home location" -%></legend>
<div id="homerow" <% unless current_user.home_lat and current_user.home_lon %> class="nohome"<% end %>>
<p class="message text-muted"><%= t ".no home location" %></p>
<div class="form-row">
<%= f.text_field :home_lat, :wrapper_class => "col-sm-4", :id => "home_lat" %>
<%= f.text_field :home_lon, :wrapper_class => "col-sm-4", :id => "home_lon" %>
</div>
</div>
<div class="form-check">
<input class="form-check-input" type="checkbox" name="updatehome" value="1" <% unless current_user.home_lat and current_user.home_lon %> checked="checked" <% end %> id="updatehome" />
<label class="form-check-label" for="updatehome"><%= t ".update home location on click" %></label>
</div>
<%= tag.div "", :id => "map", :class => "content_map set_location" %>
</fieldset>
<%= f.primary t(".save changes button") %>
<% end %>

6
app/views/users/show.html.erb
View file

@ -165,6 +165,12 @@
<div class="user-description richtext text-break"><%= @user.description.to_html %></div>
<% if current_user and @user.id == current_user.id %>
<div class="my-3">
<%= link_to t(".edit_profile"), edit_profile_path, :class => "btn btn-outline-primary" %>
</div>
<% end %>
</div>
<% if current_user and current_user.administrator? -%>