mumuki-laboratory 9.0.6 → 9.2.0
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/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 +12 -6
- 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 +6 -30
- 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 -5
- 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/_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/controllers/exam_authorization_requests_controller.rb +1 -5
- data/app/controllers/users_controller.rb +4 -0
- 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/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/helpers/user_menu_helper.rb +4 -0
- 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_authorization_requests/_approved.html.erb +1 -0
- data/app/views/exam_authorization_requests/_pending.html.erb +4 -0
- data/app/views/exam_authorization_requests/_rejected.html.erb +1 -0
- data/app/views/exam_registrations/show.html.erb +11 -12
- 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 +7 -7
- 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 +2 -2
- data/app/views/layouts/_timer.html.erb +1 -1
- data/app/views/layouts/_user_menu.html.erb +4 -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/notifications/_exam_authorization_request.html.erb +1 -1
- 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/exam_authorizations.html.erb +42 -0
- 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/routes.rb +2 -1
- data/lib/mumuki/laboratory.rb +1 -1
- data/lib/mumuki/laboratory/locales/en.yml +17 -2
- data/lib/mumuki/laboratory/locales/es-CL.yml +17 -2
- data/lib/mumuki/laboratory/locales/es.yml +17 -2
- data/lib/mumuki/laboratory/locales/pt.yml +17 -3
- 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/controllers/exam_authorization_requests_controller_spec.rb +1 -18
- data/spec/controllers/users_controller_spec.rb +1 -0
- data/spec/dummy/db/schema.rb +4 -0
- 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/notifications_flow_spec.rb +2 -3
- 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 +125 -122
- 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
- data/app/views/exam_authorization_requests/show.html.erb +0 -17
@@ -27,6 +27,10 @@ module UserMenuHelper
|
|
27
27
|
user_menu_item t(:certificates), certificates_user_path, 'certificates'
|
28
28
|
end
|
29
29
|
|
30
|
+
def exam_authorizations_user_menu_link
|
31
|
+
user_menu_item t(:exams), exam_authorizations_user_path, 'exam_authorizations'
|
32
|
+
end
|
33
|
+
|
30
34
|
private
|
31
35
|
|
32
36
|
def user_menu_item(label, path, active_on)
|
@@ -2,12 +2,12 @@
|
|
2
2
|
<%= header_breadcrumbs(link_for_organization: false) %>
|
3
3
|
<% end %>
|
4
4
|
|
5
|
-
<div class="col-
|
5
|
+
<div class="col-lg-8 offset-lg-2">
|
6
6
|
<%= render partial: 'book/header' %>
|
7
7
|
|
8
8
|
<% @book.next_lesson_for(current_user).try do |lesson| %>
|
9
9
|
<div class="actions">
|
10
|
-
<a href="<%= lesson_path(lesson) %>" class="btn btn-
|
10
|
+
<a href="<%= lesson_path(lesson) %>" class="btn btn-complementary">
|
11
11
|
<%= t book_practice_key_for(current_user) %>
|
12
12
|
</a>
|
13
13
|
</div>
|
@@ -22,7 +22,7 @@
|
|
22
22
|
<a href="<%= linkedin_post_url @certificate %>" target="_blank">
|
23
23
|
<img src="https://download.linkedin.com/desktop/add2profile/buttons/<%= t :linkedin_profile_button_locale %>.png" alt="LinkedIn Add to Profile button">
|
24
24
|
</a>
|
25
|
-
<a class="btn btn-
|
25
|
+
<a class="btn btn-complementary mu-certificate-download-btn pull-right" href="<%= download_certificate_path @certificate.code %>" target="_blank">
|
26
26
|
<i class="fas fa-fw fa-lg fa-download mu-certificate-download-btn-icon"></i>
|
27
27
|
<span class="mu-certificate-download-btn-text"><%= t :certificate %></span>
|
28
28
|
</a>
|
@@ -4,8 +4,8 @@
|
|
4
4
|
|
5
5
|
<div class="row">
|
6
6
|
<div class="mu-inline-block-left">
|
7
|
-
<h1 class="
|
8
|
-
<h1 class="
|
7
|
+
<h1 class="d-none d-sm-block"><%= full_title_for @chapter %></h1>
|
8
|
+
<h1 class="d-block d-sm-none"><%= short_title_for @chapter %></h1>
|
9
9
|
|
10
10
|
<% if @chapter.monolesson? %>
|
11
11
|
<%= render partial: 'guides/guide_title_icons' %>
|
@@ -10,22 +10,28 @@
|
|
10
10
|
<%= t(:time_since, time: time_ago_in_words(message.created_at)) %>
|
11
11
|
</span>
|
12
12
|
<span class="actions">
|
13
|
-
<% if message.authorized?
|
13
|
+
<% if message.authorized?(current_user) && !message.deleted? %>
|
14
14
|
<% if current_user&.moderator_here? %>
|
15
|
-
<a class="discussion-message-approved <%= 'selected' if message.approved? %>"
|
15
|
+
<a class="discussion-message-approved <%= 'selected' if message.approved? %>"
|
16
|
+
onclick="mumuki.Forum.discussionMessageToggleApprove('<%= approve_discussion_message_url(@discussion, message) %>', $(this))">
|
16
17
|
<%= fa_icon(:check, class: 'fa-lg') %>
|
17
18
|
</a>
|
18
19
|
<% if message.from_initiator? %>
|
19
|
-
<a class="discussion-message-not-actually-a-question <%= 'selected' if message.not_actually_a_question? %>"
|
20
|
+
<a class="discussion-message-not-actually-a-question <%= 'selected' if message.not_actually_a_question? %>"
|
21
|
+
onclick="mumuki.Forum.discussionMessageToggleNotActuallyAQuestion('<%= question_discussion_message_url(@discussion, message) %>', $(this))">
|
20
22
|
<%= fa_icon('question-circle', type: 'regular', class: 'fa-lg') %>
|
21
23
|
</a>
|
22
24
|
<% end %>
|
23
25
|
<% end %>
|
24
|
-
|
26
|
+
<% if message.from_user? current_user %>
|
27
|
+
<%= discussion_delete_message_link @discussion, message %>
|
28
|
+
<% else %>
|
29
|
+
<%= discussion_delete_message_dropdown @discussion, message %>
|
30
|
+
<% end %>
|
25
31
|
<% end %>
|
26
32
|
<% if should_show_approved_for?(current_user, message) %>
|
27
33
|
<span class="discussion-message-approved selected">
|
28
|
-
<%= fa_icon(:check, class: 'fa-lg', 'data-toggle': 'tooltip', title: (t :approved_message)) %>
|
34
|
+
<%= fa_icon(:check, class: 'fa-lg', 'data-bs-toggle': 'tooltip', title: (t :approved_message)) %>
|
29
35
|
</span>
|
30
36
|
<% end %>
|
31
37
|
</span>
|
@@ -33,7 +39,26 @@
|
|
33
39
|
</div>
|
34
40
|
<div class="discussion-message-bubble-content">
|
35
41
|
<div class="discussion-message-content">
|
36
|
-
|
42
|
+
<% if message.deleted? %>
|
43
|
+
<em><%= message_deleted_text message %></em>
|
44
|
+
<% if message.from_user? current_user %>
|
45
|
+
<p><%= t :deleted_message_warning %></p>
|
46
|
+
<% end %>
|
47
|
+
<% if current_user&.moderator_here? %>
|
48
|
+
<hr>
|
49
|
+
<%= t :deleted_by, deleter: message.deleted_by.name %>
|
50
|
+
<%= t(:time_since, time: time_ago_in_words(message.deleted_at)) %>.
|
51
|
+
<a href='<%= "#deletedMessage#{message.id}" %>' data-bs-toggle="collapse">
|
52
|
+
<%= t :show_message %>
|
53
|
+
</a>
|
54
|
+
<div id='<%= "deletedMessage#{message.id}" %>' class="collapse">
|
55
|
+
<hr>
|
56
|
+
<%= message.content_html %>
|
57
|
+
</div>
|
58
|
+
<% end %>
|
59
|
+
<% else %>
|
60
|
+
<%= message.content_html %>
|
61
|
+
<% end %>
|
37
62
|
</div>
|
38
63
|
</div>
|
39
64
|
</div>
|
@@ -12,19 +12,19 @@
|
|
12
12
|
<div class="discussion-new-message-content">
|
13
13
|
<%= f.editor :content, '', { id: 'discussion-new-message', class: 'form-control', placeholder: t(:message) } %>
|
14
14
|
</div>
|
15
|
-
<div class="discussion-message-content
|
15
|
+
<div class="discussion-message-content d-none" id="discussion-new-message-preview"></div>
|
16
16
|
</div>
|
17
17
|
</div>
|
18
18
|
</div>
|
19
19
|
</div>
|
20
20
|
<div class="discussion-new-message-buttons">
|
21
21
|
<% if user.moderator_here? %>
|
22
|
-
<button class="btn btn-
|
22
|
+
<button class="btn btn-secondary discussion-new-message-preview-button preview" type="button" error-text="<%= t :preview_error %>"
|
23
23
|
onclick="mumuki.Forum.discussionMessagePreview('<%= preview_discussion_message_url %>')"> <%= fa_icon('eye', text: t(:preview)) %> </button>
|
24
|
-
<button class="btn btn-
|
24
|
+
<button class="btn btn-secondary discussion-new-message-preview-button edit d-none" type="button"
|
25
25
|
onclick="mumuki.Forum.hidePreviewAndShowEditor()"> <%= fa_icon('pencil-alt', text: t(:edit_message)) %> </button>
|
26
26
|
<% end %>
|
27
|
-
<%= button_tag type: 'submit', class: 'btn btn-
|
27
|
+
<%= button_tag type: 'submit', class: 'btn btn-complementary discussion-new-message-button', data: { disable: true } do %>
|
28
28
|
<%= fa_icon('comment', text: t(:comment)) %>
|
29
29
|
<% end %>
|
30
30
|
</div>
|
@@ -3,22 +3,20 @@
|
|
3
3
|
<% end %>
|
4
4
|
|
5
5
|
<div class="row">
|
6
|
-
<
|
7
|
-
<h1><%= t :forum %></h1>
|
8
|
-
</div>
|
6
|
+
<h1><%= t :forum %></h1>
|
9
7
|
</div>
|
10
|
-
<div class="
|
11
|
-
<% if @debatable.respond_to? :language %>
|
12
|
-
<div class="mu-inline-block-right hidden-xs">
|
13
|
-
<h3><%= language_icon @debatable.language %></h3>
|
14
|
-
</div>
|
15
|
-
<% end %>
|
8
|
+
<div class="d-flex">
|
16
9
|
<div class="mu-inline-block-left">
|
17
10
|
<h3>
|
18
|
-
<span class="
|
11
|
+
<span class="d-none d-sm-inline"><%= t("#{@debatable_class.downcase}_number", number: @debatable.number) %>: </span>
|
19
12
|
<span><%= @debatable.name %></span>
|
20
13
|
</h3>
|
21
14
|
</div>
|
15
|
+
<% if @debatable.respond_to? :language %>
|
16
|
+
<div class="d-none d-sm-block ms-3">
|
17
|
+
<h3><%= language_icon @debatable.language %></h3>
|
18
|
+
</div>
|
19
|
+
<% end %>
|
22
20
|
</div>
|
23
21
|
|
24
22
|
<% if @discussions.empty? %>
|
@@ -11,16 +11,24 @@
|
|
11
11
|
<% if @discussion.has_messages? || @discussion.commentable_by?(current_user) %>
|
12
12
|
<hr class="message-divider">
|
13
13
|
|
14
|
-
<div>
|
15
|
-
<h3>
|
16
|
-
|
17
|
-
|
18
|
-
|
19
|
-
<
|
20
|
-
|
21
|
-
|
22
|
-
|
23
|
-
|
14
|
+
<div class="d-flex flex-wrap">
|
15
|
+
<h3 class="flex-grow-1 me-3"><%= t :messages %></h3>
|
16
|
+
<% if current_user && @discussion.persisted? %>
|
17
|
+
<span class="d-flex">
|
18
|
+
<% if @discussion.subscribable? %>
|
19
|
+
<div class="discussion-subscription me-1">
|
20
|
+
<%= btn_toggle subscription_icon, unsubscription_icon, current_user.subscribed_to?(@discussion), class: 'btn-sm',
|
21
|
+
onclick: "mumuki.Forum.discussionSubscription('#{subscription_discussion_url(@discussion)}')" %>
|
22
|
+
</div>
|
23
|
+
<% end %>
|
24
|
+
<% if @discussion.solved? %>
|
25
|
+
<div class="discussion-upvote">
|
26
|
+
<%= btn_toggle upvote_icon, undo_upvote_icon, current_user.upvoted?(@discussion), class: 'btn-sm',
|
27
|
+
onclick: "mumuki.Forum.discussionUpvote('#{upvote_discussion_url(@discussion)}')" %>
|
28
|
+
</div>
|
29
|
+
<% end %>
|
30
|
+
</span>
|
31
|
+
<% end %>
|
24
32
|
</div>
|
25
33
|
|
26
34
|
<% if @discussion.has_messages? %>
|
@@ -28,8 +36,8 @@
|
|
28
36
|
<% if @discussion.description.present? %>
|
29
37
|
<%= render partial: 'discussions/description_message', locals: {discussion: @discussion} %>
|
30
38
|
<% end %>
|
31
|
-
<% @discussion.
|
32
|
-
|
39
|
+
<% @discussion.visible_messages.each do |message| %>
|
40
|
+
<%= render partial: 'discussions/message', locals: {user: message.sender_user, message: message} %>
|
33
41
|
<% end %>
|
34
42
|
<% if @discussion.commentable_by?(current_user) %>
|
35
43
|
<hr class="message-divider">
|
@@ -0,0 +1 @@
|
|
1
|
+
<%= t :exam_authorization_request_approved_html, date: l(authorization_request.exam.start_time, format: :long) %>
|
@@ -0,0 +1 @@
|
|
1
|
+
<%= t :exam_authorization_request_rejected %>
|
@@ -11,7 +11,7 @@
|
|
11
11
|
</div>
|
12
12
|
|
13
13
|
<div class="row">
|
14
|
-
<div class="
|
14
|
+
<div class="col-lg-12">
|
15
15
|
<div class="bs-callout bs-callout-info">
|
16
16
|
<h4 class="text-info">
|
17
17
|
<strong><%= fa_icon :info_circle %> <%= t :important_info %></strong>
|
@@ -20,18 +20,17 @@
|
|
20
20
|
<%= t :exam_registration_explanation_html, date: l(@registration.end_time, format: :long) %>
|
21
21
|
</p>
|
22
22
|
</div>
|
23
|
-
<%= form_for @authorization_request do |f| %>
|
23
|
+
<%= form_for @authorization_request, html: {class: 'mu-form'} do |f| %>
|
24
24
|
<%= f.hidden_field :exam_registration_id, value: @registration.id %>
|
25
|
-
|
26
|
-
|
27
|
-
|
28
|
-
|
29
|
-
|
30
|
-
|
31
|
-
|
32
|
-
|
33
|
-
</
|
34
|
-
<button class="btn btn-success"> <%= t :save %> </button>
|
25
|
+
<%= f.label :exam_id, t(:exam_registration_choose_exam) %>
|
26
|
+
<% @registration.exams.each do |exam| %>
|
27
|
+
<div class="form-check">
|
28
|
+
<%= f.radio_button(:exam_id, exam.id, id: exam.id, required: true, class: 'form-check-input mu-read-only-input',
|
29
|
+
checked: @authorization_request.exam_id == exam.id) %>
|
30
|
+
<%= label_tag exam.id, l(exam.start_time, format: :long), class: 'form-check-label' %>
|
31
|
+
</div>
|
32
|
+
<% end %>
|
33
|
+
<button class="btn btn-complementary"> <%= t :save %> </button>
|
35
34
|
<% end %>
|
36
35
|
</div>
|
37
36
|
</div>
|
@@ -1,7 +1,7 @@
|
|
1
1
|
<% if should_display_assistance_box? assignment %>
|
2
2
|
<hr>
|
3
3
|
<%= assistance_box assignment %>
|
4
|
-
<a data-toggle="collapse" href="#assistance-details-section" class="
|
4
|
+
<a data-bs-toggle="collapse" href="#assistance-details-section" class="badge bg-light text-dark mu-view-details">
|
5
5
|
<%= t :view_details %>
|
6
6
|
</a>
|
7
7
|
<div id="assistance-details-section" class="<%= 'collapse' if should_display_assistance_box?(assignment) %> in results-item">
|
@@ -7,7 +7,7 @@
|
|
7
7
|
<div>
|
8
8
|
<%= contextualization.feedback_html %>
|
9
9
|
</div>
|
10
|
-
<a data-toggle="collapse" href="#results-section" class="text-danger">
|
10
|
+
<a data-bs-toggle="collapse" href="#results-section" class="text-danger">
|
11
11
|
<%= fa_icon 'question-circle' %> <%= t :details %>
|
12
12
|
</a>
|
13
13
|
</div>
|
@@ -2,7 +2,7 @@
|
|
2
2
|
<%= render partial: 'exercise_solutions/results_title', locals: {contextualization: contextualization} %>
|
3
3
|
|
4
4
|
<% if in_gamified_context? %>
|
5
|
-
<div id="mu-exp-earned-message" class="
|
5
|
+
<div id="mu-exp-earned-message" class="d-none">
|
6
6
|
<span><%= t(:you_earned) %></span>
|
7
7
|
<strong><span id="mu-exp-points"></span></strong>
|
8
8
|
<span><%= t(:exp_points) %></span>
|
@@ -1,10 +1,10 @@
|
|
1
|
-
<div class="row">
|
1
|
+
<div class="row w-100">
|
2
2
|
<div class="col-md-12">
|
3
3
|
<div class="actions">
|
4
4
|
<% if assignment.solved? %>
|
5
5
|
<%= next_exercise_button(@exercise) || close_modal_button %>
|
6
6
|
<% else %>
|
7
|
-
<button class="btn btn-
|
7
|
+
<button class="btn btn-complementary submission-control" id="kids-btn-retry" data-bs-dismiss="modal" aria-label="<%= t :retry_exercise %>"> <%= t :retry_exercise %> </button>
|
8
8
|
<% end %>
|
9
9
|
</div>
|
10
10
|
</div>
|
@@ -16,7 +16,7 @@
|
|
16
16
|
<% if should_render_need_help_dropdown?(assignment) %>
|
17
17
|
<div class="notify-problem-box">
|
18
18
|
<div class="dropdown">
|
19
|
-
<%= link_to fa_icon(:'question-circle', text: t(:need_help)), "", {'data-toggle': 'dropdown'} %>
|
19
|
+
<%= link_to fa_icon(:'question-circle', text: t(:need_help)), "", {'data-bs-toggle': 'dropdown'} %>
|
20
20
|
<ul class="dropdown-menu" aria-labelledby="helpDropdown">
|
21
21
|
<li>
|
22
22
|
<%= read_discussions_link(@exercise) %>
|
@@ -3,9 +3,9 @@
|
|
3
3
|
</div>
|
4
4
|
<div class="row">
|
5
5
|
<div class="col-md-12">
|
6
|
-
<div class="hint-box <%= '
|
6
|
+
<div class="hint-box <%= 'd-none' if exercise.hint.blank? %>">
|
7
7
|
<% if exercise.hint.present? %>
|
8
|
-
<a data-toggle="collapse" href="#hint-section" class="text-info">
|
8
|
+
<a data-bs-toggle="collapse" href="#hint-section" class="text-info">
|
9
9
|
<%= fa_icon 'lightbulb', type: :regular %> <%= t :need_a_hint %>
|
10
10
|
</a>
|
11
11
|
|
@@ -7,7 +7,7 @@
|
|
7
7
|
<div class="modal-body">
|
8
8
|
<div class="container-fluid">
|
9
9
|
<%= t :skipped_description %>
|
10
|
-
<%= link_to (t :skipped_solve_anyway), "", "data-dismiss" => "modal" %>
|
10
|
+
<%= link_to (t :skipped_solve_anyway), "", "data-bs-dismiss" => "modal" %>
|
11
11
|
</div>
|
12
12
|
</div>
|
13
13
|
<div class="modal-footer">
|
@@ -7,127 +7,130 @@
|
|
7
7
|
<%= hidden_field_tag(:exercise_language, exercise.highlight_mode) %>
|
8
8
|
<%= hidden_field_tag :console_endpoint, exercise_queries_path(exercise) %>
|
9
9
|
|
10
|
-
<
|
11
|
-
<
|
12
|
-
<
|
13
|
-
<
|
14
|
-
|
15
|
-
<
|
16
|
-
|
17
|
-
|
18
|
-
|
19
|
-
|
20
|
-
|
21
|
-
|
22
|
-
|
23
|
-
|
24
|
-
|
25
|
-
|
26
|
-
|
27
|
-
|
28
|
-
|
29
|
-
|
30
|
-
|
31
|
-
|
32
|
-
|
33
|
-
|
34
|
-
|
35
|
-
|
36
|
-
|
37
|
-
|
38
|
-
|
39
|
-
|
40
|
-
|
41
|
-
</a>
|
10
|
+
<div class="accordion mu-discussion-accordion" id="mu-discussion-accordion">
|
11
|
+
<div class="accordion-item">
|
12
|
+
<h2 class="accordion-header" id="mu-discussion-accordion-header">
|
13
|
+
<button class="accordion-button" type="button" data-bs-toggle="collapse" aria-expanded="true"
|
14
|
+
data-bs-target="#mu-discussion-accordion-body" aria-controls="mu-discussion-accordion-body">
|
15
|
+
<div class="flex-grow-1">
|
16
|
+
<h3 class="d-flex">
|
17
|
+
<span class="flex-grow-1">
|
18
|
+
<span class="d-none d-sm-inline"><%= t(:exercise_number, number: exercise.number) %>: </span>
|
19
|
+
<span><%= exercise.name %></span>
|
20
|
+
</span>
|
21
|
+
<span class="d-none d-sm-inline mx-3">
|
22
|
+
<h1 class="m-0"><%= language_icon exercise.language %></h1>
|
23
|
+
</span>
|
24
|
+
</h3>
|
25
|
+
<div class="discussion-description">
|
26
|
+
<%= label_for_contextualization(@discussion, class: 'd-none d-sm-inline') %> ·
|
27
|
+
<span class="discussion-info">
|
28
|
+
<span class="discussion-initiator-name">
|
29
|
+
<%= @discussion.initiator.name %>
|
30
|
+
</span>
|
31
|
+
<span class="d-none d-sm-inline"><%= discussion_info(@discussion) unless @discussion.new_record? %></span>
|
32
|
+
</span>
|
33
|
+
</div>
|
34
|
+
<% if @discussion.last_moderator_access_visible_for?(current_user) %>
|
35
|
+
<h5 class="my-2 me-3">
|
36
|
+
<span class="badge bg-primary text-wrap">
|
37
|
+
<%= t :last_seen, name: @discussion.last_moderator_access_by.full_name %>
|
38
|
+
<%= t :time_since, time: time_ago_in_words(@discussion.last_moderator_access_at) %>
|
39
|
+
</span>
|
40
|
+
</h5>
|
42
41
|
<% end %>
|
43
|
-
</
|
44
|
-
|
45
|
-
</
|
46
|
-
</summary>
|
42
|
+
</div>
|
43
|
+
</button>
|
44
|
+
</h2>
|
47
45
|
|
48
|
-
|
46
|
+
<div class="accordion-body accordion-collapse collapse show" id="mu-discussion-accordion-body"
|
47
|
+
aria-labelledby="#mu-discussion-accordion-header" data-bs-parent="#mu-discussion-accordion">
|
49
48
|
|
50
|
-
|
51
|
-
|
52
|
-
<li role="presentation" class="active">
|
53
|
-
<a data-target="#solution" aria-controls="solution" role="tab" data-toggle="tab" class="editor-tab">
|
54
|
-
<%= t :solution %>
|
55
|
-
</a>
|
56
|
-
</li>
|
57
|
-
<li role="presentation">
|
58
|
-
<a data-target="#results" aria-controls="results" role="tab" data-toggle="tab" class="editor-tab">
|
59
|
-
<%= t :results %>
|
60
|
-
</a>
|
61
|
-
</li>
|
62
|
-
<% end %>
|
49
|
+
<% if should_render_read_only_exercise_tabs?(@discussion) %>
|
50
|
+
<ul class="nav nav-tabs discussion-tabs" role="tablist">
|
63
51
|
|
64
|
-
|
65
|
-
|
66
|
-
|
67
|
-
|
68
|
-
|
52
|
+
<% if @discussion.has_submission? %>
|
53
|
+
<li role="presentation">
|
54
|
+
<a class="editor-tab nav-link active" data-bs-target="#solution" aria-controls="solution" role="tab" data-bs-toggle="tab">
|
55
|
+
<%= t :solution %>
|
56
|
+
</a>
|
57
|
+
</li>
|
58
|
+
<li role="presentation">
|
59
|
+
<a class="editor-tab nav-link" data-bs-target="#results" aria-controls="results" role="tab" data-bs-toggle="tab">
|
60
|
+
<%= t :results %>
|
61
|
+
</a>
|
62
|
+
</li>
|
63
|
+
<% end %>
|
69
64
|
|
70
|
-
|
71
|
-
|
72
|
-
|
65
|
+
<li role="presentation">
|
66
|
+
<a class="editor-tab nav-link <%= "active" unless @discussion.has_submission? %>" data-bs-target="#content" aria-controls="content" role="tab" data-bs-toggle="tab">
|
67
|
+
<%= t :description %>
|
68
|
+
</a>
|
69
|
+
</li>
|
73
70
|
|
74
|
-
|
75
|
-
|
76
|
-
|
77
|
-
</ul>
|
71
|
+
<% if exercise.extra_visible? %>
|
72
|
+
<%= extra_code_tab %>
|
73
|
+
<% end %>
|
78
74
|
|
79
|
-
|
75
|
+
<% if exercise.queriable? %>
|
76
|
+
<%= console_tab %>
|
77
|
+
<% end %>
|
78
|
+
</ul>
|
80
79
|
|
81
|
-
|
82
|
-
|
83
|
-
|
84
|
-
|
85
|
-
|
86
|
-
|
80
|
+
<div class="tab-content">
|
81
|
+
<% if @discussion.has_submission? %>
|
82
|
+
<div role="tabpanel" class="tab-pane active" id="solution">
|
83
|
+
<div class="mu-tab-body">
|
84
|
+
<div role="tabpanel" class="tab-pane mu-input-panel fade show active" id="editor">
|
85
|
+
<div class="mu-read-only-editor">
|
86
|
+
<%= render_exercise_read_only_editor exercise, @discussion.solution %>
|
87
|
+
</div>
|
88
|
+
</div>
|
87
89
|
</div>
|
88
90
|
</div>
|
89
|
-
</div>
|
90
|
-
</div>
|
91
91
|
|
92
|
-
|
93
|
-
|
94
|
-
|
95
|
-
|
96
|
-
|
97
|
-
|
98
|
-
|
99
|
-
|
92
|
+
<div role="tabpanel" class="tab-pane" id="results">
|
93
|
+
<div class="mu-tab-body">
|
94
|
+
<%= render layout: 'exercise_solutions/contextualization_results_container', locals: { contextualization: @discussion } do %>
|
95
|
+
<div class="row">
|
96
|
+
<div class="col-md-12 submission-results">
|
97
|
+
<%= render partial: 'exercise_solutions/contextualization_results_body',
|
98
|
+
locals: { contextualization: @discussion, guide_finished_by_solution: false } %>
|
99
|
+
</div>
|
100
|
+
</div>
|
101
|
+
<% end %>
|
100
102
|
</div>
|
101
|
-
|
102
|
-
|
103
|
-
</div>
|
104
|
-
<% end %>
|
103
|
+
</div>
|
104
|
+
<% end %>
|
105
105
|
|
106
|
-
|
107
|
-
|
108
|
-
|
109
|
-
|
106
|
+
<div role="tabpanel" class="tab-pane <%= 'active' unless @discussion.has_submission? %>" id="content">
|
107
|
+
<div class="mu-tab-body">
|
108
|
+
<div class="exercise-assignment">
|
109
|
+
<%= render partial: 'exercises/exercise_assignment', locals: { exercise: exercise } %>
|
110
|
+
</div>
|
111
|
+
</div>
|
110
112
|
</div>
|
111
|
-
</div>
|
112
|
-
</div>
|
113
113
|
|
114
|
-
|
115
|
-
|
116
|
-
|
114
|
+
<div role="tabpanel" class="tab-pane mu-input-panel fade" id="console">
|
115
|
+
<div class="mu-overlapped-container">
|
116
|
+
<div class="console">
|
117
|
+
</div>
|
118
|
+
<div class="mu-overlapped">
|
119
|
+
<%= restart_icon %>
|
120
|
+
</div>
|
121
|
+
</div>
|
117
122
|
</div>
|
118
|
-
|
119
|
-
|
123
|
+
|
124
|
+
<div role="tabpanel" class="tab-pane mu-input-panel fade mu-elipsis" id="visible-extra">
|
125
|
+
<%= @discussion.extra_preview_html %>
|
120
126
|
</div>
|
121
127
|
</div>
|
122
|
-
|
123
|
-
|
124
|
-
|
125
|
-
|
126
|
-
|
127
|
-
</div>
|
128
|
-
<% else %>
|
129
|
-
<div class="exercise-assignment">
|
130
|
-
<%= render partial: 'exercises/exercise_assignment', locals: {exercise: exercise} %>
|
128
|
+
<% else %>
|
129
|
+
<div class="exercise-assignment">
|
130
|
+
<%= render partial: 'exercises/exercise_assignment', locals: { exercise: exercise } %>
|
131
|
+
</div>
|
132
|
+
<% end %>
|
131
133
|
</div>
|
132
|
-
|
133
|
-
</
|
134
|
+
</div>
|
135
|
+
</div>
|
136
|
+
|