mumuki-laboratory 7.10.5 → 8.0.0

Sign up to get free protection for your applications and to get access to all the features.
Files changed (95) hide show
  1. checksums.yaml +4 -4
  2. data/README.md +26 -7
  3. data/Rakefile +9 -2
  4. data/app/assets/javascripts/mumuki_laboratory/application/bridge.js +26 -5
  5. data/app/assets/javascripts/mumuki_laboratory/application/characters.js +3 -1
  6. data/app/assets/javascripts/mumuki_laboratory/application/gamification.js +85 -0
  7. data/app/assets/javascripts/mumuki_laboratory/application/kids.js +160 -334
  8. data/app/assets/javascripts/mumuki_laboratory/application/kindergarten.js +200 -0
  9. data/app/assets/javascripts/mumuki_laboratory/application/primary.js +257 -0
  10. data/app/assets/javascripts/mumuki_laboratory/application/profile.js +31 -16
  11. data/app/assets/javascripts/mumuki_laboratory/application/submission.js +1 -0
  12. data/app/assets/javascripts/mumuki_laboratory/application/submissions-store.js +19 -2
  13. data/app/assets/stylesheets/mumuki_laboratory/application/_errors.scss +1 -3
  14. data/app/assets/stylesheets/mumuki_laboratory/application/_modules.scss +3 -1
  15. data/app/assets/stylesheets/mumuki_laboratory/application/modules/_avatar.scss +21 -0
  16. data/app/assets/stylesheets/mumuki_laboratory/application/modules/{_chapter_show.scss → _content_show.scss} +0 -0
  17. data/app/assets/stylesheets/mumuki_laboratory/application/modules/_kindergarten.scss +421 -12
  18. data/app/assets/stylesheets/mumuki_laboratory/application/modules/_medal.scss +48 -0
  19. data/app/assets/stylesheets/mumuki_laboratory/application/modules/_terms.scss +44 -0
  20. data/app/assets/stylesheets/mumuki_laboratory/application/modules/_user_profile.scss +9 -0
  21. data/app/controllers/api/courses_controller.rb +1 -2
  22. data/app/controllers/api/organizations_controller.rb +2 -3
  23. data/app/controllers/api/users_controller.rb +2 -4
  24. data/app/controllers/application_controller.rb +15 -8
  25. data/app/controllers/book_discussions_controller.rb +4 -0
  26. data/app/controllers/invitations_controller.rb +1 -2
  27. data/app/controllers/users_controller.rb +8 -2
  28. data/app/helpers/avatar_helper.rb +11 -3
  29. data/app/helpers/contextualization_result_helper.rb +9 -1
  30. data/app/helpers/kindergarten_helper.rb +5 -0
  31. data/app/helpers/links_helper.rb +8 -0
  32. data/app/helpers/medal_helper.rb +36 -0
  33. data/app/helpers/open_graph_helper.rb +2 -2
  34. data/app/helpers/organization_list_helper.rb +1 -1
  35. data/app/helpers/overlapped_buttons_helper.rb +1 -1
  36. data/app/helpers/page_title_helper.rb +2 -2
  37. data/app/helpers/profile_helper.rb +9 -1
  38. data/app/views/book/_header.html.erb +17 -0
  39. data/app/views/book/show.html.erb +1 -18
  40. data/app/views/discussions/terms.html.erb +10 -0
  41. data/app/views/exercise_solutions/_kids_results.html.erb +1 -1
  42. data/app/views/exercises/show.html.erb +1 -0
  43. data/app/views/invitations/_invitation_form.html.erb +1 -0
  44. data/app/views/layouts/_discussions.html.erb +4 -0
  45. data/app/views/layouts/_error.html.erb +3 -6
  46. data/app/views/layouts/_guide.html.erb +10 -3
  47. data/app/views/layouts/_kindergarten.html.erb +38 -0
  48. data/app/views/layouts/_main.html.erb +3 -1
  49. data/app/views/layouts/_organization_chooser.html.erb +0 -7
  50. data/app/views/layouts/_terms_acceptance_disclaimer.html.erb +6 -0
  51. data/app/views/layouts/application.html.erb +3 -2
  52. data/app/views/layouts/exercise_inputs/layouts/_input_kindergarten.html.erb +27 -27
  53. data/app/views/layouts/modals/_guide_corollary.html.erb +9 -0
  54. data/app/views/layouts/modals/_kindergarten_context.html.erb +30 -0
  55. data/app/views/layouts/modals/_kindergarten_results.html.erb +23 -0
  56. data/app/views/layouts/modals/_kindergarten_results_aborted.html.erb +27 -0
  57. data/app/views/users/_avatar_list.html.erb +6 -2
  58. data/app/views/users/_edit_user_form.html.erb +9 -4
  59. data/app/views/users/_term.html.erb +10 -0
  60. data/app/views/users/_user_form.html.erb +5 -1
  61. data/app/views/users/terms.html.erb +18 -0
  62. data/config/routes.rb +2 -0
  63. data/lib/mumuki/laboratory.rb +1 -1
  64. data/lib/mumuki/laboratory/controllers/current_organization.rb +1 -1
  65. data/lib/mumuki/laboratory/controllers/results_rendering.rb +3 -2
  66. data/lib/mumuki/laboratory/events/events.rb +0 -24
  67. data/lib/mumuki/laboratory/locales/en.yml +16 -5
  68. data/lib/mumuki/laboratory/locales/es-CL.yml +5 -4
  69. data/lib/mumuki/laboratory/locales/es.yml +17 -6
  70. data/lib/mumuki/laboratory/locales/pt.yml +16 -5
  71. data/lib/mumuki/laboratory/version.rb +1 -1
  72. data/spec/capybara_helper.rb +99 -0
  73. data/spec/controllers/exercise_solutions_controller_spec.rb +3 -4
  74. data/spec/dummy/db/schema.rb +37 -1
  75. data/spec/dummy/public/medal/outline.svg +1089 -0
  76. data/spec/features/choose_organization_spec.rb +12 -30
  77. data/spec/features/disable_user_flow_spec.rb +3 -5
  78. data/spec/features/disabled_organization_flow_spec.rb +9 -14
  79. data/spec/features/exercise_flow_spec.rb +2 -2
  80. data/spec/features/guide_reset_spec.rb +1 -1
  81. data/spec/features/guides_flow_spec.rb +1 -1
  82. data/spec/features/home_private_flow_spec.rb +1 -3
  83. data/spec/features/home_public_flow_spec.rb +6 -12
  84. data/spec/features/invitations_flow_spec.rb +2 -2
  85. data/spec/features/login_flow_spec.rb +2 -2
  86. data/spec/features/not_found_private_flow_spec.rb +4 -4
  87. data/spec/features/not_found_public_flow_spec.rb +1 -6
  88. data/spec/features/profile_flow_spec.rb +1 -1
  89. data/spec/helpers/page_title_helper_spec.rb +3 -3
  90. data/spec/javascripts/editors-spec.js +23 -0
  91. data/spec/javascripts/gamification-spec.js +58 -0
  92. data/spec/javascripts/submissions-store-spec.js +139 -6
  93. data/spec/spec_helper.rb +2 -0
  94. data/spec/teaspoon_env.rb +24 -6
  95. metadata +41 -7
