mumuki-laboratory 8.2.1 → 8.3.0

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

@@ -10,6 +10,10 @@ $kids-speech-border: 1px solid $kids-speech-border-color;
 
 $kids-speech-tabs-width: 40px;
 
+.mu-kids-exercise-workspace.mu-submitless-exercise .mu-kids-submit-button {
+  display: none;
+}
+
 .mu-kids-exercise {
   height: $kids-height;
   min-height: $kids-height;

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

@@ -131,6 +131,7 @@ $capital-animation-width: 135px;
         'success': $mu-color-success,
         'warning': $mu-color-warning,
         'passed': $mu-color-success,
+        'passed_with_warnings': $mu-color-warning,
         'passed-with-warnings': $mu-color-warning,
         'failed': $mu-color-danger,
         'errored': $mu-color-broken,

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

@@ -15,11 +15,15 @@
   }
   .terms-card-header {
     cursor: pointer;
+    outline: 0;
     font-weight: bold;
     padding: .75rem 1.25rem;
     margin-bottom: 0;
     background-color: rgba(0,0,0,.03);
     border-bottom: 1px solid rgba(0,0,0,.125);
+    &::-webkit-details-marker {
+      display:none;
+    }
   }
   &:first-child .terms-card-header{
     border-radius: calc(.25rem - 1px) calc(.25rem - 1px) 0 0;

data/app/controllers/chapters_controller.rb

@@ -1,13 +1,17 @@
 require 'addressable/uri'
 
-class ChaptersController < ApplicationController
-  include Mumuki::Laboratory::Controllers::Content
+# It acts as a guide container in monolesson contexts
+class ChaptersController < GuideContainerController
   include Mumuki::Laboratory::Controllers::ImmersiveNavigation
 
-  def show
-  end
-
   def subject
     @chapter ||= Chapter.find_by(id: params[:id])
   end
+
+  private
+
+  def set_guide
+    @monolesson = subject.monolesson
+    @guide = @monolesson&.guide
+  end
 end

data/app/controllers/guide_container_controller.rb

@@ -4,18 +4,13 @@ class GuideContainerController < ApplicationController
   before_action :set_guide
 
   def show
-    if current_user?
-      @stats = subject.stats_for(current_user)
-      @next_exercise = subject.next_exercise(current_user)
-    else
-      @next_exercise = subject.first_exercise
-    end
+    @stats = subject.stats_for(current_user)
+    @next_exercise = subject.next_exercise(current_user)
   end
 
   private
 
   def set_guide
-    raise Mumuki::Domain::NotFoundError if subject.nil?
     @guide = subject.guide
   end
 end

data/app/helpers/contextualization_result_helper.rb

@@ -16,14 +16,6 @@ module ContextualizationResultHelper
       :hidden_done
     elsif contextualization.exercise.choice?
       contextualization.solved? ? :correct_answer : :wrong_answer
-    else
-      contextualization_status_translation_key contextualization
-    end
-  end
-
-  def contextualization_status_translation_key(contextualization)
-    if contextualization.exercise.input_kindergarten?
-      "kindergarten_#{contextualization.submission_status}"
     else
       contextualization.submission_status
     end

data/app/helpers/discussions_helper.rb

@@ -52,6 +52,14 @@ module DiscussionsHelper
     profile_picture_for(user, class: image_class)
   end
 
+  def forum_terms_link
+    %Q{
+      <span>
+        #{ t(:forum_terms_link, terms_link: link_to_forum_terms).html_safe }
+      </span>
+    }.html_safe
+  end
+
   def discussions_link_with_teaser(item)
     %Q{
       <div>

data/app/helpers/menu_bar_helper.rb

@@ -42,4 +42,8 @@ module MenuBarHelper
   def menu_item(icon, name, url)
     link_to fixed_fa_icon(icon, text: t(name)), url, role: 'menuitem', tabindex: '-1'
   end
+
+  def any_menu_bar_links?
+    menu_bar_links.any?
+  end
 end

data/app/views/book_discussions/index.html.erb

@@ -10,7 +10,7 @@
 
 <div class="row">
   <div class="mu-inline-block-left">
-    <h1><%= @debatable.name %></h1>
+    <h1><%= t :forum %></h1>
   </div>
 </div>
 
@@ -21,3 +21,5 @@
     <%= render partial: 'layouts/discussions' %>
   <% end %>
 </div>
+
+<%= forum_terms_link %>

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

@@ -3,9 +3,14 @@
 <% end %>
 
 <div class="chapter-description">
-  <h1>
-    <span class="hidden-xs"><%= t(:chapter_number, number: @chapter.number) %>:&nbsp;</span>
-    <span><%= @chapter.name %></span>
+  <h1 class="pull-left">
+    <span class="hidden-xs pull-left"><%= t(:chapter_number, number: @chapter.number) %>:&nbsp;</span>
+    <span class="pull-left"><%= @chapter.name %></span>
+    <% if @chapter.monolesson? %>
+      <div class="mu-monolesson pull-left">
+        <%= render partial: 'layouts/guide_title_icons' %>
+      </div>
+    <% end %>
   </h1>
 
   <%= @chapter.description_html %>
@@ -13,14 +18,21 @@
 </div>
 
 <% if @chapter.lessons.present? %>
-<div>
-  <h3><%= t(:lessons) %></h3>
+  <% if @chapter.monolesson? %>
+    <div class="mu-monolesson">
+      <%= render partial: 'layouts/guide', locals: { subject: @monolesson } %>
+    </div>
+  <% else %>
+    <div>
+      <h3><%= t(:lessons) %></h3>
 
-  <% @chapter.lessons.each do |lesson| %>
-    <h4><%= lesson.number %>. <%= link_to_path_element lesson, mode: :plain %></h4>
-    <%= render partial: 'layouts/progress_listing', locals: {exercises: lesson.exercises} %>
+      <% @chapter.lessons.each do |lesson| %>
+        <h4><%= lesson.number %>. <%= link_to_path_element lesson, mode: :plain %></h4>
+        <%= render partial: 'layouts/progress_listing', locals: { exercises: lesson.exercises } %>
+      <% end %>
+    </div>
   <% end %>
-</div>
+
 <% end %>
 
 <% if @chapter.appendix.present? %>

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

@@ -1 +1 @@
-<%= render partial: "layouts/guide", locals: { subject: @complement }%>
+<%= render partial: "layouts/guide_container", locals: { subject: @complement }%>

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

@@ -2,17 +2,22 @@
   <%= breadcrumbs(@debatable, t(:discussions)) %>
 <% end %>
 
+<div class="row">
+  <div class="mu-inline-block-left">
+    <h1><%= t :forum %></h1>
+  </div>
+</div>
 <div class="row">
   <% if @debatable.respond_to? :language %>
     <div class="mu-inline-block-right hidden-xs">
-      <h1><%= language_icon @debatable.language %></h1>
+      <h3><%= language_icon @debatable.language %></h3>
     </div>
   <% end %>
   <div class="mu-inline-block-left">
-    <h1>
+    <h3>
       <span class="hidden-xs"><%= t("#{@debatable_class.downcase}_number", number: @debatable.number) %>:&nbsp;</span>
       <span><%= @debatable.name %></span>
-    </h1>
+    </h3>
   </div>
 </div>
 
@@ -23,7 +28,9 @@
   <%= new_discussion_link(:no_useful_result, :ask_a_question) %>
 <% end %>
 
-  <%= content_for :no_container do %>
+<%= content_for :no_container do %>
 <% end if current_user? %>
 
+<%= forum_terms_link %>
+
 

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

@@ -1 +1 @@
-<%= render partial: "layouts/guide", locals: { subject: @exam }%>
+<%= render partial: "layouts/guide_container", locals: { subject: @exam }%>

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

@@ -6,7 +6,7 @@
 
 <%= render partial: 'layouts/authoring', locals: {guide: @guide} %>
 
-<% @stats = @exercise.guide.stats_for(current_user) if current_user && @exercise.guide %>
+<% @stats = @exercise.stats_for(current_user) %>
 
 <% if @exercise.navigable_parent.timed? && !current_user.teacher? %>
   <%= render partial: 'layouts/timer', locals: {end_time: @exercise.navigable_parent.real_end_time(current_user)} %>

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

@@ -84,7 +84,3 @@
 
   <% end %>
 </div>
-
-<span>
-  <%= t(:forum_terms_link, terms_link: link_to_forum_terms).html_safe %>
-</span>

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

@@ -1,41 +1,12 @@
 <%= render_runner_assets @guide.language, :layout %>
 
-<%= content_for :breadcrumbs do %>
-  <%= breadcrumbs subject %>
-<% end %>
-
 <%= render partial: 'layouts/authoring', locals: {guide: @guide} %>
 
 <% if subject.timed? && subject.started?(current_user) && !current_user.teacher? %>
   <%= render partial: 'layouts/timer', locals: {end_time: subject.real_end_time(current_user)} %>
 <% end %>
 
-<div class="row">
-  <div class="mu-inline-block-right">
-    <h1><%= language_icon @guide.language %></h1>
-  </div>
-  <div class="mu-inline-block-left guide-header">
-    <h1 class="pull-left">
-      <span class="pull-left">
-        <%= subject.name %>
-      </span>
-      <% if current_user? && should_display_medal?(@guide, Organization.current) %>
-        <div class="pull-left">
-          <%= content_medal_for(@guide, current_user) %>
-        </div>
-      <% end %>
-      <%= teacher_info_button @guide%>
-      <%= link_to_bibliotheca_guide @guide %>
-    </h1>
-  </div>
-</div>
-<div class="row">
-  <div class="col-md-12">
-    <div class="text-box">
-      <%= @guide.description_html %>
-    </div>
-  </div>
-</div>
+<%= yield if block_given? %>
 
 <h3>
   <%= t :exercises %>

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

@@ -0,0 +1,28 @@
+<%= content_for :breadcrumbs do %>
+  <%= breadcrumbs subject %>
+<% end %>
+
+<%= render layout: 'layouts/guide', locals: { subject: subject } do %>
+
+  <div class="row">
+    <div class="mu-inline-block-right">
+      <h1><%= language_icon @guide.language %></h1>
+    </div>
+    <div class="mu-inline-block-left guide-header">
+      <h1 class="pull-left">
+        <span class="pull-left">
+          <%= subject.name %>
+        </span>
+        <%= render partial: 'layouts/guide_title_icons' %>
+      </h1>
+    </div>
+  </div>
+  <div class="row">
+    <div class="col-md-12">
+      <div class="text-box">
+        <%= @guide.description_html %>
+      </div>
+    </div>
+  </div>
+
+<% end %>

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

@@ -0,0 +1,9 @@
+<div class="guide-title-icons pull-left">
+  <% if current_user? && should_display_medal?(@guide, Organization.current) %>
+    <div class="pull-left">
+      <%= content_medal_for(@guide, current_user) %>
+    </div>
+  <% end %>
+<%= teacher_info_button @guide %>
+<%= link_to_bibliotheca_guide @guide %>
+</div>

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

@@ -1,4 +1,4 @@
-<a class="fab fa-facebook-f social-icon" aria-label="Facebook" href="https://www.facebook.com/MumukiOrg" target="_blank"></a>
+<a class="fab fa-instagram social-icon" aria-label="Instagram" href="https://www.instagram.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-youtube social-icon" aria-label="Youtube" href="https://www.youtube.com/c/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/application.html.erb

@@ -38,7 +38,9 @@
             </div>
             <ul class="dropdown-menu dropdown-menu-right" aria-labelledby="profileDropdown">
               <%= menu_bar_list_items %>
-              <li class="divider"></li>
+              <% if any_menu_bar_links? %>
+                <li class="divider"></li>
+              <% end %>
               <%= logout_link %>
             </ul>
           </div>

data/app/views/layouts/exercise_inputs/layouts/_input_kindergarten.html.erb

@@ -1,6 +1,6 @@
 <% content_for :no_container do %>
 
-  <div <%= turbolinks_enable_for exercise %>>
+  <div <%= turbolinks_enable_for exercise %> data-i18n-prefix="kindergarten">
 
     <div class="mu-kids-landscape-support container-fluid">
       <img class="mu-kids-character-animation"/>

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

@@ -8,7 +8,7 @@
       </button>
       <div class="modal-header">
         <h4 class="modal-title text-broken">
-          <strong><%= t :kindergarten_aborted %></strong>
+          <strong><%= t :aborted %></strong>
         </h4>
       </div>
       <div class="modal-body">

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

@@ -1 +1 @@
-<%= render partial: "layouts/guide", locals: { subject: @lesson }%>
+<%= render partial: "layouts/guide_container", locals: { subject: @lesson }%>

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

@@ -1,7 +1,7 @@
 <div class="terms-card">
   <details <%= 'open' unless collapsed %>>
     <summary class="terms-card-header">
-      <h4><%= term.header %></h4>
+      <h4 class="terms-card-title"><%= term.header %></h4>
     </summary>
     <div class="terms-card-body">
       <%= term.content_html %>

data/lib/mumuki/laboratory/controllers/results_rendering.rb

@@ -20,7 +20,8 @@ module Mumuki::Laboratory::Controllers::ResultsRendering
                   .merge(
                     html: render_results(layout, assignment),
                     remaining_attempts_html: remaining_attempts_text(assignment),
-                    current_exp: UserStats.exp_for(assignment.submitter))
+                    current_exp: UserStats.exp_for(assignment.submitter),
+                    in_gamified_context: Organization.current.gamification_enabled?)
   end
 
   def merge_kids_specific_renders(assignment, results)

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

@@ -105,6 +105,7 @@ en:
   first_name: First Name
   forbidden_explanation: Please verify you have logged in with the right account
   format: Format
+  forum: Forum
   forum_terms: Forum rules
   forum_terms_link: If you have any questions, please check %{terms_link}
   fullscreen: "Fullscreen"
@@ -129,12 +130,6 @@ en:
   joining_html: '¡Welcome to course <strong>%{course}</strong>!'
   keep_learning: Keep learning!
   kids_default_success: You did it great!
-  kindergarten_passed: "Your program worked great!"
-  kindergarten_passed_with_warnings: "Your program worked great!"
-  kindergarten_pending: "There's an error in your program. Try again!"
-  kindergarten_failed: "There's an error in your program. Try again!"
-  kindergarten_errored: "There's an error in your program. Try again!"
-  kindergarten_aborted: "Ups! Something went wrong"
   language: Language
   last_name: Last Name
   last_seen: "Seen by %{name}"
@@ -261,7 +256,7 @@ en:
   tell_us_how: Please tell us how this happened!
   tell_us_if_our_error: If you think this is our fault, %{issues}
   terms_accepted: The terms and conditions were accepted
-  terms_and_conditions: Terms and conditions
+  terms_and_conditions: Terms and Conditions
   terms_and_conditions_continue_disclaimer: By continuing you agree to %{terms_link}
   terms_and_conditions_must_be_accepted: You must accept the terms and conditions
   test_results: Test results

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

@@ -103,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, accede a las %{terms_link}
+  forum_terms_link: No olvides que al participar debes cumplir las %{terms_link}
   fullscreen: "Pantalla completa"
   gender: Género
   get_messages: "Ver mensajes"
@@ -263,7 +263,7 @@ es-CL:
   teacher_info: Información para docentes
   tell_us_how: ¡Cuéntanos cómo te pasó esto!
   tell_us_if_our_error: Si piensas que es un error nuestro, %{issues}
-  terms_and_conditions: Términos y condiciones
+  terms_and_conditions: Términos y Condiciones
   terms_and_conditions_continue_disclaimer: Al continuar aceptas los %{terms_link}
   terms_and_conditions_must_be_accepted: Tienes que aceptar los términos y condiciones
   test_results: Resultados de las pruebas

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

@@ -111,8 +111,9 @@ es:
   first_name: Nombre
   forbidden_explanation: ¿Puede que hayas ingresado con una cuenta incorrecta?
   format: Dar formato
-  forum_terms: Reglas del espacio de consultas
-  forum_terms_link: Si tenés alguna duda, accedé a las %{terms_link}
+  forum: Espacio de Consultas
+  forum_terms: Reglas del Espacio de Consultas
+  forum_terms_link: No olvides que al participar debés cumplir las %{terms_link}
   fullscreen: "Pantalla completa"
   gender: Género
   get_messages: "Ver mensajes"
@@ -138,12 +139,6 @@ es:
   joining_html: '¡Te damos la bienvenida al curso <strong>%{course}</strong>!'
   keep_learning: ¡Seguí aprendiendo!
   kids_default_success: "¡Lo hiciste muy bien!"
-  kindergarten_passed: "¡Tu programa está muy bien!"
-  kindergarten_passed_with_warnings: "¡Tu programa está muy bien!"
-  kindergarten_pending: "Hay un error en tu programa. ¡Intentá de nuevo!"
-  kindergarten_failed: "Hay un error en tu programa. ¡Intentá de nuevo!"
-  kindergarten_errored: "Hay un error en tu programa. ¡Intentá de nuevo!"
-  kindergarten_aborted: "¡Ups! Hubo un problema técnico"
   language: Lenguaje
   languages: Lenguajes
   last_name: Apellido
@@ -284,7 +279,7 @@ es:
   tell_us_how: ¡Contanos cómo te pasó esto!
   tell_us_if_our_error: Si pensás que es un error nuestro, %{issues}
   terms_accepted: Los términos y condiciones fueron aceptados
-  terms_and_conditions: Términos y condiciones
+  terms_and_conditions: Términos y Condiciones
   terms_and_conditions_continue_disclaimer: Al continuar estás aceptando los %{terms_link}
   terms_and_conditions_must_be_accepted: Tenés que aceptar los términos y condiciones
   test_results: Resultados de las pruebas