mumuki-laboratory 9.0.5 → 9.1.3

Sign up to get free protection for your applications and to get access to all the features.
Files changed (160) hide show
  1. checksums.yaml +4 -4
  2. data/app/assets/javascripts/mumuki_laboratory/application/codemirror.js +10 -2
  3. data/app/assets/javascripts/mumuki_laboratory/application/discussions.js +10 -10
  4. data/app/assets/javascripts/mumuki_laboratory/application/gamification.js +3 -3
  5. data/app/assets/javascripts/mumuki_laboratory/application/kids.js +11 -7
  6. data/app/assets/javascripts/mumuki_laboratory/application/kindergarten.js +3 -3
  7. data/app/assets/javascripts/mumuki_laboratory/application/messages.js +3 -3
  8. data/app/assets/javascripts/mumuki_laboratory/application/mu-modal-carrousel.js +4 -4
  9. data/app/assets/javascripts/mumuki_laboratory/application/multiple-files.js +18 -5
  10. data/app/assets/javascripts/mumuki_laboratory/application/multiple-scenarios.js +1 -1
  11. data/app/assets/javascripts/mumuki_laboratory/application/primary.js +4 -4
  12. data/app/assets/javascripts/mumuki_laboratory/application/profile.js +0 -6
  13. data/app/assets/javascripts/mumuki_laboratory/application/progress.js +1 -1
  14. data/app/assets/javascripts/mumuki_laboratory/application/speech-bubble-renderer.js +1 -1
  15. data/app/assets/javascripts/mumuki_laboratory/application/submission.js +4 -3
  16. data/app/assets/javascripts/mumuki_laboratory/application/toast.js +3 -0
  17. data/app/assets/javascripts/mumuki_laboratory/application/tooltip.js +1 -1
  18. data/app/assets/javascripts/mumuki_laboratory/application/upload.js +2 -2
  19. data/app/assets/stylesheets/mumuki_laboratory/application.scss +0 -1
  20. data/app/assets/stylesheets/mumuki_laboratory/application/_errors.scss +1 -1
  21. data/app/assets/stylesheets/mumuki_laboratory/application/_layout.scss +1 -27
  22. data/app/assets/stylesheets/mumuki_laboratory/application/_modules.scss +0 -2
  23. data/app/assets/stylesheets/mumuki_laboratory/application/modules/_activity.scss +7 -5
  24. data/app/assets/stylesheets/mumuki_laboratory/application/modules/_avatar.scss +5 -0
  25. data/app/assets/stylesheets/mumuki_laboratory/application/modules/_breadcrumb.scss +2 -2
  26. data/app/assets/stylesheets/mumuki_laboratory/application/modules/_datepicker.scss +0 -4
  27. data/app/assets/stylesheets/mumuki_laboratory/application/modules/_discussion.scss +38 -60
  28. data/app/assets/stylesheets/mumuki_laboratory/application/modules/_editor.scss +16 -18
  29. data/app/assets/stylesheets/mumuki_laboratory/application/modules/_exercise_assignment.scss +2 -11
  30. data/app/assets/stylesheets/mumuki_laboratory/application/modules/_exercise_results.scss +1 -7
  31. data/app/assets/stylesheets/mumuki_laboratory/application/modules/_faqs.scss +3 -3
  32. data/app/assets/stylesheets/mumuki_laboratory/application/modules/_flash.scss +7 -46
  33. data/app/assets/stylesheets/mumuki_laboratory/application/modules/_kids.scss +19 -4
  34. data/app/assets/stylesheets/mumuki_laboratory/application/modules/_kids_results.scss +18 -23
  35. data/app/assets/stylesheets/mumuki_laboratory/application/modules/_kindergarten.scss +1 -9
  36. data/app/assets/stylesheets/mumuki_laboratory/application/modules/_overlap.scss +1 -1
  37. data/app/assets/stylesheets/mumuki_laboratory/application/modules/_progress_bar.scss +5 -5
  38. data/app/assets/stylesheets/mumuki_laboratory/application/modules/_terms.scss +3 -2
  39. data/app/assets/stylesheets/mumuki_laboratory/application/modules/_timer.scss +1 -3
  40. data/app/assets/stylesheets/mumuki_laboratory/application/modules/_user_menu.scss +13 -6
  41. data/app/assets/stylesheets/mumuki_laboratory/application/modules/_user_profile.scss +0 -2
  42. data/app/controllers/application_controller.rb +4 -2
  43. data/app/controllers/discussions_messages_controller.rb +3 -1
  44. data/app/helpers/application_helper.rb +5 -5
  45. data/app/helpers/assignment_result_helper.rb +3 -2
  46. data/app/helpers/assistance_box_helper.rb +1 -1
  47. data/app/helpers/concerns/with_student_path_navigation.rb +8 -3
  48. data/app/helpers/concerns/with_student_path_navigation/continue_navigation.rb +1 -1
  49. data/app/helpers/concerns/with_student_path_navigation/finish_navigation.rb +1 -1
  50. data/app/helpers/concerns/with_student_path_navigation/next_parent_navigation.rb +7 -0
  51. data/app/helpers/concerns/with_student_path_navigation/revisit_navigation.rb +1 -1
  52. data/app/helpers/discussions_helper.rb +61 -24
  53. data/app/helpers/editor_tabs_helper.rb +10 -6
  54. data/app/helpers/email_helper.rb +2 -2
  55. data/app/helpers/exercise_input_helper.rb +2 -3
  56. data/app/helpers/links_helper.rb +12 -9
  57. data/app/helpers/menu_bar_helper.rb +1 -1
  58. data/app/helpers/messages_helper.rb +1 -1
  59. data/app/helpers/multiple_file_editor_helper.rb +2 -1
  60. data/app/helpers/overlapped_buttons_helper.rb +22 -12
  61. data/app/helpers/profile_helper.rb +3 -3
  62. data/app/helpers/toast_helper.rb +27 -0
  63. data/app/helpers/user_activity_helper.rb +1 -1
  64. data/app/views/book/show.html.erb +2 -2
  65. data/app/views/certificates/verify.html.erb +1 -1
  66. data/app/views/chapters/show.html.erb +2 -2
  67. data/app/views/discussions/_message.html.erb +31 -6
  68. data/app/views/discussions/_new_message.html.erb +4 -4
  69. data/app/views/discussions/index.html.erb +8 -10
  70. data/app/views/discussions/new.html.erb +1 -1
  71. data/app/views/discussions/show.html.erb +20 -12
  72. data/app/views/exam_registrations/show.html.erb +10 -11
  73. data/app/views/exercise_solutions/_assistant_rules_box.html.erb +1 -1
  74. data/app/views/exercise_solutions/_contextualization_results_body.html.erb +1 -1
  75. data/app/views/exercise_solutions/_contextualization_results_container.html.erb +1 -1
  76. data/app/views/exercise_solutions/_kids_results_button.html.erb +2 -2
  77. data/app/views/exercise_solutions/_results.html.erb +1 -1
  78. data/app/views/exercises/_exercise_assignment.html.erb +2 -2
  79. data/app/views/exercises/_exercise_skipped.html.erb +1 -1
  80. data/app/views/exercises/_read_only.html.erb +108 -105
  81. data/app/views/exercises/show.html.erb +7 -7
  82. data/app/views/guides/_guide.html.erb +1 -1
  83. data/app/views/guides/_guide_container.html.erb +4 -4
  84. data/app/views/invitations/_invitation_form.html.erb +5 -4
  85. data/app/views/layouts/_authoring.html.erb +1 -1
  86. data/app/views/layouts/_discussions.html.erb +7 -7
  87. data/app/views/layouts/_kids.html.erb +5 -5
  88. data/app/views/layouts/_kindergarten.html.erb +10 -6
  89. data/app/views/layouts/_main.html.erb +6 -10
  90. data/app/views/layouts/_organizations_listing.html.erb +2 -2
  91. data/app/views/layouts/_progress_bar.html.erb +2 -0
  92. data/app/views/layouts/_submission_result_error.html.erb +1 -1
  93. data/app/views/layouts/_test_results.html.erb +1 -1
  94. data/app/views/layouts/_timer.html.erb +1 -1
  95. data/app/views/layouts/_user_menu.html.erb +3 -3
  96. data/app/views/layouts/application.html.erb +39 -42
  97. data/app/views/layouts/exercise_inputs/editors/_code.html.erb +4 -4
  98. data/app/views/layouts/exercise_inputs/editors/_free_form.html.erb +1 -1
  99. data/app/views/layouts/exercise_inputs/editors/_multiple_choice.html.erb +7 -9
  100. data/app/views/layouts/exercise_inputs/editors/_multiple_files.html.erb +10 -10
  101. data/app/views/layouts/exercise_inputs/editors/_single_choice.html.erb +6 -8
  102. data/app/views/layouts/exercise_inputs/editors/_text.html.erb +2 -3
  103. data/app/views/layouts/exercise_inputs/editors/_upload.html.erb +5 -5
  104. data/app/views/layouts/exercise_inputs/forms/_form.html.erb +1 -1
  105. data/app/views/layouts/exercise_inputs/forms/_interactive_form.html.erb +2 -2
  106. data/app/views/layouts/exercise_inputs/forms/_kids_form.html.erb +1 -1
  107. data/app/views/layouts/exercise_inputs/forms/_playground_form.html.erb +2 -2
  108. data/app/views/layouts/exercise_inputs/forms/_problem_form.html.erb +13 -9
  109. data/app/views/layouts/exercise_inputs/layouts/_input_primary.html.erb +2 -2
  110. data/app/views/layouts/exercise_inputs/layouts/_input_right.html.erb +2 -2
  111. data/app/views/layouts/exercise_inputs/read_only_editors/_code.html.erb +1 -1
  112. data/app/views/layouts/exercise_inputs/read_only_editors/_free_form.html.erb +1 -1
  113. data/app/views/layouts/exercise_inputs/read_only_editors/_multiple_choice.html.erb +4 -4
  114. data/app/views/layouts/exercise_inputs/read_only_editors/_multiple_files.html.erb +2 -2
  115. data/app/views/layouts/exercise_inputs/read_only_editors/_single_choice.html.erb +4 -4
  116. data/app/views/layouts/exercise_inputs/read_only_editors/_text.erb +1 -1
  117. data/app/views/layouts/modals/_avatar_picker.html.erb +2 -5
  118. data/app/views/layouts/modals/_guide_corollary.html.erb +4 -8
  119. data/app/views/layouts/modals/_kids_context.html.erb +7 -5
  120. data/app/views/layouts/modals/_kids_results.html.erb +2 -2
  121. data/app/views/layouts/modals/_kids_results_aborted.html.erb +2 -2
  122. data/app/views/layouts/modals/_kindergarten_context.html.erb +3 -3
  123. data/app/views/layouts/modals/_kindergarten_results.html.erb +3 -3
  124. data/app/views/layouts/modals/_kindergarten_results_aborted.html.erb +2 -2
  125. data/app/views/layouts/modals/_level_up.html.erb +2 -5
  126. data/app/views/layouts/modals/_new_message.html.erb +5 -5
  127. data/app/views/notifications/_dropdown.html.erb +3 -3
  128. data/app/views/users/_activity_indicator.html.erb +14 -14
  129. data/app/views/users/_edit_user_form.html.erb +6 -6
  130. data/app/views/users/_profile_fields.html.erb +6 -6
  131. data/app/views/users/_user_form.html.erb +2 -2
  132. data/app/views/users/activity.html.erb +29 -29
  133. data/app/views/users/certificates.html.erb +26 -24
  134. data/app/views/users/discussions.html.erb +23 -21
  135. data/app/views/users/messages.html.erb +22 -20
  136. data/app/views/users/show.html.erb +5 -3
  137. data/app/views/users/terms.html.erb +4 -2
  138. data/config/initializers/inflections.rb +3 -0
  139. data/lib/mumuki/laboratory.rb +1 -1
  140. data/lib/mumuki/laboratory/locales/en.yml +15 -1
  141. data/lib/mumuki/laboratory/locales/es-CL.yml +15 -1
  142. data/lib/mumuki/laboratory/locales/es.yml +15 -1
  143. data/lib/mumuki/laboratory/locales/pt.yml +15 -2
  144. data/lib/mumuki/laboratory/version.rb +1 -1
  145. data/spec/capybara_helper.rb +1 -0
  146. data/spec/controllers/discussions_messages_controller_spec.rb +64 -2
  147. data/spec/dummy/db/schema.rb +20 -3
  148. data/spec/features/discussion_flow_spec.rb +20 -2
  149. data/spec/features/exercise_flow_spec.rb +1 -1
  150. data/spec/features/guide_reset_spec.rb +1 -1
  151. data/spec/features/terms_flow_spec.rb +1 -2
  152. data/spec/helpers/breadcrumbs_helper_spec.rb +2 -2
  153. data/spec/helpers/with_navigation_spec.rb +51 -13
  154. data/spec/javascripts/editors-spec.js +3 -3
  155. data/spec/javascripts/kids-button-spec.js +2 -2
  156. data/spec/javascripts/upload-spec.js +8 -8
  157. metadata +118 -117
  158. data/app/assets/stylesheets/mumuki_laboratory/application/hovers.scss +0 -12
  159. data/app/assets/stylesheets/mumuki_laboratory/application/modules/_checkboxes.scss +0 -34
  160. data/app/assets/stylesheets/mumuki_laboratory/application/modules/_guide_corollary.scss +0 -9
