mumuki-laboratory 8.1.0 → 8.2.1

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 %>
@@ -20,26 +20,26 @@
       <div class="mu-navbar-avatar">
         <% if current_logged_user? %>
           <% if in_gamified_context? %>
-            <i class="fa fa-star fa-fw fa-2x navbar-icon mu-level-tooltip" data-toggle="tooltip" data-placement="bottom" title="<%= t(:level) %>"></i>
-            <span class="mu-level-number"></span>
+            <div class="mu-navbar-element">
+              <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">
-            <span>
-              <a class="notifications-box <%= has_notifications? ? '' : 'notifications-box-empty' %>" href=<%= "#{user_notifications_path}" %>>
-                <i class="fa fa-bell fa-fw fa-2x navbar-icon"></i>
-                  <span class="badge badge-notifications"><%= notifications_count %></span>
-              </a>
-            </span>
+          <div class="dropdown mu-navbar-element notifications-box <%= 'notifications-box-empty' unless has_notifications? %>">
+            <a href=<%= "#{user_notifications_path}" %>>
+              <i class="fas fa-bell fa-fw fa-2x mu-navbar-icon"></i>
+                <span class="badge badge-notifications"><%= notifications_count %></span>
+            </a>
           </div>
-          <div class="dropdown">
-            <div id="profileDropdown" class="profile-dropdown navbar-icon" data-toggle="dropdown" aria-label="<%= t(:user) %>" role="menu" tabindex="0">
+          <div class="dropdown mu-navbar-element">
+            <div id="profileDropdown" class="profile-dropdown" data-toggle="dropdown" aria-label="<%= t(:user) %>" role="menu" tabindex="0">
               <%= profile_picture_for current_user %>
               <span class="caret"></span>
             </div>
             <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 %>
@@ -52,30 +52,32 @@
 
 <% content_for :footer do %>
   <footer class="footer">
-    <div class="<%= exercise_container_type %>">
-      <hr>
-
-      <div class="row">
-        <div class="col-md-12">
+    <div class="mu-footer <%= exercise_container_type %>">
+      <div class="mu-footer-row">
+        <div class="mu-footer-authoring">
           <%= yield :authoring %>
         </div>
       </div>
 
-      <div id="footer-copyright" class="row">
-        <div class="col-md-4 text-left">
-          <p>
-            <%= render partial: 'layouts/copyright' %>
-          </p>
+      <div class="mu-footer-row">
+        <div class="mu-footer-copyright">
+          <%= render partial: 'layouts/copyright' %>
         </div>
 
-        <div class="col-md-4 text-center">
-          <%= login_form.footer_html %>
+        <div class="mu-footer-terms">
+          <div><%= link_to_profile_terms %></div>
+          <% if current_user&.can_discuss_here? %>
+            <div><%= link_to_forum_terms %></div>
+          <% end %>
         </div>
 
-        <div id="footer-social" class="col-md-4 text-right" lang="en">
+        <%= login_form.footer_html %>
+
+        <div id="footer-social" class="mu-footer-social" lang="en">
           <%= render partial: 'layouts/social_media' %>
         </div>
       </div>
+
     </div>
   </footer>
 <% end %>

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

@@ -1,22 +1,25 @@
 <% content_for :footer do %>
   <footer class="footer">
-    <div class="<%= exercise_container_type %>">
-      <hr>
-
-      <div class="row">
-        <div class="col-md-12">
+    <div class="mu-footer <%= exercise_container_type %>">
+      <div class="mu-footer-row">
+        <div class="mu-footer-authoring">
           <%= yield :authoring %>
         </div>
       </div>
 
-      <div id="footer-copyright" class="row hidden-xs hidden-sm">
-        <div class="col-sm-8 text-left">
-          <p>
-            <%= render partial: 'layouts/copyright' %>
-          </p>
+      <div class="mu-footer-row">
+        <div class="mu-footer-copyright">
+          <%= render partial: 'layouts/copyright' %>
+        </div>
+
+        <div class="mu-footer-terms">
+          <div><%= link_to_profile_terms %></div>
+          <% if current_user&.can_discuss_here? %>
+            <div><%= link_to_forum_terms %></div>
+          <% end %>
         </div>
 