data/app/views/book/show.html.erb CHANGED
@@ -3,24 +3,7 @@
3
3
  <% end %>
4
4
 
5
5
  <div class="col-md-offset-2 col-md-8">
6
- <div class="book-header <%= current_user? ? '' : 'logged' %>">
7
- <h1>ム mumuki<%= Organization.current.title_suffix %></h1>
8
-
9
- <img src="<%= Organization.current.banner_url %>" alt="<%= Organization.current.name %> - Mumuki">
10
- <h2><%= @book.name %></h2>
11
-
12
- <% unless Organization.current.central? %>
13
- <h3>
14
- <small><%= Organization.current.description %></small>
15
- <br>
16
- <small><%= t :powered_by_mumuki_html %></small>
17
- </h3>
18
- <% end %>
19
- </div>
20
-
21
- <div class="text-box">
22
- <%= @book.description_html %>
23
- </div>
6
+ <%= render partial: 'book/header' %>
24
7
 
25
8
  <% @book.next_lesson_for(current_user).try do |lesson| %>
26
9
  <div class="actions">
data/app/views/discussions/terms.html.erb ADDED
@@ -0,0 +1,10 @@
1
+ <div class="mu-user-header">
2
+ <h1><%= t :forum_terms %></h1>
3
+ </div>
4
+
5
+ <div>
6
+ <% @forum_terms.each do |term| %>
7
+ <%= term.content_html %>
8
+ <% end %>
9
+ </div>
10
+
data/app/views/exercise_solutions/_kids_results.html.erb CHANGED
@@ -12,7 +12,7 @@
12
12
  <%= corollary_box @exercise %>
