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.
- checksums.yaml +4 -4
- data/app/assets/javascripts/mumuki_laboratory/application/codemirror.js +10 -2
- data/app/assets/javascripts/mumuki_laboratory/application/discussions.js +10 -10
- data/app/assets/javascripts/mumuki_laboratory/application/gamification.js +3 -3
- data/app/assets/javascripts/mumuki_laboratory/application/kids.js +11 -7
- data/app/assets/javascripts/mumuki_laboratory/application/kindergarten.js +3 -3
- data/app/assets/javascripts/mumuki_laboratory/application/messages.js +3 -3
- data/app/assets/javascripts/mumuki_laboratory/application/mu-modal-carrousel.js +4 -4
- data/app/assets/javascripts/mumuki_laboratory/application/multiple-files.js +18 -5
- data/app/assets/javascripts/mumuki_laboratory/application/multiple-scenarios.js +1 -1
- data/app/assets/javascripts/mumuki_laboratory/application/primary.js +4 -4
- data/app/assets/javascripts/mumuki_laboratory/application/profile.js +0 -6
- data/app/assets/javascripts/mumuki_laboratory/application/progress.js +1 -1
- data/app/assets/javascripts/mumuki_laboratory/application/speech-bubble-renderer.js +1 -1
- data/app/assets/javascripts/mumuki_laboratory/application/submission.js +4 -3
- data/app/assets/javascripts/mumuki_laboratory/application/toast.js +3 -0
- data/app/assets/javascripts/mumuki_laboratory/application/tooltip.js +1 -1
- data/app/assets/javascripts/mumuki_laboratory/application/upload.js +2 -2
- data/app/assets/stylesheets/mumuki_laboratory/application.scss +0 -1
- data/app/assets/stylesheets/mumuki_laboratory/application/_errors.scss +1 -1
- data/app/assets/stylesheets/mumuki_laboratory/application/_layout.scss +1 -27
- data/app/assets/stylesheets/mumuki_laboratory/application/_modules.scss +0 -2
- data/app/assets/stylesheets/mumuki_laboratory/application/modules/_activity.scss +7 -5
- data/app/assets/stylesheets/mumuki_laboratory/application/modules/_avatar.scss +5 -0
- data/app/assets/stylesheets/mumuki_laboratory/application/modules/_breadcrumb.scss +2 -2
- data/app/assets/stylesheets/mumuki_laboratory/application/modules/_datepicker.scss +0 -4
- data/app/assets/stylesheets/mumuki_laboratory/application/modules/_discussion.scss +38 -60
- data/app/assets/stylesheets/mumuki_laboratory/application/modules/_editor.scss +16 -18
- data/app/assets/stylesheets/mumuki_laboratory/application/modules/_exercise_assignment.scss +2 -11
- data/app/assets/stylesheets/mumuki_laboratory/application/modules/_exercise_results.scss +1 -7
- data/app/assets/stylesheets/mumuki_laboratory/application/modules/_faqs.scss +3 -3
- data/app/assets/stylesheets/mumuki_laboratory/application/modules/_flash.scss +7 -46
- data/app/assets/stylesheets/mumuki_laboratory/application/modules/_kids.scss +19 -4
- data/app/assets/stylesheets/mumuki_laboratory/application/modules/_kids_results.scss +18 -23
- data/app/assets/stylesheets/mumuki_laboratory/application/modules/_kindergarten.scss +1 -9
- data/app/assets/stylesheets/mumuki_laboratory/application/modules/_overlap.scss +1 -1
- data/app/assets/stylesheets/mumuki_laboratory/application/modules/_progress_bar.scss +5 -5
- data/app/assets/stylesheets/mumuki_laboratory/application/modules/_terms.scss +3 -2
- data/app/assets/stylesheets/mumuki_laboratory/application/modules/_timer.scss +1 -3
- data/app/assets/stylesheets/mumuki_laboratory/application/modules/_user_menu.scss +13 -6
- data/app/assets/stylesheets/mumuki_laboratory/application/modules/_user_profile.scss +0 -2
- data/app/controllers/application_controller.rb +4 -2
- data/app/controllers/discussions_messages_controller.rb +3 -1
- data/app/helpers/application_helper.rb +5 -5
- data/app/helpers/assignment_result_helper.rb +3 -2
- data/app/helpers/assistance_box_helper.rb +1 -1
- data/app/helpers/concerns/with_student_path_navigation.rb +8 -3
- data/app/helpers/concerns/with_student_path_navigation/continue_navigation.rb +1 -1
- data/app/helpers/concerns/with_student_path_navigation/finish_navigation.rb +1 -1
- data/app/helpers/concerns/with_student_path_navigation/next_parent_navigation.rb +7 -0
- data/app/helpers/concerns/with_student_path_navigation/revisit_navigation.rb +1 -1
- data/app/helpers/discussions_helper.rb +61 -24
- data/app/helpers/editor_tabs_helper.rb +10 -6
- data/app/helpers/email_helper.rb +2 -2
- data/app/helpers/exercise_input_helper.rb +2 -3
- data/app/helpers/links_helper.rb +12 -9
- data/app/helpers/menu_bar_helper.rb +1 -1
- data/app/helpers/messages_helper.rb +1 -1
- data/app/helpers/multiple_file_editor_helper.rb +2 -1
- data/app/helpers/overlapped_buttons_helper.rb +22 -12
- data/app/helpers/profile_helper.rb +3 -3
- data/app/helpers/toast_helper.rb +27 -0
- data/app/helpers/user_activity_helper.rb +1 -1
- data/app/views/book/show.html.erb +2 -2
- data/app/views/certificates/verify.html.erb +1 -1
- data/app/views/chapters/show.html.erb +2 -2
- data/app/views/discussions/_message.html.erb +31 -6
- data/app/views/discussions/_new_message.html.erb +4 -4
- data/app/views/discussions/index.html.erb +8 -10
- data/app/views/discussions/new.html.erb +1 -1
- data/app/views/discussions/show.html.erb +20 -12
- data/app/views/exam_registrations/show.html.erb +10 -11
- data/app/views/exercise_solutions/_assistant_rules_box.html.erb +1 -1
- data/app/views/exercise_solutions/_contextualization_results_body.html.erb +1 -1
- data/app/views/exercise_solutions/_contextualization_results_container.html.erb +1 -1
- data/app/views/exercise_solutions/_kids_results_button.html.erb +2 -2
- data/app/views/exercise_solutions/_results.html.erb +1 -1
- data/app/views/exercises/_exercise_assignment.html.erb +2 -2
- data/app/views/exercises/_exercise_skipped.html.erb +1 -1
- data/app/views/exercises/_read_only.html.erb +108 -105
- data/app/views/exercises/show.html.erb +7 -7
- data/app/views/guides/_guide.html.erb +1 -1
- data/app/views/guides/_guide_container.html.erb +4 -4
- data/app/views/invitations/_invitation_form.html.erb +5 -4
- data/app/views/layouts/_authoring.html.erb +1 -1
- data/app/views/layouts/_discussions.html.erb +7 -7
- data/app/views/layouts/_kids.html.erb +5 -5
- data/app/views/layouts/_kindergarten.html.erb +10 -6
- data/app/views/layouts/_main.html.erb +6 -10
- data/app/views/layouts/_organizations_listing.html.erb +2 -2
- data/app/views/layouts/_progress_bar.html.erb +2 -0
- data/app/views/layouts/_submission_result_error.html.erb +1 -1
- data/app/views/layouts/_test_results.html.erb +1 -1
- data/app/views/layouts/_timer.html.erb +1 -1
- data/app/views/layouts/_user_menu.html.erb +3 -3
- data/app/views/layouts/application.html.erb +39 -42
- data/app/views/layouts/exercise_inputs/editors/_code.html.erb +4 -4
- data/app/views/layouts/exercise_inputs/editors/_free_form.html.erb +1 -1
- data/app/views/layouts/exercise_inputs/editors/_multiple_choice.html.erb +7 -9
- data/app/views/layouts/exercise_inputs/editors/_multiple_files.html.erb +10 -10
- data/app/views/layouts/exercise_inputs/editors/_single_choice.html.erb +6 -8
- data/app/views/layouts/exercise_inputs/editors/_text.html.erb +2 -3
- data/app/views/layouts/exercise_inputs/editors/_upload.html.erb +5 -5
- data/app/views/layouts/exercise_inputs/forms/_form.html.erb +1 -1
- data/app/views/layouts/exercise_inputs/forms/_interactive_form.html.erb +2 -2
- data/app/views/layouts/exercise_inputs/forms/_kids_form.html.erb +1 -1
- data/app/views/layouts/exercise_inputs/forms/_playground_form.html.erb +2 -2
- data/app/views/layouts/exercise_inputs/forms/_problem_form.html.erb +13 -9
- data/app/views/layouts/exercise_inputs/layouts/_input_primary.html.erb +2 -2
- data/app/views/layouts/exercise_inputs/layouts/_input_right.html.erb +2 -2
- data/app/views/layouts/exercise_inputs/read_only_editors/_code.html.erb +1 -1
- data/app/views/layouts/exercise_inputs/read_only_editors/_free_form.html.erb +1 -1
- data/app/views/layouts/exercise_inputs/read_only_editors/_multiple_choice.html.erb +4 -4
- data/app/views/layouts/exercise_inputs/read_only_editors/_multiple_files.html.erb +2 -2
- data/app/views/layouts/exercise_inputs/read_only_editors/_single_choice.html.erb +4 -4
- data/app/views/layouts/exercise_inputs/read_only_editors/_text.erb +1 -1
- data/app/views/layouts/modals/_avatar_picker.html.erb +2 -5
- data/app/views/layouts/modals/_guide_corollary.html.erb +4 -8
- data/app/views/layouts/modals/_kids_context.html.erb +7 -5
- data/app/views/layouts/modals/_kids_results.html.erb +2 -2
- data/app/views/layouts/modals/_kids_results_aborted.html.erb +2 -2
- data/app/views/layouts/modals/_kindergarten_context.html.erb +3 -3
- data/app/views/layouts/modals/_kindergarten_results.html.erb +3 -3
- data/app/views/layouts/modals/_kindergarten_results_aborted.html.erb +2 -2
- data/app/views/layouts/modals/_level_up.html.erb +2 -5
- data/app/views/layouts/modals/_new_message.html.erb +5 -5
- data/app/views/notifications/_dropdown.html.erb +3 -3
- data/app/views/users/_activity_indicator.html.erb +14 -14
- data/app/views/users/_edit_user_form.html.erb +6 -6
- data/app/views/users/_profile_fields.html.erb +6 -6
- data/app/views/users/_user_form.html.erb +2 -2
- data/app/views/users/activity.html.erb +29 -29
- data/app/views/users/certificates.html.erb +26 -24
- data/app/views/users/discussions.html.erb +23 -21
- data/app/views/users/messages.html.erb +22 -20
- data/app/views/users/show.html.erb +5 -3
- data/app/views/users/terms.html.erb +4 -2
- data/config/initializers/inflections.rb +3 -0
- data/lib/mumuki/laboratory.rb +1 -1
- data/lib/mumuki/laboratory/locales/en.yml +15 -1
- data/lib/mumuki/laboratory/locales/es-CL.yml +15 -1
- data/lib/mumuki/laboratory/locales/es.yml +15 -1
- data/lib/mumuki/laboratory/locales/pt.yml +15 -2
- data/lib/mumuki/laboratory/version.rb +1 -1
- data/spec/capybara_helper.rb +1 -0
- data/spec/controllers/discussions_messages_controller_spec.rb +64 -2
- data/spec/dummy/db/schema.rb +20 -3
- data/spec/features/discussion_flow_spec.rb +20 -2
- data/spec/features/exercise_flow_spec.rb +1 -1
- data/spec/features/guide_reset_spec.rb +1 -1
- data/spec/features/terms_flow_spec.rb +1 -2
- data/spec/helpers/breadcrumbs_helper_spec.rb +2 -2
- data/spec/helpers/with_navigation_spec.rb +51 -13
- data/spec/javascripts/editors-spec.js +3 -3
- data/spec/javascripts/kids-button-spec.js +2 -2
- data/spec/javascripts/upload-spec.js +8 -8
- metadata +118 -117
- data/app/assets/stylesheets/mumuki_laboratory/application/hovers.scss +0 -12
- data/app/assets/stylesheets/mumuki_laboratory/application/modules/_checkboxes.scss +0 -34
- data/app/assets/stylesheets/mumuki_laboratory/application/modules/_guide_corollary.scss +0 -9
@@ -13,15 +13,15 @@
|
|
13
13
|
<% end %>
|
14
14
|
|
15
15
|
<% unless @exercise.input_kids? %>
|
16
|
-
<div class="
|
17
|
-
<div class="mu-inline-block-right hidden-xs">
|
18
|
-
<h1><%= language_icon @exercise.language %></h1>
|
19
|
-
</div>
|
16
|
+
<div class="d-flex">
|
20
17
|
<div class="mu-inline-block-left">
|
21
|
-
<h1 class="
|
22
|
-
<h1 class="
|
18
|
+
<h1 class="d-none d-sm-block"><%= full_title_for @exercise %></h1>
|
19
|
+
<h1 class="d-block d-sm-none"><%= short_title_for @exercise %></h1>
|
23
20
|
<%= render partial: 'exercises/exercise_title_icons' %>
|
24
21
|
</div>
|
22
|
+
<div class="d-none d-sm-block">
|
23
|
+
<h1><%= language_icon @exercise.language %></h1>
|
24
|
+
</div>
|
25
25
|
</div>
|
26
26
|
<% end %>
|
27
27
|
|
@@ -46,7 +46,7 @@
|
|
46
46
|
<%= hidden_field_tag "mu-exercise-layout", @exercise.layout %>
|
47
47
|
<%= hidden_field_tag "mu-exercise-settings", @exercise.settings.to_json %>
|
48
48
|
|
49
|
-
<div
|
49
|
+
<div class="d-none" id="processing-template">
|
50
50
|
<div class="bs-callout bs-callout-info">
|
51
51
|
<h4><i class="fas fa-sync-alt fa-spin"></i> <strong><%= t :processing_your_solution %></strong></h4>
|
52
52
|
<%= t :refresh_or_wait %>
|
@@ -31,7 +31,7 @@
|
|
31
31
|
<% if !@stats.try(:done?) && @next_exercise %>
|
32
32
|
<div class="text-box">
|
33
33
|
<div class="actions">
|
34
|
-
<%= link_to t(lesson_practice_key_for(@stats)), exercise_path(@next_exercise), class: 'btn btn-
|
34
|
+
<%= link_to t(lesson_practice_key_for(@stats)), exercise_path(@next_exercise), class: 'btn btn-complementary' %>
|
35
35
|
</div>
|
36
36
|
</div>
|
37
37
|
<% end %>
|
@@ -4,14 +4,14 @@
|
|
4
4
|
|
5
5
|
<%= render layout: 'guides/guide', locals: { subject: subject } do %>
|
6
6
|
|
7
|
-
<div class="
|
8
|
-
<div class="mu-inline-block-right hidden-xs">
|
9
|
-
<h1><%= language_icon @guide.language %></h1>
|
10
|
-
</div>
|
7
|
+
<div class="d-flex">
|
11
8
|
<div class="mu-inline-block-left">
|
12
9
|
<h1><%= short_title_for @guide %></h1>
|
13
10
|
<%= render partial: 'guides/guide_title_icons' %>
|
14
11
|
</div>
|
12
|
+
<div class="d-none d-sm-block">
|
13
|
+
<h1><%= language_icon @guide.language %></h1>
|
14
|
+
</div>
|
15
15
|
</div>
|
16
16
|
<div class="row">
|
17
17
|
<div class="col-md-12">
|
@@ -1,4 +1,4 @@
|
|
1
|
-
<%= form_for current_user, method: 'post', url: {action: 'join'} do |f| %>
|
1
|
+
<%= form_for current_user, method: 'post', url: {action: 'join'}, html: {class: 'mu-form'} do |f| %>
|
2
2
|
<div class="tab-content">
|
3
3
|
<div role="tabpanel" class="tab-pane active" id="info">
|
4
4
|
<div class="row mu-tab-body">
|
@@ -13,12 +13,13 @@
|
|
13
13
|
<div>
|
14
14
|
<h3><%= t :terms_and_conditions %></h3>
|
15
15
|
<pre class="terms-of-service"><%= simple_format @organization.terms_of_service %></pre>
|
16
|
-
<div>
|
17
|
-
<input id="accept_terms" type="checkbox"
|
16
|
+
<div class="form-check mb-3">
|
17
|
+
<input id="accept_terms" type="checkbox" class="form-check-input">
|
18
|
+
<label class="form-check-label"><%= t :accept_terms %></label>
|
18
19
|
</div>
|
19
20
|
</div>
|
20
21
|
<% end %>
|
21
22
|
<div>
|
22
|
-
<%= f.submit t(:confirm), id: 'confirm_data', class: 'btn btn-
|
23
|
+
<%= f.submit t(:confirm), id: 'confirm_data', class: 'btn btn-complementary', disabled: @organization.terms_of_service.present? %>
|
23
24
|
</div>
|
24
25
|
<% end %>
|
@@ -2,14 +2,14 @@
|
|
2
2
|
<%= discussions_reset_query_link %>
|
3
3
|
<div class="discussions-toolbar">
|
4
4
|
<div class="discussions-toolbar-status">
|
5
|
-
<div class="
|
5
|
+
<div class="d-none d-lg-block">
|
6
6
|
<% discussions_statuses.each do |status| %>
|
7
7
|
<%= discussion_status_filter_link(status, @discussions) %>
|
8
8
|
<% end %>
|
9
9
|
</div>
|
10
10
|
</div>
|
11
11
|
<div>
|
12
|
-
<div class="
|
12
|
+
<div class="d-lg-none">
|
13
13
|
<%= discussion_dropdown_filter :status, discussions_statuses do |status_filter| %>
|
14
14
|
<%= t status_filter %>
|
15
15
|
<% end %>
|
@@ -22,9 +22,9 @@
|
|
22
22
|
<% end %>
|
23
23
|
|
24
24
|
<% if current_user&.moderator_here? %>
|
25
|
-
<div class="discussion-requires-attention
|
25
|
+
<div class="discussion-requires-attention float-end">
|
26
26
|
<%= label_tag :requires_moderator_response, t(:requires_attention) %>
|
27
|
-
<%= check_box_tag :requires_moderator_response, true, discussion_filter_params[:requires_moderator_response], class: 'form-input', onclick: 'mumuki.Forum.discussionsToggleCheckbox($(this))' %>
|
27
|
+
<%= check_box_tag :requires_moderator_response, true, discussion_filter_params[:requires_moderator_response], class: 'form-check-input', onclick: 'mumuki.Forum.discussionsToggleCheckbox($(this))' %>
|
28
28
|
</div>
|
29
29
|
<% end %>
|
30
30
|
|
@@ -56,10 +56,10 @@
|
|
56
56
|
<span class="discussion-status-icon">
|
57
57
|
<%= discussion_status_fa_icon(discussion) %>
|
58
58
|
</span>
|
59
|
-
<span class="
|
59
|
+
<span class="d-none d-lg-inline"><%= discussion.exercise.guide.name %> -</span>
|
60
60
|
<span><%= discussion.exercise.name %></span>
|
61
61
|
<% if discussion.last_moderator_access_visible_for?(current_user) %>
|
62
|
-
<div class="
|
62
|
+
<div class="float-end discussion-moderator-access" >
|
63
63
|
<%= profile_picture_for(discussion.last_moderator_access_by, height: 32) %>
|
64
64
|
<span class="moderator-initials">
|
65
65
|
<%= discussion.last_moderator_access_by.name_initials %>
|
@@ -79,7 +79,7 @@
|
|
79
79
|
</div>
|
80
80
|
|
81
81
|
<div class="discussion-pagination">
|
82
|
-
<%= paginate @filtered_discussions %>
|
82
|
+
<%= paginate @filtered_discussions, nav_class: 'pagination' %>
|
83
83
|
</div>
|
84
84
|
|
85
85
|
<% end %>
|
@@ -2,11 +2,11 @@
|
|
2
2
|
<div class="mu-kids-character-speech-bubble <%= 'no-tabs' unless exercise.hint? %>">
|
3
3
|
<% if exercise.hint? %>
|
4
4
|
<ul class="mu-kids-character-speech-bubble-tabs">
|
5
|
-
<li class="mu-kids-description active" data-target="description" title="<%= t :task %>">
|
5
|
+
<li class="mu-kids-description active" data-bs-toggle="tooltip" data-bs-target="description" title="<%= t :task %>">
|
6
6
|
<i class="far fa-fw fa-file-alt"></i>
|
7
7
|
</li>
|
8
8
|
<li class="separator"></li>
|
9
|
-
<li class="mu-kids-hint blink" data-target="hint" title="<%= t :need_a_hint %>">
|
9
|
+
<li class="mu-kids-hint blink" data-bs-toggle="tooltip" data-bs-placement="bottom" data-bs-target="hint" title="<%= t :need_a_hint %>">
|
10
10
|
<i class="far fa-fw fa-lightbulb"></i>
|
11
11
|
</li>
|
12
12
|
</ul>
|
@@ -15,10 +15,10 @@
|
|
15
15
|
<i class="mu-kids-prev-speech fas fa-fw fa-caret-up"></i>
|
16
16
|
<i class="mu-kids-next-speech fas fa-fw fa-caret-down"></i>
|
17
17
|
<div class="description"><%= exercise.description_task %></div>
|
18
|
-
<div class="hint"
|
18
|
+
<div class="hint"><%= exercise.hint_html %></div>
|
19
19
|
</div>
|
20
|
-
<div class="mu-kids-character-speech-bubble-failed <%= current_user? && @assignment.status %>
|
20
|
+
<div class="mu-kids-character-speech-bubble-failed <%= current_user? && @assignment.status %> d-none"></div>
|
21
21
|
</div>
|
22
|
-
<div id="mu-kids-discussion-link-html" class="
|
22
|
+
<div id="mu-kids-discussion-link-html" class="d-none">
|
23
23
|
<%= kids_read_discussions_link(exercise) %>
|
24
24
|
</div>
|
@@ -5,11 +5,13 @@
|
|
5
5
|
<span class="mu-kindergarten-exercise-description"><%= exercise.description_task %></span>
|
6
6
|
<div class="mu-kindergarten-buttons">
|
7
7
|
<button class="mu-kindergarten-show-context" onclick="mumuki.kids.context.show()">
|
8
|
-
<img class="mu-kindergarten-button-image" src="https://mumuki.io/static/show-context.svg"
|
8
|
+
<img class="mu-kindergarten-button-image" src="https://mumuki.io/static/show-context.svg"
|
9
|
+
alt="" data-bs-toggle="tooltip" title="<%= t :see_context %>">
|
9
10
|
</button>
|
10
11
|
<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"
|
12
|
-
|
12
|
+
<img class="mu-kindergarten-button-image mu-kindergarten-play" src="https://mumuki.io/static/audio-play.svg"
|
13
|
+
alt="" data-bs-toggle="tooltip" data-bs-placement="bottom" title="<%= t :listen_statement %>">
|
14
|
+
<img class="mu-kindergarten-button-image mu-kindergarten-stop d-none" src="https://mumuki.io/static/audio-stop.svg" alt="">
|
13
15
|
</button>
|
14
16
|
</div>
|
15
17
|
</div>
|
@@ -17,7 +19,8 @@
|
|
17
19
|
<div class="mu-kindergarten-hint">
|
18
20
|
<% if exercise.hint? %>
|
19
21
|
<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"
|
22
|
+
<img class="mu-hint-light on" src="https://mumuki.io/static/lamparita_on.svg"
|
23
|
+
alt="" data-bs-toggle="tooltip" data-bs-placement="top" title="<%= t :need_a_hint %>">
|
21
24
|
</button>
|
22
25
|
<div class="mu-kindergarten-light-speech-bubble">
|
23
26
|
<span class="mu-kindergarten-exercise-hint">
|
@@ -28,11 +31,12 @@
|
|
28
31
|
</button>
|
29
32
|
</div>
|
30
33
|
<% else %>
|
31
|
-
<img class="mu-hint-light off" src="https://mumuki.io/static/lamparita_off.svg"
|
34
|
+
<img class="mu-hint-light off" src="https://mumuki.io/static/lamparita_off.svg"
|
35
|
+
alt="" data-bs-toggle="tooltip" data-bs-placement="left" title="<%= t :no_need_hint %>">
|
32
36
|
<% end %>
|
33
37
|
</div>
|
34
38
|
</div>
|
35
39
|
|
36
|
-
<div id="mu-kids-discussion-link-html" class="
|
40
|
+
<div id="mu-kids-discussion-link-html" class="d-none">
|
37
41
|
<%= kids_read_discussions_link(exercise) %>
|
38
42
|
</div>
|
@@ -28,18 +28,14 @@
|
|
28
28
|
|
29
29
|
<%= yield :navbar %>
|
30
30
|
|
31
|
-
<div class="<%= exercise_container_type %><%=
|
32
|
-
<div
|
31
|
+
<div class="<%= exercise_container_type %><%= ' mb-5' unless input_kids? %>" id="wrap">
|
32
|
+
<div class="toast-container bottom-0 start-0 p-3">
|
33
33
|
<% if notice %>
|
34
|
-
|
35
|
-
<%= notice.html_safe %>
|
36
|
-
<button type="button" class="close" data-dismiss="alert">×</button>
|
37
|
-
</div>
|
34
|
+
<%= toast_notice(notice) %>
|
38
35
|
<% elsif alert %>
|
39
|
-
|
40
|
-
|
41
|
-
|
42
|
-
</div>
|
36
|
+
<%= toast_alert(alert) %>
|
37
|
+
<% elsif info %>
|
38
|
+
<%= toast_info(info) %>
|
43
39
|
<% end %>
|
44
40
|
</div>
|
45
41
|
|
@@ -1,10 +1,10 @@
|
|
1
1
|
<% current_immersive_organizations.each do |organization| %>
|
2
2
|
<div class="row">
|
3
3
|
<div class="col-md-6 organization-row">
|
4
|
-
<%= image_tag(organization.banner_url, height: 50, class: '
|
4
|
+
<%= image_tag(organization.banner_url, height: 50, class: 'float-start') %>
|
5
5
|
</div>
|
6
6
|
<div class="col-md-6 organization-row">
|
7
|
-
<%= link_to(t(:go_to, organization: organization.name), current_immersive_path(organization), class: 'btn btn-
|
7
|
+
<%= link_to(t(:go_to, organization: organization.name), current_immersive_path(organization), class: 'btn btn-complementary float-end') %>
|
8
8
|
</div>
|
9
9
|
</div>
|
10
10
|
<% end %>
|
@@ -6,6 +6,8 @@
|
|
6
6
|
<%= turbolinks_enable_for exercise %>
|
7
7
|
href="<%= exercise_path(exercise)%>"
|
8
8
|
aria-label="<%= exercise.navigable_name %>"
|
9
|
+
data-bs-toggle="tooltip"
|
10
|
+
data-bs-placement="bottom"
|
9
11
|
title="<%= exercise.navigable_name %>"
|
10
12
|
data-mu-exercise-id="<%= exercise.id %>"
|
11
13
|
class="<%= class_for_progress_list_item(assignment, exercise == actual)%>">
|
@@ -13,7 +13,7 @@
|
|
13
13
|
<%= status_icon(test_result[:status]) %>
|
14
14
|
<%= render_test_result_header test_result %>
|
15
15
|
<% unless contextualization.visible_success_output? %>
|
16
|
-
<a data-toggle="collapse" href="#example-result-<%= index %>"
|
16
|
+
<a data-bs-toggle="collapse" href="#example-result-<%= index %>" class="badge bg-light text-dark mu-view-details"><%= t :view_details %></a>
|
17
17
|
<% end %>
|
18
18
|
</span>
|
19
19
|
<% else %>
|
@@ -2,7 +2,7 @@
|
|
2
2
|
<div class="mu-user-menu">
|
3
3
|
<div class="mu-user-menu-content">
|
4
4
|
<%= user_menu_header %>
|
5
|
-
<div class="
|
5
|
+
<div class="mu-user-menu-items mu-hidden-sm-screen">
|
6
6
|
<%= profile_user_menu_link %>
|
7
7
|
<%= user_menu_divider %>
|
8
8
|
<%= messages_user_menu_link %>
|
@@ -11,7 +11,7 @@
|
|
11
11
|
<%= activity_user_menu_link %>
|
12
12
|
</div>
|
13
13
|
</div>
|
14
|
-
<div class="mu-user-menu-divider vertical
|
14
|
+
<div class="mu-user-menu-divider vertical d-none d-md-block"></div>
|
15
15
|
</div>
|
16
|
+
<div class="mu-user-menu-divider horizontal d-block d-md-none"></div>
|
16
17
|
</div>
|
17
|
-
<div class="mu-user-menu-divider horizontal visible-sm visible-xs"></div>
|
@@ -1,54 +1,51 @@
|
|
1
1
|
<%= content_for :navbar do %>
|
2
2
|
<%= hidden_field_tag("mu-current-exp", UserStats.exp_for(@current_user)) if in_gamified_context? %>
|
3
|
-
<div class="<%= exercise_container_type %>">
|
4
|
-
<nav class="mu-navbar">
|
5
|
-
<div class="
|
6
|
-
<
|
7
|
-
|
8
|
-
</
|
9
|
-
|
10
|
-
|
11
|
-
|
12
|
-
|
13
|
-
|
14
|
-
|
15
|
-
|
16
|
-
|
17
|
-
|
18
|
-
|
19
|
-
|
20
|
-
|
21
|
-
|
22
|
-
|
23
|
-
|
24
|
-
|
25
|
-
|
3
|
+
<div class="<%= exercise_container_type %> px-0">
|
4
|
+
<nav class="navbar navbar-light navbar-expand-lg mu-navbar">
|
5
|
+
<div class="container-fluid">
|
6
|
+
<button class="navbar-toggler" type="button" data-bs-toggle="collapse" data-bs-target="#muNavbar" aria-controls="muNavbar" aria-expanded="false" aria-label="Toggle navigation">
|
7
|
+
<span class="navbar-toggler-icon"></span>
|
8
|
+
</button>
|
9
|
+
<div class="mu-navbar-avatar order-lg-2">
|
10
|
+
<% if current_logged_user? %>
|
11
|
+
<% if in_gamified_context? %>
|
12
|
+
<div class="mu-navbar-element">
|
13
|
+
<i class="fas fa-star fa-fw fa-2x mu-navbar-icon mu-level-tooltip" data-bs-toggle="tooltip" data-bs-placement="bottom" level="<%= t(:level) %>"></i>
|
14
|
+
<span class="mu-level-number"></span>
|
15
|
+
</div>
|
16
|
+
<% end %>
|
17
|
+
<%= render partial: 'notifications/dropdown' %>
|
18
|
+
<div class="dropdown mu-navbar-element">
|
19
|
+
<div id="profileDropdown" class="profile-dropdown dropdown-toggle" data-bs-toggle="dropdown" aria-label="<%= t(:user) %>" role="menu" tabindex="0">
|
20
|
+
<%= profile_picture_for current_user %>
|
21
|
+
</div>
|
22
|
+
<ul class="dropdown-menu dropdown-menu-end" aria-labelledby="profileDropdown">
|
23
|
+
<%= menu_bar_list_items %>
|
24
|
+
<% if any_menu_bar_links? %>
|
25
|
+
<li class="dropdown-divider"></li>
|
26
|
+
<% end %>
|
27
|
+
<% if faqs_enabled_here? %>
|
28
|
+
<%= menu_link_to_faqs %>
|
29
|
+
<li class="dropdown-divider"></li>
|
30
|
+
<% end %>
|
31
|
+
<%= logout_menu_link %>
|
32
|
+
</ul>
|
26
33
|
</div>
|
34
|
+
<% else %>
|
35
|
+
<%= login_button %>
|
27
36
|
<% end %>
|
28
|
-
|
29
|
-
|
30
|
-
|
31
|
-
|
32
|
-
|
33
|
-
</div>
|
34
|
-
<ul class="dropdown-menu dropdown-menu-right" aria-labelledby="profileDropdown">
|
35
|
-
<%= menu_bar_list_items %>
|
36
|
-
<% if any_menu_bar_links? %>
|
37
|
-
<li class="divider"></li>
|
38
|
-
<% end %>
|
39
|
-
<% if faqs_enabled_here? %>
|
40
|
-
<%= menu_link_to_faqs %>
|
41
|
-
<li class="divider"></li>
|
42
|
-
<% end %>
|
43
|
-
<%= logout_menu_link %>
|
37
|
+
</div>
|
38
|
+
<div class="collapse navbar-collapse mu-navbar-breadcrumb-container" id="muNavbar">
|
39
|
+
<div class="mu-navbar-breadcrumb order-lg-1">
|
40
|
+
<ul class="navbar-nav mu-breadcrumb-list">
|
41
|
+
<%= yield :breadcrumbs %>
|
44
42
|
</ul>
|
45
43
|
</div>
|
46
|
-
|
47
|
-
<%= login_button %>
|
48
|
-
<% end %>
|
44
|
+
</div>
|
49
45
|
</div>
|
50
46
|
</nav>
|
51
47
|
</div>
|
48
|
+
|
52
49
|
<% end %>
|
53
50
|
|
54
51
|
<% content_for :footer do %>
|
@@ -1,4 +1,4 @@
|
|
1
|
-
<div class="
|
1
|
+
<div class="editor-code">
|
2
2
|
<%= form.editor :content, 'dynamic',
|
3
3
|
placeholder: t(:editor_placeholder),
|
4
4
|
class: 'form-control editor',
|
@@ -6,8 +6,8 @@
|
|
6
6
|
data: {lines: 17},
|
7
7
|
autocomplete: 'off' %>
|
8
8
|
<div class="mu-overlapped">
|
9
|
-
|
10
|
-
|
11
|
-
|
9
|
+
<%= expand_icon %>
|
10
|
+
<%= format_icon %>
|
11
|
+
<%= restart_icon 'editor', {'data-confirm': t(:confirm_reset)} %>
|
12
12
|
</div>
|
13
13
|
</div>
|
@@ -1,10 +1,8 @@
|
|
1
|
-
<
|
2
|
-
|
3
|
-
|
4
|
-
|
5
|
-
|
6
|
-
|
7
|
-
|
8
|
-
<% end %>
|
9
|
-
</div>
|
1
|
+
<input class="d-none" id="solution_content" type="text" name="solution[content]">
|
2
|
+
<% @exercise.pretty_choices.each do |choice| %>
|
3
|
+
<div class="form-check">
|
4
|
+
<%= check_box_tag(choice.id, '1', checked?(choice, @current_content), class: 'solution-choice form-check-input', 'data-index' => choice.index) %>
|
5
|
+
<%= label_tag(choice.id, choice.text, class: 'form-check-label') %>
|
6
|
+
</div>
|
7
|
+
<% end %>
|
10
8
|
|