mumuki-laboratory 8.1.3 → 8.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7bcc70727fa140c5ad7c313f8b9e9a5e1f9a9e3b383b1add72556f64d4fed4e3
-  data.tar.gz: 874a6b5d2f8a64249560dfb11f9f743d6f11267e8c73602e0d53abacb8e9c651
+  metadata.gz: ef8bf0f9bb9d5a3bc7daced2376fdb01ce52872178726bffc6d86def1081a2a4
+  data.tar.gz: e2e907a4cf38b75a7ccb18160b84bd1beab765d3ac5cc5b986341701a7b4845e
 SHA512:
-  metadata.gz: 6c9b7889090c806dd880c5cd9d2730117d2d4927ef18765582b0d79010463f4596bdcf8f65f297b95e0bcec238ec7e36311bffe889d29460191cd79e929afdfb
-  data.tar.gz: 2304d78fabb8a5268fb33f79737480d94550fdc22c9a94f9cd65f70ca02ed1e2dbb7d78089690503a85b99ec88dd845a70678970997a3bba4a3c644b2e90276e
+  metadata.gz: 57196182676bed18199d12a5b44901baebe03f0763088f217117fbc85c2c5e3ab2cc009de7fa32aa7f6b1c039b939cd072e58cff755179228b6f328aa3eee2ab
+  data.tar.gz: 268749a38da64dc28363ff6862c3ef566fe65aad62dc208f9629664d5f939414510e8005059fff43ebc6aa0817178362485996481206a442e9331a9295b22be7

data/app/assets/javascripts/mumuki_laboratory/application/button.js