13
13
  <% else %>
14
14
  <div class="mu-kids-default-success">
15
- <img class="capital-animation mu-kids-character-success"/>
15
+ <img class="capital-animation mu-kids-character-result"/>
16
16
  <p><%= t :kids_default_success %></p>
17
17
  </div>
18
18
  <% end %>
data/app/views/exercises/show.html.erb CHANGED
@@ -48,6 +48,7 @@
48
48
  <%= hidden_field_tag "mu-exercise-id", @exercise.id %>
49
49
  <%= hidden_field_tag "mu-exercise-layout", @exercise.layout %>
50
50
  <%= hidden_field_tag "mu-exercise-settings", @exercise.settings.to_json %>
51
+ <%= hidden_field_tag "mu-current-exp", UserStats.exp_for(@current_user) %>
51
52
 
52
53
  <div style="display: none" id="processing-template">
53
54
  <div class="bs-callout bs-callout-info">
data/app/views/invitations/_invitation_form.html.erb CHANGED
@@ -4,6 +4,7 @@
4
4
  <div class="row mu-tab-body">
5
5
  <div class="col-md-12">
6
6
  <%= render partial: 'users/profile_fields', locals: {form: f} %>
7
+ <%= render partial: 'layouts/terms_acceptance_disclaimer', locals: {user: @user} %>
7
8
  </div>
8
9
  </div>
9
10
  </div>
data/app/views/layouts/_discussions.html.erb CHANGED
@@ -84,3 +84,7 @@
84
84
 
85
85
  <% end %>
86
86
  </div>
87
+
88
+ <span>
89
+ <%= t(:forum_terms_link, terms_link: link_to_forum_terms).html_safe %>
90
+ </span>
data/app/views/layouts/_error.html.erb CHANGED
@@ -2,9 +2,6 @@
2
2
  <%= home_breadcrumb %>
3
3
  <% end %>
4
4
 
5
-
6
- <%= content_for :no_container do %>
7
- <div class="error-message">
8
- <%= yield %>
9
- </div>
10
- <% end %>
5
+ <div class="error-message">
6
+ <%= yield %>
7
+ </div>
data/app/views/layouts/_guide.html.erb CHANGED
@@ -14,9 +14,16 @@
14
14
  <div class="mu-inline-block-right">
15
15
  <h1><%= language_icon @guide.language %></h1>
16
16
  </div>
17
- <div class="mu-inline-block-left">
18
- <h1>
19
- <%= subject.name %>
17
+ <div class="mu-inline-block-left guide-header">
18
+ <h1 class="pull-left">
19
+ <span class="pull-left">
20
+ <%= subject.name %>
21
+ </span>
22
+ <% if current_user? && should_display_medal?(@guide, Organization.current) %>
23
+ <div class="pull-left">
24
+ <%= content_medal_for(@guide, current_user) %>
25
+ </div>
26
+ <% end %>
20
27
  <%= teacher_info_button @guide%>
21
28
  <%= link_to_bibliotheca_guide @guide %>
22
29
  </h1>