@@ -1,22 +1,22 @@
1
- <div class="field form-group editor-code">
2
-
1
+ <div class="editor-code">
3
2
  <div class="editor-files">
4
3
  <span class="files-tabs">
5
- <ul class="nav nav-tabs">
4
+ <ul class="nav nav-tabs" role="tablist">
6
5
  <% @files.each_with_index do |file, index| %>
7
- <li role="presentation" class="file-tab <%= 'active' if index == 0 %>" data-target="#editor-file-<%= index %>" tabindex='0' data-toggle='tab'>
8
- <a class="file-name" href="#"><%= file.name %></a> <i class="delete-file-button fas fa-times"></i>
6
+ <li class="nav-item file-tab" role="presentation">
7
+ <a class="file-name nav-link <%= 'active' if index == 0 %>" href="#" role="tab" data-bs-target="#editor-file-<%= index %>"
8
+ tabindex='0' data-bs-toggle='tab'><%= file.name %></a> <i class="delete-file-button fas fa-times"></i>
9
9
  </li>
10
10
  <% end %>
11
11
  </ul>
12
- <i class="add-file-button fas fa-plus"></i>
12
+ <%= fa_icon :plus, class: 'add-file-button' %>
13
13
  </span>
14
14
 
15
15
  <%= multifile_hidden_inputs %>
