mumuki-laboratory 9.19.0 → 9.20.0
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- checksums.yaml +4 -4
- data/app/assets/stylesheets/mumuki_laboratory/application/_layout.scss +0 -8
- data/app/assets/stylesheets/mumuki_laboratory/application/modules/_user_profile.scss +1 -9
- data/app/assets/stylesheets/mumuki_laboratory/application.scss +0 -1
- data/app/controllers/application_controller.rb +0 -1
- data/app/helpers/profile_helper.rb +1 -1
- data/app/views/users/_basic_profile_fields.html.erb +20 -16
- data/app/views/users/_edit_user_form.html.erb +9 -7
- data/lib/mumuki/laboratory/version.rb +1 -1
- metadata +2 -3
- data/app/assets/stylesheets/mumuki_laboratory/application/_alerts.scss +0 -3
checksums.yaml
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
---
|
|
2
2
|
SHA256:
|
|
3
|
-
metadata.gz:
|
|
4
|
-
data.tar.gz:
|
|
3
|
+
metadata.gz: de7e211f8a772b15e0018a75d15c69f1fd455bf4794362235e236c06bc125d06
|
|
4
|
+
data.tar.gz: 91b6b7564068e6fac29130c62639a17c277d0954fbf3900e07e947ae3cdc6da0
|
|
5
5
|
SHA512:
|
|
6
|
-
metadata.gz:
|
|
7
|
-
data.tar.gz:
|
|
6
|
+
metadata.gz: 63dc960e1d91bd05a534d8ded2bfb9cfd13801ee2d3dfcb44da781642bcfa626f0bf80c7df642216bb7915a1ff2f32515668c6bb81b7615221e23ae44a3cd627
|
|
7
|
+
data.tar.gz: 7011fe8f2abadae8c93ac60192c0caa200a475a229183c257ccd74c0818291c9ced49507a75fc15f092405d9c10d8cad269b6723be45eac41dc022a120c7bd6e
|
|
@@ -7,6 +7,7 @@
|
|
|
7
7
|
|
|
8
8
|
.mu-profile-actions {
|
|
9
9
|
margin-left: auto;
|
|
10
|
+
text-align: center;
|
|
10
11
|
|
|
11
12
|
.btn {
|
|
12
13
|
width: 150px;
|
|
@@ -18,15 +19,6 @@
|
|
|
18
19
|
border-color: lighten($mu-color-complementary, 15%);
|
|
19
20
|
}
|
|
20
21
|
}
|
|
21
|
-
|
|
22
|
-
&.mobile {
|
|
23
|
-
text-align: center;
|
|
24
|
-
margin: 20px 5px -20px -10px;
|
|
25
|
-
|
|
26
|
-
.btn {
|
|
27
|
-
width: calc(50% - 20px);
|
|
28
|
-
}
|
|
29
|
-
}
|
|
30
22
|
}
|
|
31
23
|
|
|
32
24
|
.mu-profile-info {
|
|
@@ -129,7 +129,6 @@ class ApplicationController < ActionController::Base
|
|
|
129
129
|
def validate_user_profile!
|
|
130
130
|
unless current_user.profile_completed?
|
|
131
131
|
save_location_before! :profile_completion
|
|
132
|
-
flash[:info] = I18n.t :please_fill_profile_data
|
|
133
132
|
redirect_to edit_user_path
|
|
134
133
|
end
|
|
135
134
|
end
|
|
@@ -4,7 +4,7 @@ module ProfileHelper
|
|
|
4
4
|
end
|
|
5
5
|
|
|
6
6
|
def cancel_edit_profile_button
|
|
7
|
-
link_to t(:cancel), :user, class: 'btn btn-
|
|
7
|
+
link_to t(:cancel), :user, class: 'btn btn-outline-complementary' if current_user.profile_completed?
|
|
8
8
|
end
|
|
9
9
|
|
|
10
10
|
def save_edit_profile_button(form)
|
|
@@ -1,19 +1,23 @@
|
|
|
1
|
-
<
|
|
2
|
-
<
|
|
3
|
-
|
|
4
|
-
|
|
5
|
-
|
|
6
|
-
<
|
|
7
|
-
|
|
8
|
-
|
|
9
|
-
|
|
10
|
-
|
|
11
|
-
|
|
12
|
-
|
|
13
|
-
<
|
|
14
|
-
|
|
15
|
-
|
|
16
|
-
|
|
1
|
+
<div class="row">
|
|
2
|
+
<fieldset class="col-lg-6">
|
|
3
|
+
<div><%= form.label(t :first_name) %></div>
|
|
4
|
+
<div><%= form.text_field :first_name, required: true, class: 'form-control' %></div>
|
|
5
|
+
</fieldset>
|
|
6
|
+
<fieldset class="col-lg-6">
|
|
7
|
+
<div><%= form.label(t :last_name) %></div>
|
|
8
|
+
<div><%= form.text_field :last_name, required: true, class: 'form-control' %></div>
|
|
9
|
+
</fieldset>
|
|
10
|
+
</div>
|
|
11
|
+
<div class="row">
|
|
12
|
+
<fieldset class="col-lg-4">
|
|
13
|
+
<div><%= form.label(t :birthdate) %></div>
|
|
14
|
+
<div><%= form.date_field :birthdate, min: Date.new(1900), max: 3.years.ago.end_of_year, required: true, class: 'form-control' %></div>
|
|
15
|
+
</fieldset>
|
|
16
|
+
<fieldset class="col-lg-4 offset-lg-2">
|
|
17
|
+
<div><%= form.label(t :gender) %></div>
|
|
18
|
+
<div><%= form.select :gender, options_for_select(User.genders.map { |gender, _| [t(gender), gender] }, @user.gender), {}, required: true, class: 'form-control form-select' %></div>
|
|
19
|
+
</fieldset>
|
|
20
|
+
</div>
|
|
17
21
|
<fieldset>
|
|
18
22
|
<div><%= form.label(t :email) %></div>
|
|
19
23
|
<div><%= form.text_field :email, readonly: true, class: 'form-control' %></div>
|
|
@@ -1,22 +1,24 @@
|
|
|
1
1
|
<%= form_for :user, url: user_path, :html => { id: 'mu-user-form', class: 'mu-form' }, method: :put do |f| %>
|
|
2
2
|
<div class="mu-user-header">
|
|
3
3
|
<h1><%= t(:edit_profile) %></h1>
|
|
4
|
-
<div class="mu-profile-actions d-none d-md-block">
|
|
5
|
-
<%= cancel_edit_profile_button %>
|
|
6
|
-
<%= save_edit_profile_button f %>
|
|
7
|
-
</div>
|
|
8
4
|
</div>
|
|
9
5
|
<div class="row mu-tab-body">
|
|
10
|
-
<div class="col-md-6 col-lg-4 mu-user-avatar-container">
|
|
6
|
+
<div class="col-md-6 col-lg-4 mu-user-avatar-container mb-3">
|
|
11
7
|
<%= profile_picture_for(@user, id: 'mu-user-avatar', class: 'mu-user-avatar') %>
|
|
12
8
|
<button class="fas fa-pencil-alt fa-2x btn mu-edit-avatar" type="button" data-bs-toggle="modal" data-bs-target="#mu-avatar-picker" tabindex="0"></button>
|
|
13
9
|
</div>
|
|
14
|
-
<div class="col-md-6 col-lg-8">
|
|
10
|
+
<div class="col-md-6 col-lg-8 mb-4">
|
|
11
|
+
<% unless current_user.profile_completed? %>
|
|
12
|
+
<div class="alert alert-info alert-dismissible fade show" role="alert">
|
|
13
|
+
<%= fa_icon 'info-circle', class: 'fa-lg me-2 align-middle', text: t(:please_fill_profile_data) %>
|
|
14
|
+
<button type="button" class="btn-close" data-bs-dismiss="alert" aria-label="Close"></button>
|
|
15
|
+
</div>
|
|
16
|
+
<% end %>
|
|
15
17
|
<%= render partial: 'profile_fields', locals: {form: f} %>
|
|
16
18
|
<%= render partial: 'layouts/terms_acceptance_disclaimer', locals: {user: @user} %>
|
|
17
19
|
</div>
|
|
18
20
|
</div>
|
|
19
|
-
<div class="mu-profile-actions
|
|
21
|
+
<div class="mu-profile-actions">
|
|
20
22
|
<%= cancel_edit_profile_button %>
|
|
21
23
|
<%= save_edit_profile_button f %>
|
|
22
24
|
</div>
|
metadata
CHANGED
|
@@ -1,14 +1,14 @@
|
|
|
1
1
|
--- !ruby/object:Gem::Specification
|
|
2
2
|
name: mumuki-laboratory
|
|
3
3
|
version: !ruby/object:Gem::Version
|
|
4
|
-
version: 9.
|
|
4
|
+
version: 9.20.0
|
|
5
5
|
platform: ruby
|
|
6
6
|
authors:
|
|
7
7
|
- Franco Bulgarelli
|
|
8
8
|
autorequire:
|
|
9
9
|
bindir: bin
|
|
10
10
|
cert_chain: []
|
|
11
|
-
date: 2021-10-
|
|
11
|
+
date: 2021-10-22 00:00:00.000000000 Z
|
|
12
12
|
dependencies:
|
|
13
13
|
- !ruby/object:Gem::Dependency
|
|
14
14
|
name: rails
|
|
@@ -438,7 +438,6 @@ files:
|
|
|
438
438
|
- app/assets/javascripts/mumuki_laboratory/application/upload.js
|
|
439
439
|
- app/assets/javascripts/mumuki_laboratory/application/user.js
|
|
440
440
|
- app/assets/stylesheets/mumuki_laboratory/application.scss
|
|
441
|
-
- app/assets/stylesheets/mumuki_laboratory/application/_alerts.scss
|
|
442
441
|
- app/assets/stylesheets/mumuki_laboratory/application/_codemirror-themes.scss
|
|
443
442
|
- app/assets/stylesheets/mumuki_laboratory/application/_errors.scss
|
|
444
443
|
- app/assets/stylesheets/mumuki_laboratory/application/_fonts.scss
|