scinote-eln/scinote-web
1
1
Fork 0
mirror of https://github.com/scinote-eln/scinote-web.git synced 2025-01-01 21:21:50 +08:00
Code Issues Projects Releases Packages Wiki Activity

Merge branch 'mlorb-ml_sci_610'

Browse source
This commit is contained in:
Mojca Lorber 2016-11-02 14:08:05 +01:00
commit dec08c47cf
3 changed files with 59 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

32
app/assets/stylesheets/themes/scinote.scss
View file

@ -1464,3 +1464,35 @@ html.turbolinks-progress-bar::before {
display: inline; display: inline;
} }
} }
//edit avatar
.avatar-container {
background-color: lighten($color-concrete, 2%);
height: 100px;
position: relative;
width: 100px;
}
.avatar-container:hover .avatar-edit {
display: block;
}
.avatar-image {
left: 50%;
position: absolute;
top: 50%;
transform: translate(-50%, -50%);
}
.avatar-edit {
display: none;
margin-top: 70%;
opacity: .8;
position: absolute;
z-index: 10;
.btn-greyed {
border-radius: 0;
width: 100px;
}
}

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

@ -5,9 +5,32 @@
<h2><%=t "users.registrations.edit.title" %></h2> <h2><%=t "users.registrations.edit.title" %></h2>
<% if not resource.errors.empty? %> <% if not resource.errors.empty? %>
<div class="alert alert-danger"> <div class="alert alert-danger">
<%= devise_error_messages! %> <%= devise_error_messages! %>
</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) %>
<a href="#" data-action="edit">
<div class="avatar-container">
<div class="avatar-image">
<%= image_tag @user_avatar_url %>
</div>
<div class="avatar-edit">
<div class="btn btn-greyed btn-sm">
<span class="glyphicon glyphicon-pencil"></span>
<%=t "users.registrations.edit.avatar_btn" %>
</div>
</div>
</div>
</a>
</div>
</div>
<% end %> <% end %>
<%= form_for(resource, as: resource_name, url: registration_path(resource_name), html: { method: :put, "data-for" => "avatar" }) do |f| %> <%= form_for(resource, as: resource_name, url: registration_path(resource_name), html: { method: :put, "data-for" => "avatar" }) do |f| %>

2
config/locales/en.yml
View file

@ -1095,7 +1095,7 @@ en:
head_title: "My profile" head_title: "My profile"
title: "My profile" title: "My profile"
avatar_label: "Avatar" avatar_label: "Avatar"
avatar_btn: "Change avatar" avatar_btn: "Edit avatar"
avatar_title: "Change avatar" avatar_title: "Change avatar"
avatar_edit_label: "Upload new avatar file" avatar_edit_label: "Upload new avatar file"
avatar_submit: "Upload" avatar_submit: "Upload"