16
16
 
17
17
  <div class="tab-content">
18
18
  <% @files.each_with_index do |file, index| %>
19
- <div role="tabpanel" class="file-editor tab-pane mu-input-panel <%= 'fade in active' if index == 0 %>" id="editor-file-<%= index %>">
19
+ <div role="tabpanel" class="file-editor tab-pane mu-input-panel <%= 'fade show active' if index == 0 %>" id="editor-file-<%= index %>">
20
20
  <%= form.editor "content[#{file.name}]", file.highlight_mode,
21
21
  placeholder: t(:editor_placeholder),
22
22
  class: 'form-control editor',
@@ -27,9 +27,9 @@
27
27
  </div>
28
28
 
29
29
  <div class="mu-overlapped multiple-files">
30
- <a class="editor-resize"> <%= expand_icon %></a>
31
- <a class="editor-format"><%= format_icon %></a>
32
- <!--<a class="editor-reset submission-reset" data-confirm="<%= t(:confirm_reset) %>"><%= restart_icon %></a> -->
30
+ <%= expand_icon %>
31
+ <%= format_icon %>
32
+ <%= restart_icon 'editor', {'data-confirm': t(:confirm_reset), 'data-multiple-files': 'true'} %>
33
33
  </div>
34
34
  </div>
35
35
  </div>