data/app/views/layouts/_kindergarten.html.erb ADDED
@@ -0,0 +1,38 @@
1
+ <div class="mu-kindergarten-header">
2
+ <div class="mu-kindergarten-character">
3
+ <img class="mu-kids-character-animation" alt="">
4
+ <div class="mu-kindergarten-character-speech-bubble">
5
+ <span class="mu-kindergarten-exercise-description"><%= exercise.description_task %></span>
6
+ <div class="mu-kindergarten-buttons">
7
+ <button class="mu-kindergarten-show-context" onclick="mumuki.kids.context.showContext()">
8
+ <img class="mu-kindergarten-button-image" src="https://mumuki.io/static/show-context.svg" alt="">
9
+ </button>
10
+ <button class="mu-kindergarten-play-description" onclick="mumuki.kids.speech.click('.mu-kindergarten-exercise-description', '<%= exercise.locale %>')">
11
+ <img class="mu-kindergarten-button-image mu-kindergarten-play" src="https://mumuki.io/static/audio-play.svg" alt="">
12
+ <img class="mu-kindergarten-button-image mu-kindergarten-stop hidden" src="https://mumuki.io/static/audio-stop.svg" alt="">
13
+ </button>
14
+ </div>
15
+ </div>
16
+ </div>
17
+ <div class="mu-kindergarten-hint">
18
+ <% if exercise.hint? %>
19
+ <button class="mu-hint-light" onclick="mumuki.kids.hint.toggle()">
20
+ <img class="mu-hint-light on" src="https://mumuki.io/static/lamparita_on.svg" alt="">
21
+ </button>
22
+ <div class="mu-kindergarten-light-speech-bubble">
23
+ <span class="mu-kindergarten-exercise-hint">
24
+ <%= exercise.hint.markdownified %>
25
+ </span>
26
+ <button class="expand-or-collapse-hint-media" onclick="mumuki.kids.hint.toggleMedia()">
27
+ <i class="fa fa-fw fa-2x fa-caret-up"></i>
28
+ </button>
29
+ </div>
30
+ <% else %>
31
+ <img class="mu-hint-light off" src="https://mumuki.io/static/lamparita_off.svg" alt="">
32
+ <% end %>
33
+ </div>
34
+ </div>
35
+
36
+ <div id="mu-kids-discussion-link-html" class="hidden">
37
+ <%= kids_read_discussions_link(exercise) %>
38
+ </div>
data/app/views/layouts/_main.html.erb CHANGED
@@ -6,7 +6,9 @@
6
6
  <meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no">
7
7
  <% end %>
8
8
 
9
- <meta name="description" content="<%= t :mumuki_short_description %>"/>
9
+ <meta name="description" content="<%= Organization.current.description %>"/>
10
+
11
+
10
12
 
11
13
  <%= open_graph_tags subject %>
12
14
  <%= assets_include_tags %>
data/app/views/layouts/_organization_chooser.html.erb CHANGED
@@ -10,13 +10,6 @@
10
10
  <%= render partial: 'layouts/organizations_listing' %>
11
11
  </div>
12
12
  </div>
13
- <div class="modal-footer">
14
- <div class="row">
15
- <div class="col-md-12 pull-right">
16
- <%= link_to t(:stay_here), Organization.central.url_for(request.path) %>
17
- </div>
18
- </div>
19
- </div>
20
13
  </div>
21
14
  </div>
22
15
  </div>
data/app/views/layouts/_terms_acceptance_disclaimer.html.erb ADDED
@@ -0,0 +1,6 @@
1
+ <% if user.has_profile_terms_to_accept? %>
2
+ <br>
3
+ <span>
4
+ <%= t(:terms_and_conditions_continue_disclaimer, terms_link: link_to_profile_terms).html_safe %>
5
+ </span>
6
+ <% end %>
data/app/views/layouts/application.html.erb CHANGED
@@ -27,9 +27,10 @@
27
27
  </span>
28
28
  </div>
29
29
  <div class="dropdown">
30
- <span id="profileDropdown" data-toggle="dropdown" aria-label="<%= t(:user) %>" role="menu" tabindex="0">
30
+ <div id="profileDropdown" class="profile-dropdown" data-toggle="dropdown" aria-label="<%= t(:user) %>" role="menu" tabindex="0">
31
31
  <%= profile_picture_for current_user %>
32
- </span>
32
+ <span class="caret"></span>
33
+ </div>
33
34
  <ul class="dropdown-menu dropdown-menu-right" aria-labelledby="profileDropdown">
34
35
  <%= menu_bar_list_items %>
35
36
  <li class="divider"></li>
data/app/views/layouts/exercise_inputs/layouts/_input_kindergarten.html.erb CHANGED
@@ -1,40 +1,40 @@
1
1
  <% content_for :no_container do %>
2
2
 
3
- <div <%= turbolinks_enable_for exercise %>>
3
+ <div <%= turbolinks_enable_for exercise %>>
4
4
 