@@ -106,11 +106,11 @@ mumuki.Button = class {
   }
 
   setWaitingText () {
-    this.$button.html('<i class="fa fa-refresh fa-spin"></i> ' + this.$button.attr('data-waiting'));
+    this.$button.html('<i class="fas fa-sync-alt fa-spin"></i> ' + this.$button.attr('data-waiting'));
   }
 
   setRetryText() {
-    this.$button.html('<i class="fa fa-undo"></i>');
+    this.$button.html('<i class="fas fa-undo"></i>');
   }
 
   setOriginalContent () {

data/app/assets/javascripts/mumuki_laboratory/application/codemirror-builder.js

@@ -1,7 +1,7 @@
 (() => {
   function submit() {
     $('body').removeClass('fullscreen');
-    $('.editor-resize .fa-stack-1x').removeClass('fa-compress').addClass('fa-expand');
+    $('.editor-resize .fas').toggleClass('fa-expand fa-compress');
     $('.btn-submit').click();
   }
 

data/app/assets/javascripts/mumuki_laboratory/application/codemirror.js

@@ -36,7 +36,7 @@ mumuki.page.editors = [];
 
   function toggleFullscreen() {
     $('body').toggleClass('fullscreen');
-    $('.editor-resize .fa-stack-1x').toggleClass('fa-expand').toggleClass('fa-compress');
+    $('.editor-resize .fas').toggleClass('fa-expand fa-compress');
   }
 
   function indentWithSpaces(cm) {

data/app/assets/stylesheets/mumuki_laboratory/application/modules/_kids.scss

@@ -10,6 +10,11 @@ $kids-speech-border: 1px solid $kids-speech-border-color;
 
 $kids-speech-tabs-width: 40px;
 
+.mu-exercise-content {
+  border-radius: 10px;
+  border: 1px solid #dddddd;
+}
+
 .mu-kids-exercise {
   height: $kids-height;
   min-height: $kids-height;

data/app/assets/stylesheets/mumuki_laboratory/application/modules/_overlap.scss

@@ -18,10 +18,6 @@
   }
 }
 
-.editor-resize {
-  font-size: 0.5em;
-}
-
 body.fullscreen {
   .mu-overlapped a {
     margin-right: 15px;

data/app/helpers/assignment_result_helper.rb

@@ -15,7 +15,7 @@ module AssignmentResultHelper
 
   def render_community_link
     if community_link?
-      link_to fa_icon(:facebook, text: I18n.t(:ask_community), class: 'fa-fw'), community_link, target: '_blank'
+      link_to fa_icon('facebook-f', type: :brand, text: I18n.t(:ask_community), class: 'fa-fw'), community_link, target: '_blank'
     end
   end
 

data/app/helpers/discussions_helper.rb

@@ -67,8 +67,8 @@ module DiscussionsHelper
   def discussion_messages_icon(discussion)
     %Q{
       <span class="discussion-icon fa-stack fa-xs">
-        <i class="fa fa-comment-o fa-stack-2x"></i>
-        <i class="fa fa-stack-1x">#{discussion.validated_messages_count}</i>
+        <i class="far fa-comment fa-stack-2x"></i>
+        <i class="fas fa-stack-1x">#{discussion.validated_messages_count}</i>
       </span>
     }.html_safe
   end
@@ -77,8 +77,8 @@ module DiscussionsHelper
     if discussion.upvotes_count > 0
       %Q{
         <span class="discussion-icon fa-stack fa-xs">
-          <i class="fa fa-star-o fa-stack-2x"></i>
-          <i class="fa fa-stack-1x">#{discussion.upvotes_count}</i>
+          <i class="far fa-star fa-stack-2x"></i>
+          <i class="fas fa-stack-1x">#{discussion.upvotes_count}</i>
         </span>
       }.html_safe
     end

data/app/helpers/editor_tabs_helper.rb

@@ -14,7 +14,7 @@ module EditorTabsHelper
   def messages_tab(exercise, organization = Organization.current)
     "<li id='messages-tab' role='presentation'>
         <a data-target='#messages' tabindex='0' aria-controls='console' role='tab' data-toggle='tab' class='editor-tab'>
-          #{fa_icon 'comments-o'} #{t :messages }
+          #{fa_icon 'comments', type: :regular} #{t :messages }
         </a>
      </li>".html_safe if organization.raise_hand_enabled? && exercise.has_messages_for?(current_user)
   end

data/app/helpers/icons_helper.rb

@@ -58,6 +58,6 @@ module IconsHelper
   end
 
   def icon_for_read(read)
-    tag('i', class: "fa fa-envelope#{read ? '-o' : ''}")
+    tag('i', class: "fa#{read ? 'r' : 's'} fa-envelope")
   end
 end

data/app/helpers/links_helper.rb

@@ -80,7 +80,7 @@ module LinksHelper
     return unless current_user&.writer?
 
     url = yield
-    link_to fixed_fa_icon(:pencil), url, class: "mu-content-toolbar-item", target: "_blank", title: t(:edit)
+    link_to fixed_fa_icon('pencil-alt'), url, class: "mu-content-toolbar-item", target: "_blank", title: t(:edit)
   end
 
   def url_for_bibliotheca_guide(guide)

data/app/helpers/menu_bar_helper.rb

@@ -18,7 +18,7 @@ module MenuBarHelper
   end
 
   def link_to_profile
-    li_tag menu_item('user-o', :profile, user_path)
+    menu_item('user', :profile, user_path)
   end
 
   def link_to_classroom
@@ -35,6 +35,10 @@ module MenuBarHelper
     menu_item icon, app_name, url
   end
 
+  def logout_link
+    li_tag menu_item('sign-out-alt', :sign_out, logout_path(origin: url_for))
+  end
+
   def menu_item(icon, name, url)
     link_to fixed_fa_icon(icon, text: t(name)), url, role: 'menuitem', tabindex: '-1'
   end

data/app/helpers/overlapped_buttons_helper.rb

@@ -1,4 +1,8 @@
 module OverlappedButtonsHelper
+  def expand_icon
+    overlapped_button_icon :fullscreen, :expand, " (F11)"
+  end
+
   def restart_icon
     overlapped_button_icon :restart, :undo
   end
@@ -11,7 +15,7 @@ module OverlappedButtonsHelper
     link_to restart_icon, guide_progress_path(guide), class: 'mu-content-toolbar-item mu-restart-guide', data: {confirm: t(:confirm_restart)}, method: :delete
   end
 
-  def overlapped_button_icon(key, icon)
-    fa_icon(icon, title: t(key), class: 'fa-fw', role: 'button', 'aria-label': t(key))
+  def overlapped_button_icon(key, icon, extra_title='')
+    fa_icon(icon, title: t(key) + extra_title, class: 'fa-fw', role: 'button', 'aria-label': t(key), 'data-placement': 'left')
   end
 end

data/app/views/book/show.html.erb

@@ -26,7 +26,7 @@
 
       <% unless enabled  %>
         <div class="text-center mu-lock">
-          <i class="fa fa-lock fa-5x"></i>
+          <i class="fas fa-lock fa-5x"></i>
           <p><%= t :locked_content %></p>
         </div>
       <% end %>

data/app/views/discussions/_message.html.erb

@@ -17,11 +17,11 @@
               </a>
               <% if message.from_initiator? %>
                 <a class="discussion-message-not-actually-a-question <%= 'selected' if message.not_actually_a_question? %>" onclick="mumuki.Forum.discussionMessageToggleNotActuallyAQuestion('<%= question_discussion_message_url(@discussion, message) %>', $(this))">
-                  <%= fa_icon('question-circle-o', class: 'fa-xs') %>
+                  <%= fa_icon('question-circle', type: 'regular', class: 'fa-xs') %>
                 </a>
               <% end %>
             <% end %>
-            <%= link_to fa_icon('trash-o'), discussion_message_path(@discussion, message), method: :delete, data: { confirm: t(:are_you_sure, action: t(:destroy_message)) } %>
+            <%= link_to fa_icon('trash-alt', type: :regular), discussion_message_path(@discussion, message), method: :delete, data: { confirm: t(:are_you_sure, action: t(:destroy_message)) } %>
           <% end %>
           <% if should_show_approved_for?(current_user, message) %>
             <span class="discussion-message-approved selected">

data/app/views/exercise_solutions/_kids_level_up.html.erb

@@ -3,7 +3,7 @@
     <%= t :level_up %>
   </h3>
   <div class="text-center mu-level">
-    <i class="fa fa-star fa-fw fa-4x"></i>
+    <i class="fas fa-star fa-fw fa-4x"></i>
     <span class="mu-level-number"></span>
     <p></p>
     <p id="mu-solve-more-exercises"> <%= (t :solve_more_exercises_to_level_up).html_safe %></p>

data/app/views/exercises/_exercise_assignment.html.erb

@@ -6,7 +6,7 @@
     <div class="hint-box <%= 'hidden' if exercise.hint.blank? %>">
       <% if exercise.hint.present? %>
         <a data-toggle="collapse" href="#hint-section" class="text-info">
-          <%= fa_icon 'lightbulb-o' %> <%= t :need_a_hint %>
+          <%= fa_icon 'lightbulb', type: :regular %> <%= t :need_a_hint %>
         </a>
 
         <div id="hint-section" class="collapse">

data/app/views/exercises/_read_only.html.erb

@@ -36,7 +36,7 @@
           <% end %>
           <% if @discussion.solved? %>
             <a class="discussion-upvote" onclick="mumuki.Forum.discussionUpvote('<%= upvote_discussion_url(@discussion) %>')">
-              <%= fa_icon('thumbs-o-up', class: 'fa-xs') %>
+              <%= fa_icon('thumbs-up', type: :regular, class: 'fa-xs') %>
               <%= span_toggle t(:upvote), t(:undo_upvote), current_user.upvoted?(@discussion), class: 'hidden-sm hidden-xs' %>
             </a>
           <% end %>

data/app/views/exercises/show.html.erb

@@ -51,7 +51,7 @@
 
 <div style="display: none" id="processing-template">
   <div class="bs-callout bs-callout-info">
-    <h4><i class="fa fa-refresh fa-spin"></i> <strong><%= t :processing_your_solution %></strong></h4>
+    <h4><i class="fas fa-sync-alt fa-spin"></i> <strong><%= t :processing_your_solution %></strong></h4>
     <%= t :refresh_or_wait %>
   </div>
 </div>

data/app/views/layouts/_guide.html.erb

@@ -33,12 +33,6 @@
   <div class="col-md-12">
     <div class="text-box">
       <%= @guide.description_html %>
-
-      <div class="actions">
-        <% if !@stats.try(:done?) && @next_exercise %>
-          <%= link_to t(lesson_practice_key_for(@stats)), exercise_path(@next_exercise), class: 'btn btn-success' %>
-        <% end %>
-      </div>
     </div>
   </div>
 </div>
@@ -63,6 +57,14 @@
   </div>
 <% end %>
 
+<% if !@stats.try(:done?) && @next_exercise %>
+  <div class="text-box">
+    <div class="actions">
+      <%= link_to t(lesson_practice_key_for(@stats)), exercise_path(@next_exercise), class: 'btn btn-success' %>
+    </div>
+  </div>
+<% end %>
+
 <% if @stats&.done? %>
   <div class="text-box">
     <div class="actions">

data/app/views/layouts/_kids.html.erb

@@ -3,17 +3,17 @@
   <% if exercise.hint? %>
       <ul class="mu-kids-character-speech-bubble-tabs">
         <li class="mu-kids-description active" data-target="description" title="<%= t :task %>">
-          <i class="fa fa-fw fa-file-text-o"></i>
+          <i class="far fa-fw fa-file-alt"></i>
         </li>
         <li class="separator"></li>
         <li class="mu-kids-hint blink" data-target="hint" title="<%= t :need_a_hint %>">
-          <i class="fa fa-fw fa-lightbulb-o"></i>
+          <i class="far fa-fw fa-lightbulb"></i>
         </li>
       </ul>
   <% end %>
   <div class="mu-kids-character-speech-bubble-normal">
-    <i class="mu-kids-prev-speech fa fa-fw fa-caret-up"></i>
-    <i class="mu-kids-next-speech fa fa-fw fa-caret-down"></i>
+    <i class="mu-kids-prev-speech fas fa-fw fa-caret-up"></i>
+    <i class="mu-kids-next-speech fas fa-fw fa-caret-down"></i>
     <div class="description"><%= exercise.description_task %></div>
     <div class="hint" style="display: none"><%= exercise.hint_html %></div>
   </div>

data/app/views/layouts/_kindergarten.html.erb

@@ -5,10 +5,10 @@
       <span class="mu-kindergarten-exercise-description"><%= exercise.description_task %></span>
       <div class="mu-kindergarten-buttons">
         <button class="mu-kindergarten-show-context" onclick="mumuki.kids.context.show()">
-          <img class="mu-kindergarten-button-image" src="https://mumuki.io/static/show-context.svg" alt="">
+          <img class="mu-kindergarten-button-image" src="https://mumuki.io/static/show-context.svg" alt="" title="<%= t :see_context %>">
         </button>
         <button class="mu-kindergarten-play-description" onclick="mumuki.kids.speech.click('.mu-kindergarten-exercise-description', '<%= exercise.locale %>')">
-          <img class="mu-kindergarten-button-image mu-kindergarten-play" src="https://mumuki.io/static/audio-play.svg" alt="">
+          <img class="mu-kindergarten-button-image mu-kindergarten-play" src="https://mumuki.io/static/audio-play.svg" alt="" title="<%= t :listen_statement %>">
           <img class="mu-kindergarten-button-image mu-kindergarten-stop hidden" src="https://mumuki.io/static/audio-stop.svg" alt="">
         </button>
       </div>
@@ -17,18 +17,18 @@
   <div class="mu-kindergarten-hint">
     <% if exercise.hint? %>
       <button class="mu-hint-light" onclick="mumuki.kids.hint.toggle()">
-        <img class="mu-hint-light on" src="https://mumuki.io/static/lamparita_on.svg" alt="">
+        <img class="mu-hint-light on" src="https://mumuki.io/static/lamparita_on.svg" alt="" title="<%= t :need_a_hint %>">
       </button>
       <div class="mu-kindergarten-light-speech-bubble">
         <span class="mu-kindergarten-exercise-hint">
           <%= exercise.hint.markdownified %>
         </span>
         <button class="expand-or-collapse-hint-media" onclick="mumuki.kids.hint.toggleMedia()">
-          <i class="fa fa-fw fa-2x fa-caret-up"></i>
+          <i class="fas fa-fw fa-2x fa-caret-up"></i>
         </button>
       </div>
     <% else %>
-      <img class="mu-hint-light off" src="https://mumuki.io/static/lamparita_off.svg" alt="">
+      <img class="mu-hint-light off" src="https://mumuki.io/static/lamparita_off.svg" alt="" title="<%= t :no_need_hint %>">
     <% end %>
   </div>
 </div>

data/app/views/layouts/_social_media.html.erb

@@ -1,4 +1,4 @@
-<a class="fa fa-facebook social-icon" aria-label="Facebook" href="https://www.facebook.com/MumukiOrg" target="_blank"></a>
-<a class="fa fa-twitter social-icon" aria-label="Twitter" href="https://twitter.com/MumukiOrg" target="_blank"></a>
-<a class="fa fa-github social-icon" aria-label="Github" href="https://github.com/mumuki" target="_blank"></a>
-<a class="fa fa-linkedin social-icon" aria-label="LinkedIn" href="https://www.linkedin.com/company/mumukiorg" target="_blank"></a>
+<a class="fab fa-facebook-f social-icon" aria-label="Facebook" href="https://www.facebook.com/MumukiOrg" target="_blank"></a>
+<a class="fab fa-twitter social-icon" aria-label="Twitter" href="https://twitter.com/MumukiOrg" target="_blank"></a>
+<a class="fab fa-github social-icon" aria-label="Github" href="https://github.com/mumuki" target="_blank"></a>
+<a class="fab fa-linkedin-in social-icon" aria-label="LinkedIn" href="https://www.linkedin.com/company/mumukiorg" target="_blank"></a>

data/app/views/layouts/_timer.html.erb

@@ -1,6 +1,6 @@
 <div class="row">
   <div class="col-md-3 col-md-offset-5">
-    <i class="timer text-center fa fa-clock-o"></i>
+    <i class="timer text-center far fa-clock"></i>
     <i class="timer timer-text text-center"><%= t :time_left %></i>
     <i id="timer" class="timer timer-text text-center"></i>
     <script>

data/app/views/layouts/application.html.erb

@@ -10,7 +10,7 @@
       <div class="dropdown hamburguer-breadcrumb hidden-sm hidden-md hidden-lg">
         <% if content_for? :breadcrumbs %>
         <span class="hamburguer" id="profileDropdown" data-toggle="dropdown">
-          <i class="fa fa-bars"></i>
+          <i class="fas fa-bars"></i>
         </span>
           <ul class="dropdown-menu dropdown-menu-left" aria-labelledby="profileDropdown">
             <%= yield :breadcrumbs %>
@@ -21,13 +21,13 @@
         <% if current_logged_user? %>
           <% if in_gamified_context? %>
             <div class="mu-navbar-element">
-              <i class="fa fa-star fa-fw fa-2x mu-navbar-icon mu-level-tooltip" data-toggle="tooltip" data-placement="bottom" level="<%= t(:level) %>"></i>
+              <i class="fas fa-star fa-fw fa-2x mu-navbar-icon mu-level-tooltip" data-toggle="tooltip" data-placement="bottom" level="<%= t(:level) %>"></i>
               <span class="mu-level-number"></span>
             </div>
           <% end %>
           <div class="dropdown mu-navbar-element notifications-box <%= 'notifications-box-empty' unless has_notifications? %>">
             <a href=<%= "#{user_notifications_path}" %>>
-              <i class="fa fa-bell fa-fw fa-2x mu-navbar-icon"></i>
+              <i class="fas fa-bell fa-fw fa-2x mu-navbar-icon"></i>
                 <span class="badge badge-notifications"><%= notifications_count %></span>
             </a>
           </div>
@@ -39,7 +39,7 @@
             <ul class="dropdown-menu dropdown-menu-right" aria-labelledby="profileDropdown">
               <%= menu_bar_list_items %>
               <li class="divider"></li>
-              <li><%= link_to(t(:sign_out), logout_path(origin: url_for), role: 'menuitem') %></li>
+              <%= logout_link %>
             </ul>
           </div>
         <% else %>

data/app/views/layouts/exercise_inputs/editors/_code.html.erb

@@ -5,12 +5,7 @@
                   value: @current_content,
                   data: {lines: 17} %>
   <div class="mu-overlapped">
-    <a class="editor-resize" title="<%= t(:fullscreen) %> (F11)">
-      <span class="fa-stack fa-lg">
-        <i class="fa fa-square-o fa-stack-2x"></i>
-        <i class="fa fa-expand fa-stack-1x"></i>
-      </span>
-    </a>
+    <a class="editor-resize"> <%= expand_icon %></a>
     <a class="editor-format"><%= format_icon %></a>
     <a class="editor-reset submission-reset" data-confirm="<%= t(:confirm_reset) %>"><%= restart_icon %></a>
   </div>

data/app/views/layouts/exercise_inputs/editors/_multiple_files.html.erb

@@ -5,11 +5,11 @@
       <ul class="nav nav-tabs">
         <% @files.each_with_index do |file, index| %>
           <li role="presentation" class="file-tab <%= 'active' if index == 0 %>" data-target="#editor-file-<%= index %>" tabindex='0' data-toggle='tab'>
-            <a class="file-name" href="#"><%= file.name %></a> <i class="delete-file-button fa fa-times"></i>
+            <a class="file-name" href="#"><%= file.name %></a> <i class="delete-file-button fas fa-times"></i>
           </li>
         <% end %>
       </ul>
-      <i class="add-file-button fa fa-plus"></i>
+      <i class="add-file-button fas fa-plus"></i>
     </span>
 
     <%= multifile_hidden_inputs %>
@@ -27,14 +27,9 @@
     </div>
 
     <div class="mu-overlapped multiple-files">
-      <a class="editor-resize" title="<%= t(:fullscreen) %> (F11)">
-        <span class="fa-stack fa-lg">
-          <i class="fa fa-square-o fa-stack-2x"></i>
-          <i class="fa fa-expand fa-stack-1x"></i>
-        </span>
-      </a>
+      <a class="editor-resize"> <%= expand_icon %></a>
+      <a class="editor-format"><%= format_icon %></a>
       <!--<a class="editor-reset submission-reset" data-confirm="<%= t(:confirm_reset) %>"><%= restart_icon %></a> -->
     </div>
-
   </div>
 </div>

data/app/views/layouts/exercise_inputs/forms/_problem_form.html.erb

@@ -4,7 +4,7 @@
 <% if should_render_problem_tabs? exercise, current_user %>
   <ul class="nav nav-tabs" role="tablist">
     <li role="presentation" class="active">
-      <a data-target="#editor" aria-controls="editor" tabindex="0" role="tab" data-toggle="tab" class="editor-tab"><%= fa_icon 'pencil-square' %> <%= t :solution %></a>
+      <a data-target="#editor" aria-controls="editor" tabindex="0" role="tab" data-toggle="tab" class="editor-tab"><%= fa_icon 'pen-square' %> <%= t :solution %></a>
     </li>
     <% if exercise.extra_visible? %>
       <%= extra_code_tab %>

data/app/views/layouts/modals/_guide_corollary.html.erb

@@ -1,9 +1,19 @@
-<div class="modal fade guide-corollary mu-kids-modal-border" id="guide-done" tabindex="-1" role="dialog" aria-hidden="true">
+<div class="modal fade guide-corollary <%= 'mu-kids-modal-border' if Organization.current.kids? %>" id="guide-done" tabindex="-1" role="dialog" aria-hidden="true">
   <div class="modal-dialog">
     <div class="modal-content">
+      <% if Organization.current.kids? %>
+        <button type="button" class="mu-kids-modal-button mu-close" data-dismiss="modal" aria-label="Close">
+          <span aria-hidden="true">
+            <i class="fas fa-fw fa-times fa-3x"></i>
+          </span>
+        </button>
+      <% end %>
       <div class="modal-header">
-        <button type="button" class="close" data-dismiss="modal" aria-label="Close">
-          <span aria-hidden="true">&times;</span></button>
+        <% if Organization.current.grown_ups? %>
+          <button type="button" class="close" data-dismiss="modal" aria-label="Close">
+            <span aria-hidden="true">&times;</span>
+          </button>
+        <% end %>
         <div class="guide-corollary-title">
           <h3 class="text-left" id="gridSystemModalLabel"><%= t :guide_finished, guide: guide.name %> </h3>
         </div>