@@ -1,8 +1,6 @@
1
- <div class="form-group">
2
- <% @exercise.pretty_choices.each do |choice| %>
3
- <div class="field radio complementary complementary-radio">
4
- <%= form.radio_button(:content, choice.value, checked: checked?(choice, @current_content), id: choice.id, required: true) %>
5
- <%= label_tag(choice.id, choice.text) %>
6
- </div>
7
- <% end %>
8
- </div>
1
+ <% @exercise.pretty_choices.each do |choice| %>
2
+ <div class="form-check">
3
+ <%= form.radio_button(:content, choice.value, checked: checked?(choice, @current_content), id: choice.id, required: true, class: 'form-check-input') %>
4
+ <%= label_tag(choice.id, choice.text, class: 'form-check-label' ) %>
5
+ </div>
6
+ <% end %>
@@ -1,7 +1,6 @@
1
- <div class="field form-group mu-editor-one-liner">
1
+ <div class="mu-editor-one-liner">
2
2
  <%= form.editor :content, 'dynamic',
3
- class: 'form-control editor',
3
+ class: 'form-control editor d-none',
4
4
  value: @current_content,
5
- style: 'display: none',
6
5
  data: {lines: 1} %>
7
6
  </div>
@@ -1,13 +1,13 @@
1
- <div class="form-group">
1
+ <div>
2
2
  <% @max_file_size = 256000 %>
3
3
 
4
- <textarea id="solution_content" type="text" name="solution[content]" class="hidden"></textarea>
5
- <input id="mu-upload-input" type="file" class="upload submission-control hidden" mu-upload-file-limit=<%= @max_file_size %> accept=".<%= @exercise.language.extension %>" />
4
+ <textarea id="solution_content" type="text" name="solution[content]" class="d-none"></textarea>
5
+ <input id="mu-upload-input" type="file" class="upload submission-control d-none" mu-upload-file-limit=<%= @max_file_size %> accept=".<%= @exercise.language.extension %>" />
6
6
  <div>
7
- <label id="mu-upload-label" for="mu-upload-input" class="btn btn-success">
7
+ <label id="mu-upload-label" for="mu-upload-input" class="btn btn-complementary">
8
8
  <%= fa_icon(:upload, text: t(:select_file), id: "mu-upload-icon") %>
9
9
  </label>
10
- <div id="mu-upload-file-limit-exceeded" class="hidden">
10
+ <div id="mu-upload-file-limit-exceeded" class="d-none">
11
11
  <%= fa_icon("exclamation-triangle", text: t(:file_exceeds_max_size, size_kb: (@max_file_size / 1000))) %></div>
12
12
  </div>
13
13
  </div>
@@ -9,6 +9,6 @@
9
9
  <p><%= t :you_must_sign_in_before_submitting %></p>
10
10
 
11
11
  <div class="actions">
12
- <%= login_button class: 'btn btn-success btn-block' %>
12
+ <%= login_button class: 'btn btn-complementary w-100' %>
13
13
  </div>
14
14
  <% end %>
@@ -11,7 +11,7 @@
11
11
  <% end %>
12
12
 
13
13
  <div class="tab-content">
14
- <div role="tabpanel" class="tab-pane mu-input-panel fade in active <%= pending_messages_filter(@assignment) %>" id="console">
14
+ <div role="tabpanel" class="tab-pane mu-input-panel fade show active <%= pending_messages_filter(@assignment) %>" id="console">
15
15
  <% if @assignment.pending_messages? %>