-        <div id="footer-social" class="col-sm-4 text-right" lang="en">
+        <div id="footer-social" class="mu-footer-social" lang="en">
           <%= render partial: 'layouts/social_media' %>
         </div>
       </div>

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>

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

@@ -3,12 +3,12 @@
     <div class="modal-content success">
       <button type="button" class="mu-kids-modal-button mu-previous hidden" onclick="mumuki.kids.resultsCarrousel.prevSlide()" aria-label="Previous">
         <span aria-hidden="true">
-          <i class="fa fa-fw fa-arrow-left fa-3x"></i>
+          <i class="fas fa-fw fa-arrow-left fa-3x"></i>
         </span>
       </button>
       <button type="button" class="mu-kids-modal-button mu-next" onclick="mumuki.kids.resultsCarrousel.nextSlide()" aria-label="Next">
         <span aria-hidden="true">
-          <i class="fa fa-fw fa-arrow-right fa-3x"></i>
+          <i class="fas fa-fw fa-arrow-right fa-3x"></i>
         </span>
       </button>
       <div class="modal-header text-center">

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

@@ -3,17 +3,17 @@
     <div class="modal-content kindergarten">
       <button type="button" class="mu-kids-modal-button mu-close" data-waiting="" data-dismiss="modal" aria-label="Close">
         <span aria-hidden="true">
-          <i class="fa fa-fw fa-times fa-3x"></i>
+          <i class="fas fa-fw fa-times fa-3x"></i>
         </span>
       </button>
       <button type="button" class="mu-kids-modal-button mu-previous hidden" onclick="mumuki.kids.context.prevSlide()" aria-label="Previous">
         <span aria-hidden="true">
-          <i class="fa fa-fw fa-arrow-left fa-3x"></i>
+          <i class="fas fa-fw fa-arrow-left fa-3x"></i>
         </span>
       </button>
       <button type="button" class="mu-kids-modal-button mu-next" onclick="mumuki.kids.context.nextSlide()" aria-label="Next">
         <span aria-hidden="true">
-          <i class="fa fa-fw fa-arrow-right fa-3x"></i>
+          <i class="fas fa-fw fa-arrow-right fa-3x"></i>
         </span>
       </button>
       <div class="modal-body mu-kids-context-body">

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

@@ -3,17 +3,17 @@
     <div class="modal-content kindergarten">
       <button type="button" class="mu-kids-modal-button mu-close" data-waiting="" data-dismiss="modal" aria-label="Close">
         <span aria-hidden="true">
-          <i class="fa fa-fw fa-times fa-3x"></i>
+          <i class="fas fa-fw fa-times fa-3x"></i>
         </span>
       </button>
       <button type="button" class="mu-kids-modal-button mu-previous hidden" onclick="mumuki.kids.resultsCarrousel.prevSlide()" aria-label="Previous">
         <span aria-hidden="true">
-          <i class="fa fa-fw fa-arrow-left fa-3x"></i>
+          <i class="fas fa-fw fa-arrow-left fa-3x"></i>
         </span>
       </button>
       <button type="button" class="mu-kids-modal-button mu-next" onclick="mumuki.kids.resultsCarrousel.nextSlide()" aria-label="Next">
         <span aria-hidden="true">
-          <i class="fa fa-fw fa-arrow-right fa-3x"></i>
+          <i class="fas fa-fw fa-arrow-right fa-3x"></i>
         </span>
       </button>
       <div class="modal-header">

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

@@ -3,7 +3,7 @@
     <div class="modal-content broken kindergarten">
       <button type="button" class="mu-kids-modal-button mu-close" data-dismiss="modal" aria-label="Close" data-waiting="">
             <span aria-hidden="true">