5
- <div class="mu-kids-landscape-support container-fluid">
6
- <img class="mu-kids-character-animation"/>
7
- <h3><%= t :only_landscape_support %></h3>
8
- </div>
5
+ <div class="mu-kids-landscape-support container-fluid">
6
+ <img class="mu-kids-character-animation"/>
7
+ <h3><%= t :only_landscape_support %></h3>
8
+ </div>
9
9
 
10
- <div class="mu-kids-exercise mu-kindergarten container-fluid">
10
+ <div class="mu-kids-exercise mu-kindergarten container-fluid">
11
11
 
12
- <div class="mu-kids-exercise-description mu-kids-exercise-description-fixed">
13
- <div class="mu-kids-character">
14
- <%= render partial: 'layouts/kids', locals: {exercise: exercise} %>
15
- </div>
12
+ <div class="mu-kids-exercise-description mu-kids-exercise-description-fixed">
13
+ <div class="mu-kids-character">
14
+ <%= render partial: 'layouts/kindergarten', locals: {exercise: exercise} %>
16
15
  </div>
17
- <div class="mu-kids-exercise-workspace">
18
- <div class="mu-exercise-content mu-kids-blocks">
19
- <%= yield :exercise_content %>
20
- </div>
21
- <div class="mu-kids-states mu-kids-single-state mu-multiple-scenarios">
22
- <div class="mu-scenarios">
23
- <div class="mu-kids-state mu-state-initial mu-kids-gbs-board-initial mu-initial-state">
24
- <div class="mu-kids-state-image"><%= exercise.initial_state&.html_safe %></div>
25
- </div>
26
- <div class="mu-kids-state mu-state-final mu-final-state">
27
- <div class="mu-kids-state-image"><%= exercise.final_state&.html_safe %></div>
28
- </div>
16
+ </div>
17
+ <div class="mu-kids-exercise-workspace <%= 'mu-full-workspace' if kindergarten_full_workspace? exercise %>">
18
+ <div class="mu-exercise-content mu-kids-blocks">
19
+ <%= yield :exercise_content %>
20
+ </div>
21
+ <div class="mu-kids-states mu-kids-single-state mu-multiple-scenarios">
22
+ <div class="mu-scenarios">
23
+ <div class="mu-kids-state mu-state-initial mu-kids-gbs-board-initial mu-initial-state">
24
+ <div class="mu-kids-state-image"><%= exercise.initial_state&.html_safe %></div>
25
+ </div>
26
+ <div class="mu-kids-state mu-state-final mu-final-state">
27
+ <div class="mu-kids-state-image"><%= exercise.final_state&.html_safe %></div>
29
28
  </div>
30
- <ol class="indicators"></ol>
31
29
  </div>
30
+ <ol class="indicators"></ol>
32
31
  </div>
33
32
  </div>
33
+ </div>
34
34
 
35
- <%= render partial: 'layouts/modals/kids_results', locals: {exercise: exercise, assignment: @assignment} %>
36
- <%= render partial: 'layouts/modals/kids_results_aborted' %>
37
- <%= render partial: 'layouts/modals/kids_context', locals: {exercise: exercise, assignment: @assignment} %>
35
+ <%= render partial: 'layouts/modals/kindergarten_results', locals: {exercise: exercise, assignment: @assignment} %>
36
+ <%= render partial: 'layouts/modals/kindergarten_results_aborted' %>
37
+ <%= render partial: 'layouts/modals/kindergarten_context', locals: {exercise: exercise, assignment: @assignment} %>
38
38
 
39
- </div>
39
+ </div>
40
40
  <% end %>
data/app/views/layouts/modals/_guide_corollary.html.erb CHANGED
@@ -15,6 +15,15 @@
15
15
  <%= corollary_box guide %>
16
16
  </div>
17
17
  </div>
18
+ <div class="row">
19
+ <div class="col-md-12 mu-last-box">
20
+ <hr>
21
+ <% if should_display_medal? @guide, Organization.current %>
22
+ <p><%= t :unlocked_medal_as_avatar %></p>
23
+ <%= corollary_medal_for guide %>
24
+ <% end %>
25
+ </div>
26
+ </div>
18
27
  <div class="row">
19
28
  <div class="col-md-12 text-center">
20
29
  <%= next_lesson_button guide %>