16
16
  <span class="pending-messages-text"> <%= t :pending_messages_explanation %>
17
17
  <a href="javascript:{}"
@@ -25,7 +25,7 @@
25
25
  <div class="console">
26
26
  </div>
27
27
  <div class="mu-overlapped">
28
- <a class="console-reset submission-reset"><%= restart_icon %></a>
28
+ <%= restart_icon %>
29
29
  </div>
30
30
  </div>
31
31
  <div role="tabpanel" class="tab-pane mu-input-panel fade mu-elipsis" id="visible-extra">
@@ -8,5 +8,5 @@
8
8
  </div>
9
9
  <div class="actions mu-kids-reset-button"></div>
10
10
  <img class="mu-kids-compass-rose" src="/compass_rose.svg">
11
- <div class="mu-kids-overlay" style="display: none"></div>
11
+ <div class="mu-kids-overlay d-none"></div>
12
12
  <% end %>
@@ -10,11 +10,11 @@
10
10
  <% end %>
11
11
 
12
12
  <div class="tab-content">
13
- <div role="tabpanel" class="tab-pane mu-input-panel in active fade" id="console">
13
+ <div role="tabpanel" class="tab-pane mu-input-panel show active fade" id="console">
14
14
  <div class="console">
15
15
  </div>
16
16
  <div class="mu-overlapped">
17
- <a class="console-reset submission-reset"><%= restart_icon %></a>
17
+ <%= restart_icon %>
18
18
  </div>
19
19
  </div>
20
20
  <div role="tabpanel" class="tab-pane mu-input-panel fade mu-elipsis" id="visible-extra">
@@ -3,8 +3,10 @@
3
3
 
4
4
  <% if should_render_problem_tabs? exercise, current_user %>
5
5
  <ul class="nav nav-tabs" role="tablist">
6
- <li role="presentation" class="active">
7
- <a data-target="#editor" aria-controls="editor" tabindex="0" role="tab" data-toggle="tab" class="editor-tab"><%= fa_icon 'pen-square' %> <%= t :solution %></a>
6
+ <li role="presentation">
7
+ <a class="editor-tab nav-link active" data-bs-target="#editor" aria-controls="editor" tabindex="0" role="tab" data-bs-toggle="tab">
8
+ <%= fa_icon 'pen-square', text: (t :solution) %>
9
+ </a>
8
10
  </li>
9
11
  <% if exercise.extra_visible? %>
10
12
  <%= extra_code_tab %>
@@ -17,7 +19,7 @@
17
19
  <% end %>
18
20
 
19
21
  <div class="tab-content">
20
- <div role="tabpanel" class="tab-pane mu-input-panel fade in active" id="editor">
22
+ <div role="tabpanel" class="tab-pane mu-input-panel fade show active" id="editor">
21
23
  <% if @assignment.pending_messages? %>
22
24
  <span class="pending-messages-text"> <%= t :pending_messages_explanation %>
23
25
  <a href="javascript:{}"
@@ -30,8 +32,10 @@
30
32
  <% end %>
31
33
  <%= form_for([exercise, @solution],
32
34
  remote: true,
33
- html: {role: 'form', class: "new_solution mu-editor mu-editor-overlap #{pending_messages_filter(@assignment)}"}) do |f| %>
34
- <%= render_exercise_input_editor f, exercise %>
35
+ html: {role: 'form', class: "new_solution mu-editor mu-editor-overlap mu-form #{pending_messages_filter(@assignment)}"}) do |f| %>
36
+ <div class="mb-3">
37
+ <%= render_exercise_input_editor f, exercise %>
38
+ </div>
35
39
 
36
40
  <div class="actions mu-submit-button">
37
41
  <%= render_submit_button(@assignment) %>
@@ -43,12 +47,12 @@
43
47
  <div class="console">
44
48
  </div>
45
49
  <div class="mu-overlapped">
46
- <a class="console-reset submission-reset"><%= restart_icon %></a>
50
+ <%= restart_icon %>
47
51
  </div>
48
52
  </div>
49
- <div class="field checkbox complementary complementary-checkbox mu-editor">
50
- <input checked="checked" data-index="1" id="include_solution" type="checkbox">
51
- <label for="include_solution"><p><%= t(:load_solution_into_console) %></p></label>
53
+ <div class="form-check">
54
+ <input checked="checked" data-index="1" id="include_solution" type="checkbox" class="form-check-input">
55
+ <label class="form-check-label" for="include_solution"><p><%= t(:load_solution_into_console) %></p></label>
52
56
  </div>
53
57
  </div>
54
58
  <div role="tabpanel" class="tab-pane mu-input-panel fade mu-elipsis" id="visible-extra">
@@ -20,10 +20,10 @@
20
20
 
21
21
  <div class="mu-kids-states mu-multiple-scenarios">