-              <i class="fa fa-fw fa-times fa-3x"></i>
+              <i class="fas fa-fw fa-times fa-3x"></i>
             </span>
       </button>
       <div class="modal-header">

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

@@ -13,7 +13,7 @@
           <div class="row">
             <div class="col-md-12">
               <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/users/_edit_user_form.html.erb

@@ -9,7 +9,7 @@
   <div class="row mu-tab-body">
     <div class="col-md-4 text-center">
       <%= profile_picture_for(@user, id: 'mu-user-avatar', class: 'mu-user-avatar') %>
-      <i class="fa fa-pencil fa-2x pointer mu-edit-avatar" id="mu-edit-avatar-icon" tabindex="0"></i>
+      <i class="fas fa-pencil-alt fa-2x pointer mu-edit-avatar" id="mu-edit-avatar-icon" tabindex="0"></i>
     </div>
     <div class="col-md-8">
       <%= render partial: 'profile_fields', locals: {form: f} %>

data/app/views/users/_user_form.html.erb

@@ -12,7 +12,7 @@
         <path id="mu-level-progress" stroke-linecap="round" stroke="#24b8aa" stroke-width="4" stroke-dasharray="0, 999" fill="none" d="M50 10 a 40 40 0 0 1 0 80 a 40 40 0 0 1 0 -80"></path>
       </svg>
       <div class="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><%= t :level %></p>
       </div>

data/lib/mumuki/laboratory.rb

@@ -47,7 +47,7 @@ module Mumukit::Platform::OrganizationMapping::Path
 
     patch :inorganic_path_for do |request, hyper|
       if in_actual_organization?(request)
-        hyper.call
+        hyper.call(request)
       else
         path_for(request)
       end

data/lib/mumuki/laboratory/engine.rb

@@ -1,5 +1,5 @@
 require 'turbolinks'
-require 'font-awesome-rails'
+require 'font_awesome5_rails'
 require 'momentjs-rails'
 require 'nprogress-rails'
 require 'rails-i18n'

data/lib/mumuki/laboratory/locales/en.yml

@@ -86,7 +86,6 @@ en:
       gone: Oops! Content has expired
       internal_server_error: Oops! Something went wrong
       not_found: Oops! Page was not found
-  exam_number: 'Exam %{number}:'
   exams: Exams
   exercise: Exercise
   exercises: Exercises
@@ -148,6 +147,7 @@ en:
   let_us_know: please let us know!
   level: Level
   level_up: Level up!
+  listen_statement: Listen to the statement
   loading: Loading
   load_solution_into_console: Load your solution into the console
   locked_content: 'This content will be unlocked when you finish previous chapters'
@@ -179,6 +179,7 @@ en:
   no_exercises: Nobody created an exercise for this search yet
   no_guides: Nobody created a guide for this search yet
   no_messages: It seems you don't have any messages yet!
+  no_need_hint: This exercise has no hint
   no_questions: It seems there isn't any question yet.
   no_submissions: It seems like you haven't tried to solve this exercise
   no_useful_result: Didn't find what you were looking for?
@@ -222,6 +223,7 @@ en:
   retry_exercise: Retry
   running: running
   save: Save
+  see_context: Watch exercise introduction animation
   sending_solution: Sending solution
   show: Show
   sign_in: Sign in

data/lib/mumuki/laboratory/locales/es-CL.yml

@@ -85,7 +85,6 @@ es-CL:
       gone: ¡Ups! El contenido expiró
       internal_server_error: ¡Ups! Algo no anduvo bien
       not_found: ¡Ups!  La página no existe
-  exam_number: 'Examen %{number}:'
   exams: Exámenes
   exercise: Ejercicio
   exercise_count: ejercicios
@@ -104,7 +103,7 @@ es-CL:
   first_name: Nombre
   forbidden_explanation: ¿Puede que hayas ingresado con una cuenta incorrecta?
   format: Dar formato