data/app/views/layouts/modals/_kindergarten_context.html.erb ADDED
@@ -0,0 +1,30 @@
1
+ <div class="modal fade mu-kindergarten-context" id="mu-kids-context" tabindex="-1" role="dialog" aria-hidden="true">
2
+ <div class="modal-dialog">
3
+ <div class="modal-content">
4
+ <button type="button" class="mu-kindergarten-modal-button mu-close" data-waiting="" data-dismiss="modal" aria-label="Close">
5
+ <span aria-hidden="true">
6
+ <i class="fa fa-fw fa-times fa-3x"></i>
7
+ </span>
8
+ </button>
9
+ <button type="button" class="mu-kindergarten-modal-button mu-previous hidden" onclick="mumuki.kids.context.prevSlide()" aria-label="Previous">
10
+ <span aria-hidden="true">
11
+ <i class="fa fa-fw fa-arrow-left fa-3x"></i>
12
+ </span>
13
+ </button>
14
+ <button type="button" class="mu-kindergarten-modal-button mu-next" onclick="mumuki.kids.context.nextSlide()" aria-label="Next">
15
+ <span aria-hidden="true">
16
+ <i class="fa fa-fw fa-arrow-right fa-3x"></i>
17
+ </span>
18
+ </button>
19
+ <div class="modal-body">
20
+ <div class="container-fluid">
21
+ <div class="row">
22
+ <div class="col-md-12">
23
+ <%= exercise.description_context %>
24
+ </div>
25
+ </div>
26
+ </div>
27
+ </div>
28
+ </div>
29
+ </div>
30
+ </div>
data/app/views/layouts/modals/_kindergarten_results.html.erb ADDED
@@ -0,0 +1,23 @@
1
+ <div class="modal fade mu-kids-results mu-kindergarten-context" id="kids-results" tabindex="-1" role="dialog" aria-hidden="true">
2
+ <div class="modal-dialog">
3
+ <div class="modal-content">
4
+ <button type="button" class="mu-kindergarten-modal-button mu-close" data-dismiss="modal" aria-label="Close">
5
+ <span aria-hidden="true">
6
+ <i class="fa fa-fw fa-times fa-3x"></i>
7
+ </span>
8
+ </button>
9
+ <div class="modal-header">
10
+ </div>
11
+ <div class="modal-body">
12
+ <div class="container-fluid">
13
+ <div class="row">
14
+ <div class="col-md-12 submission-results">
15
+ </div>
16
+ </div>
17
+ </div>
18
+ </div>
19
+ <div class="modal-footer">
20
+ </div>
21
+ </div>
22
+ </div>
23
+ </div>
data/app/views/layouts/modals/_kindergarten_results_aborted.html.erb ADDED
@@ -0,0 +1,27 @@
1
+ <div class="modal fade mu-kids-results-aborted mu-kindergarten-context" id="kids-results-aborted" tabindex="-1" role="dialog" aria-hidden="true">
2
+ <div class="modal-dialog">
3
+ <div class="modal-content broken">
4
+ <button type="button" class="mu-kindergarten-modal-button mu-close" data-dismiss="modal" aria-label="Close" data-waiting="">
5
+ <span aria-hidden="true">
6
+ <i class="fa fa-fw fa-times fa-3x"></i>
7
+ </span>
8
+ </button>
9
+ <div class="modal-header">
10
+ <h4 class="modal-title text-broken">
11
+ <strong><%= t :kindergarten_aborted %></strong>
12
+ </h4>
13
+ </div>
14
+ <div class="modal-body">
15
+ <div class="container-fluid">
16
+ <div class="row">
17
+ <div class="col-md-12">
18
+ <div class="mu-kids-character">
19
+ <img class="mu-kids-character-result-aborted"/>
20
+ </div>
21
+ </div>
22
+ </div>
23
+ </div>
24
+ </div>
25
+ </div>
26
+ </div>
27
+ </div>
data/app/views/users/_avatar_list.html.erb CHANGED
@@ -1,11 +1,15 @@
1
1
  <div class="row">
2
2
  <div class="mu-avatar-list">
3
- <% avatars_for(@user).sort_by(&:id).each do |avatar| %>
3
+ <% avatars_for(@user).each do |avatar| %>
4
4
  <%= show_avatar_item(avatar) %>
5
5
  <% end %>