22
22
  <div class="mu-scenarios">
23
- <a class="mu-scenario-control previous hidden">
23
+ <a class="mu-scenario-control previous d-none">
24
24
  <%= fa_icon('caret-left', class: 'fa-lg fa-2x') %>
25
25
  </a>
26
- <a class="mu-scenario-control next hidden">
26
+ <a class="mu-scenario-control next d-none">
27
27
  <%= fa_icon('caret-right', class: 'fa-lg fa-2x') %>
28
28
  </a>
29
29
  <div class="mu-kids-state mu-state-initial mu-kids-gbs-board-initial mu-initial-state">
@@ -1,8 +1,8 @@
1
1
  <div class="row">
2
- <div class="col-md-6 exercise-assignment">
2
+ <div class="col-lg-6 exercise-assignment">
3
3
  <%= yield :assignment %>
4
4
  </div>
5
- <div class="mu-exercise-content col-md-6 ace-editor-col">
5
+ <div class="mu-exercise-content col-lg-6 ace-editor-col">
6
6
  <%= yield :exercise_content %>
7
7
  </div>
8
8
  </div>
@@ -1,3 +1,3 @@
1
- <div class="field form-group">
1
+ <div>
2
2
  <%= read_only_editor content, exercise.language.name %>
3
3
  </div>
@@ -1,4 +1,4 @@
1
- <div class="form-group">
1
+ <div>
2
2
  <%= hidden_field_tag :solution_content, content %>
3
3
  <%= raw exercise.free_form_editor_source %>
4
4
  </div>
@@ -1,8 +1,8 @@
1
- <div class="form-group">
1
+ <div class="mu-form">
2
2
  <% exercise.pretty_choices.each do |choice| %>
3
- <div class="field checkbox complementary complementary-checkbox">
4
- <%= check_box_tag(choice.id, '1', checked?(choice, content), disabled: true, class: 'solution-choice mu-read-only', 'data-index' => choice.index) %>
5
- <%= label_tag(choice.id, choice.text) %>
3
+ <div class="form-check">
4
+ <%= check_box_tag(choice.id, '1', checked?(choice, content), disabled: true, class: 'solution-choice form-check-input mu-read-only-input', 'data-index' => choice.index) %>
5
+ <%= label_tag(choice.id, choice.text, class: 'form-check-label') %>
6
6
  </div>
7
7
  <% end %>
8
8
  </div>
@@ -1,4 +1,4 @@
1
- <div class="field form-group editor-code">
1
+ <div class="editor-code">
2
2
 
3
3
  <% files = exercise.files_for(content) %>
4
4
 
@@ -6,7 +6,7 @@
6
6
  <span class="files-tabs">
7
7
  <ul class="nav nav-tabs">
8
8
  <% files.each_with_index do |file, index| %>
9
- <li role="presentation" class="file-tab <%= 'active' if index == 0 %>" data-target="#editor-file-<%= index %>" tabindex='0' data-toggle='tab'>
9
+ <li role="presentation" class="file-tab <%= 'active' if index == 0 %>" data-bs-target="#editor-file-<%= index %>" tabindex='0' data-bs-toggle='tab'>
10
10
  <a class="file-name" href="#"><%= file.name %></a>
11
11
  </li>
12
12
  <% end %>
@@ -1,8 +1,8 @@
1
- <div class="form-group">
1
+ <div class="mu-form">
2
2
  <% exercise.pretty_choices.each do |choice| %>
3
- <div class="field radio complementary complementary-radio">
4
- <%= radio_button_tag :content, choice.value, checked?(choice, content), disabled: true, class: 'mu-read-only' %>
5
- <%= label_tag(choice.id, choice.text) %>
3
+ <div class="form-check">
4
+ <%= radio_button_tag :content, choice.value, checked?(choice, content), disabled: true, class: 'form-check-input mu-read-only-input' %>
5
+ <%= label_tag(choice.id, choice.text, class: 'form-check-label') %>
6
6
  </div>
7
7
  <% end %>
8
8
  </div>
@@ -1,3 +1,3 @@
1
- <div class="field form-group">
1
+ <div>
2
2
  <%= Mumukit::ContentType::Markdown.to_html(Mumukit::ContentType::Markdown.code(content)) %>
3
3
  </div>
@@ -2,11 +2,8 @@
2
2
  <div class="modal-dialog">
3
3
  <div class="modal-content">
4
4
  <div class="modal-header">
5
- <button type="button" class="close" data-dismiss="modal" aria-label="Close">
6
- <span aria-hidden="true">&times;</span></button>
7
- <div class="modal-title">
8
- <h3 class="text-left" id="gridSystemModalLabel"><%= t :choose_your_avatar %> </h3>
9
- </div>
5
+ <h3 class="modal-title"><%= t :choose_your_avatar %></h3>
6
+ <button type="button" class="btn-close" data-bs-dismiss="modal" aria-label="Close"></button>
10
7
  </div>
