scinote-eln/scinote-web
1
1
Fork 0
mirror of https://github.com/scinote-eln/scinote-web.git synced 2025-02-05 14:41:53 +08:00
Code Issues Projects Releases Packages Wiki Activity

fix merge conflict problem with avatar on profile page

Browse source
This commit is contained in:
Mojca Lorber 2016-11-03 15:23:09 +01:00
parent dec08c47cf
commit a234c4c9d9
1 changed files with 1 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
app/views/users/registrations/edit.html.erb
View file

@ -31,18 +31,6 @@
</a>
</div>
</div>
<% end %>
<%= form_for(resource, as: resource_name, url: registration_path(resource_name), html: { method: :put, "data-for" => "avatar" }) do |f| %>
<%= hidden_field_tag "user[change_avatar]", "true" %>
<div data-part="view">
<div class="form-group">
<%= f.label t("users.registrations.edit.avatar_label") %><br />
<% @user_avatar_url ||= avatar_path(current_user, :thumb) %>
<%= image_tag @user_avatar_url %><br /><br />
<a href="#" class="btn btn-default" data-action="edit"><%=t "users.registrations.edit.avatar_btn" %></a>
</div>
</div>
<div data-part="edit" style="display: none;">
<div class="well">
<h4><%=t "users.registrations.edit.avatar_title" %></h4>
@ -187,7 +175,7 @@
</div>
</div>
<% end %>
</div>
<div class="col-md-7 col-md-offset-1">
<h2><%=t "users.statistics.title" %></h2>