-  forum_terms_link: Si tienes alguna duda, consulta las %{terms_link}
+  forum_terms_link: Si tienes alguna duda, accede a las %{terms_link}
   fullscreen: "Pantalla completa"
   gender: Género
   get_messages: "Ver mensajes"
@@ -142,6 +141,7 @@ es-CL:
   let_us_know: ¡Por favor avísanos!
   level: Nivel
   level_up: ¡Subiste de nivel!
+  listen_statement: Escucha la consigna
   loading: Cargando
   load_solution_into_console: Cargar la solución en la consola
   locked_content: 'Éste contenido se desbloqueará cuando termines los capítulos anteriores'
@@ -176,6 +176,7 @@ es-CL:
   no_exercises: No encontramos ejercicios que coincidan con tu búsqueda.
   no_guides: No encontramos lecciones que coincidan con tu búsqueda.
   no_messages: ¡Parece que no tienes ningún mensaje todavía!
+  no_need_hint: 'Este ejercicio no tiene pista'
   no_questions: Parece que aún no hay ninguna consulta.
   no_submissions: ¡Parece que aún no intentaste resolver este ejercicio!
   no_useful_result: ¿No encontraste lo que estabas buscando?
@@ -220,6 +221,7 @@ es-CL:
   retry_exercise: Reintentar
   running: procesando
   save: Guardar
+  see_context: Mira la animación del principio
   send: Enviar
   sending_solution: Enviando solución
   show: Mostrar

data/lib/mumuki/laboratory/locales/es.yml

@@ -93,7 +93,6 @@ es:
       gone: ¡Ups! El contenido expiró
       internal_server_error: ¡Ups! Algo no anduvo bien
       not_found: ¡Ups!  La página no existe
-  exam_number: 'Examen %{number}:'
   exams: Exámenes
   exercise: Ejercicio
   exercise_count: ejercicios
@@ -112,8 +111,8 @@ es:
   first_name: Nombre
   forbidden_explanation: ¿Puede que hayas ingresado con una cuenta incorrecta?
   format: Dar formato
-  forum_terms: Reglas del foro
-  forum_terms_link: Si tenés alguna duda, consultá las %{terms_link}
+  forum_terms: Reglas del espacio de consultas
+  forum_terms_link: Si tenés alguna duda, accedé a las %{terms_link}
   fullscreen: "Pantalla completa"
   gender: Género
   get_messages: "Ver mensajes"
@@ -158,6 +157,7 @@ es:
   let_us_know: ¡Por favor avisanos!
   level: Nivel
   level_up: ¡Subiste de nivel!
+  listen_statement: Escuchá la consigna
   loading: Cargando
   load_solution_into_console: Cargar la solución en la consola
   locked_content: 'Este contenido se desbloqueará cuando termines los capítulos anteriores'
@@ -192,6 +192,7 @@ es:
   no_exercises: No encontramos ejercicios que coincidan con tu búsqueda.
   no_guides: No encontramos lecciones que coincidan con tu búsqueda.
   no_messages: ¡Parece que no tenés ningun mensaje todavía!
+  no_need_hint: Este ejercicio no tiene pista
   no_questions: Parece que aún no hay ninguna consulta.
   no_submissions: ¡Parece que aún no intentaste resolver este ejercicio aún!
   no_useful_result: ¿No encontraste lo que estabas buscando?
@@ -240,6 +241,7 @@ es:
   retry_exercise: Reintentar
   running: procesando
   save: Guardar
+  see_context: Mirá la animación del principio
   send: Enviar
   sending_solution: Enviando solución
   show: Mostrar
@@ -325,3 +327,4 @@ es:
   you_must_sign_in_before_submitting: Tenés que iniciar sesión antes de empezar a enviar tus soluciones
   you_never_submitted_solutions: Parece que nunca enviaste soluciones desde que creaste tu cuenta.
   your_new_organization: tu nueva organización
+