11
8
  <div class="modal-body">
12
9
  <%= render partial: 'avatar_list' %>
@@ -2,21 +2,17 @@
2
2
  <div class="modal-dialog">
3
3
  <div class="modal-content">
4
4
  <% if Organization.current.kids? %>
5
- <button type="button" class="mu-kids-modal-button mu-close" data-dismiss="modal" aria-label="Close">
5
+ <button type="button" class="mu-kids-modal-button mu-close" data-bs-dismiss="modal" aria-label="Close">
6
6
  <span aria-hidden="true">
7
7
  <i class="fas fa-fw fa-times fa-3x"></i>
8
8
  </span>
9
9
  </button>
10
10
  <% end %>
11
11
  <div class="modal-header">
12
+ <h3 class="modal-title"><%= t :guide_finished, guide: guide.name %></h3>
12
13
  <% if Organization.current.grown_ups? %>
13
- <button type="button" class="close" data-dismiss="modal" aria-label="Close">
14
- <span aria-hidden="true">&times;</span>
15
- </button>
14
+ <button type="button" class="btn-close" data-bs-dismiss="modal" aria-label="Close"></button>
16
15
  <% end %>
17
- <div class="guide-corollary-title">
18
- <h3 class="text-left" id="gridSystemModalLabel"><%= t :guide_finished, guide: guide.name %> </h3>
19
- </div>
20
16
  </div>
21
17
  <div class="modal-body">
22
18
  <div class="container-fluid">
@@ -27,8 +23,8 @@
27
23
  </div>
28
24
  <div class="row">
29
25
  <div class="col-md-12 mu-last-box">
30
- <hr>
31
26
  <% if should_display_medal? @guide, Organization.current %>
27
+ <hr>
32
28
  <p><%= t :unlocked_medal_as_avatar %></p>
33
29
  <%= corollary_medal_for guide %>
34
30
  <% end %>
@@ -1,11 +1,13 @@
1
- <div class="modal fade mu-kids-context mu-kids-modal-border" id="mu-kids-context" tabindex="-1" role="dialog" aria-hidden="true">
1
+ <div class="modal fade mu-kids-context mu-kids-modal" id="mu-kids-context" tabindex="-1" role="dialog" aria-hidden="true">
2
2
  <div class="modal-dialog">
3
3
  <div class="modal-content">
4
4
  <div class="modal-header">
5
- <h4 class="text-center">
5
+ <h4 class="text-center d-flex">
6
6
  <strong><%= "#{exercise.number}. #{exercise.name}" %></strong>
7
- <%= teacher_info_button exercise %>
8
- <%= link_to_bibliotheca_exercise exercise %>
7
+ <div class="d-flex ms-2">
8
+ <%= teacher_info_button exercise %>
9
+ <%= link_to_bibliotheca_exercise exercise %>
10
+ </div>
9
11
  </h4>
10
12
  </div>
11
13
  <div class="modal-body">
@@ -19,7 +21,7 @@
19
21
  </div>
20
22
  </div>
21
23
  <div class="modal-footer">
22
- <button class="btn btn-success btn-block" data-waiting="<%= t :loading %>" data-dismiss="modal" aria-label="<%= t :continue_exercise %>"> <%= t :continue_exercise %> </button>
24
+ <button class="btn btn-complementary w-100" data-waiting="<%= t :loading %>" data-bs-dismiss="modal" aria-label="<%= t :continue_exercise %>"> <%= t :continue_exercise %> </button>
23
25
  </div>
24
26
  </div>
25
27
  </div>
@@ -1,7 +1,7 @@
1
- <div class="modal fade mu-kids-results mu-kids-modal-border" id="kids-results" tabindex="-1" role="dialog" aria-hidden="true">
1
+ <div class="modal fade mu-kids-results mu-kids-modal" id="kids-results" tabindex="-1" role="dialog" aria-hidden="true">
2
2
  <div class="modal-dialog">
3
3
  <div class="modal-content success">
4
- <button type="button" class="mu-kids-modal-button mu-previous hidden" onclick="mumuki.kids.resultsCarrousel.prevSlide()" aria-label="Previous">
4
+ <button type="button" class="mu-kids-modal-button mu-previous d-none" onclick="mumuki.kids.resultsCarrousel.prevSlide()" aria-label="Previous">
5
5
  <span aria-hidden="true">
6
6
  <i class="fas fa-fw fa-arrow-left fa-3x"></i>
7
7
  </span>
@@ -1,4 +1,4 @@
1
- <div class="modal fade mu-kids-results mu-kids-results-aborted" id="kids-results-aborted" tabindex="-1" role="dialog" aria-hidden="true">
1
+ <div class="modal fade mu-kids-results mu-kids-results-aborted mu-kids-modal" id="kids-results-aborted" tabindex="-1" role="dialog" aria-hidden="true">
2
2
  <div class="modal-dialog">