6
6
 
7
+ <% locked_avatars_for(@user).sort_by(&:id).each do |avatar| %>
8
+ <%= show_locked_avatar_item(avatar) %>
9
+ <% end %>
10
+
7
11
  <% if @user.image_url %>
8
- <%= avatar_image @user.image_url, class: 'mu-avatar-item', id: 'mu-user-image' %>
12
+ <%= avatar_image @user.image_url, class: 'mu-avatar-item', id: 'mu-user-image', tabindex: 0 %>
9
13
  <% end %>
10
14
  </div>
11
15
  </div>
data/app/views/users/_edit_user_form.html.erb CHANGED
@@ -1,20 +1,25 @@
1
1
  <%= form_for :user, url: update_user_path, :html => { id: 'mu-user-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">
5
- <%= link_to t(:cancel), :back, class: 'btn btn-default' if @user.profile_completed? %>
6
- <%= f.submit t(:save), disabled: true, class: 'btn btn-success', id: 'mu-edit-profile-btn' %>
4
+ <div class="mu-profile-actions hidden-xs">
5
+ <%= cancel_edit_profile_button %>
6
+ <%= save_edit_profile_button f %>
7
7
  </div>
8
8
  </div>
9
9
  <div class="row mu-tab-body">
10
10
  <div class="col-md-4 text-center">
11
11
  <%= profile_picture_for(@user, id: 'mu-user-avatar', class: 'mu-user-avatar') %>
12
- <i class="fa fa-pencil fa-2x pointer mu-edit-avatar" id="mu-edit-avatar-icon"></i>
12
+ <i class="fa fa-pencil fa-2x pointer mu-edit-avatar" id="mu-edit-avatar-icon" tabindex="0"></i>
13
13
  </div>
14
14
  <div class="col-md-8">
15
15
  <%= render partial: 'profile_fields', locals: {form: f} %>
16
+ <%= render partial: 'layouts/terms_acceptance_disclaimer', locals: {user: @user} %>
16
17
  </div>
17
18
  </div>
19
+ <div class="mu-profile-actions mobile visible-xs">
20
+ <%= cancel_edit_profile_button %>
21
+ <%= save_edit_profile_button f %>
22
+ </div>
18
23
  <% end %>
19
24
 
20
25
  <%= content_for :no_container do %>
data/app/views/users/_term.html.erb ADDED
@@ -0,0 +1,10 @@
1
+ <div class="terms-card">
2
+ <details <%= 'open' unless collapsed %>>
3
+ <summary class="terms-card-header">
4
+ <h4><%= term.header %></h4>
5
+ </summary>
6
+ <div class="terms-card-body">
7
+ <%= term.content_html %>
8
+ </div>
9
+ </details>
10
+ </div>
data/app/views/users/_user_form.html.erb CHANGED
@@ -1,6 +1,6 @@
1
1
  <div class="mu-user-header">
2
2
  <h1><%= @user.name %></h1>
3
- <div class="mu-profile-actions">
3
+ <div class="mu-profile-actions hidden-xs">
4
4
  <%= edit_profile_button %>
5
5
  </div>
6
6
  </div>
@@ -21,4 +21,8 @@
21
21
  <span> <strong><%= t :programming_since %>:</strong> <%= t(:time_since, time: time_ago_in_words(@user.created_at)) %> </span>
22
22
  </div>
23
23
  </div>
24
+
25
+ <div class="mu-profile-actions mobile visible-xs">
26
+ <%= edit_profile_button %>
27
+ </div>
24
28
  </div>
data/app/views/users/terms.html.erb ADDED
@@ -0,0 +1,18 @@
1
+ <%= content_for :breadcrumbs do %>
2
+ <% if current_user? %>
3
+ <%= breadcrumbs @user %>
4
+ <% else %>
5
+ <%= header_breadcrumbs %>
6
+ <% end %>
7
+ <% end %>
8
+
9
+ <div class="mu-user-header">
10
+ <h1><%= t(:terms_and_conditions) %></h1>
11
+ </div>
12
+
13
+ <div>
14
+ <% @profile_terms.each do |term| %>
15
+ <%= render partial: 'term', locals: {term: term, collapsed: current_user&.has_accepted?(term)} %>
16
+ <% end %>
17
+ </div>
18
+