3
3
  <div class="modal-content">
4
4
  <div class="modal-header">
@@ -18,7 +18,7 @@
18
18
  </div>
19
19
  </div>
20
20
  <div class="modal-footer">
21
- <button class="btn btn-success btn-block submission_control" data-dismiss="modal" aria-label="<%= t :retry_exercise %>"> <%= t :retry_exercise %> </button>
21
+ <button class="btn btn-complementary w-100 submission_control" data-bs-dismiss="modal" aria-label="<%= t :retry_exercise %>"> <%= t :retry_exercise %> </button>
22
22
  </div>
23
23
  </div>
24
24
  </div>
@@ -1,12 +1,12 @@
1
- <div class="modal fade mu-kids-modal-border" id="mu-kids-context" tabindex="-1" role="dialog" aria-hidden="true">
1
+ <div class="modal fade mu-kids-modal" id="mu-kids-context" tabindex="-1" role="dialog" aria-hidden="true">
2
2
  <div class="modal-dialog">
3
3
  <div class="modal-content kindergarten">
4
- <button type="button" class="mu-kids-modal-button mu-close" data-waiting="" data-dismiss="modal" aria-label="Close">
4
+ <button type="button" class="mu-kids-modal-button mu-close" data-waiting="" data-bs-dismiss="modal" aria-label="Close">
5
5
  <span aria-hidden="true">
6
6
  <i class="fas fa-fw fa-times fa-3x"></i>
7
7
  </span>
8
8
  </button>
9
- <button type="button" class="mu-kids-modal-button mu-previous hidden" onclick="mumuki.kids.context.prevSlide()" aria-label="Previous">
9
+ <button type="button" class="mu-kids-modal-button mu-previous d-none" onclick="mumuki.kids.context.prevSlide()" aria-label="Previous">
10
10
  <span aria-hidden="true">
11
11
  <i class="fas fa-fw fa-arrow-left fa-3x"></i>
12
12
  </span>
@@ -1,12 +1,12 @@
1
- <div class="modal fade mu-kids-results mu-kids-modal-border" id="kids-results" tabindex="-1" role="dialog" aria-hidden="true">
1
+ <div class="modal fade mu-kids-results mu-kids-modal" id="kids-results" tabindex="-1" role="dialog" aria-hidden="true">
2
2
  <div class="modal-dialog">
3
3
  <div class="modal-content kindergarten">
4
- <button type="button" class="mu-kids-modal-button mu-close" data-waiting="" data-dismiss="modal" aria-label="Close">
4
+ <button type="button" class="mu-kids-modal-button mu-close" data-waiting="" data-bs-dismiss="modal" aria-label="Close">
5
5
  <span aria-hidden="true">
6
6
  <i class="fas fa-fw fa-times fa-3x"></i>
7
7
  </span>
8
8
  </button>
9
- <button type="button" class="mu-kids-modal-button mu-previous hidden" onclick="mumuki.kids.resultsCarrousel.prevSlide()" aria-label="Previous">
9
+ <button type="button" class="mu-kids-modal-button mu-previous d-none" onclick="mumuki.kids.resultsCarrousel.prevSlide()" aria-label="Previous">
10
10
  <span aria-hidden="true">
11
11
  <i class="fas fa-fw fa-arrow-left fa-3x"></i>
12
12
  </span>
@@ -1,7 +1,7 @@
1
- <div class="modal fade mu-kids-results-aborted mu-kids-modal-border" id="kids-results-aborted" tabindex="-1" role="dialog" aria-hidden="true">
1
+ <div class="modal fade mu-kids-results-aborted mu-kids-modal" id="kids-results-aborted" tabindex="-1" role="dialog" aria-hidden="true">
2
2
  <div class="modal-dialog">
3
3
  <div class="modal-content broken kindergarten">
4
- <button type="button" class="mu-kids-modal-button mu-close" data-dismiss="modal" aria-label="Close" data-waiting="">
4
+ <button type="button" class="mu-kids-modal-button mu-close" data-bs-dismiss="modal" aria-label="Close" data-waiting="">
5
5
  <span aria-hidden="true">
6
6
  <i class="fas fa-fw fa-times fa-3x"></i>
7
7
  </span>
@@ -2,11 +2,8 @@
2
2
  <div class="modal-dialog">
3
3
  <div class="modal-content">
4
4
  <div class="modal-header">
5
- <button type="button" class="close" data-dismiss="modal" aria-label="Close">
6
- <span aria-hidden="true">&times;</span></button>
7
- <div class="guide-corollary-title">
8
- <h3 class="text-left" id="gridSystemModalLabel"><%= t :level_up %></h3>
9
- </div>
5
+ <h3 class="modal-title"><%= t :level_up %></h3>
6
+ <button type="button" class="btn-close" data-bs-dismiss="modal" aria-label="Close"></button>
10
7
  </div>
11
8
  <div class="modal-body">
12
9
  <div class="container-fluid">