mumuki-laboratory 8.1.2 → 8.4.0

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

@@ -15,3 +15,4 @@ $da-font-path: asset-path('assets');
 @import "application/modules";
 @import "application/errors";
 @import "application/alerts";
+@import "application/codemirror-themes";

data/app/assets/stylesheets/mumuki_laboratory/application/_codemirror-themes.scss

@@ -0,0 +1 @@
+@import "codemirror-themes/mu-light";

data/app/assets/stylesheets/mumuki_laboratory/application/codemirror-themes/_mu-light.scss

@@ -0,0 +1,3 @@
+.cm-s-mu-light .CodeMirror-code {
+  padding-right: 25px;
+}

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/_overlap.scss

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

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/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/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>
@@ -67,8 +75,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 +85,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,7 +35,15 @@ 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
+
+  def any_menu_bar_links?
+    menu_bar_links.any?
+  end
 end

data/app/helpers/overlapped_buttons_helper.rb

@@ -1,6 +1,10 @@
 module OverlappedButtonsHelper
-  def restart_icon
-    overlapped_button_icon :restart, :undo
+  def expand_icon
+    overlapped_button_icon :fullscreen, :expand
+  end
+
+  def restart_icon(data_placement='left')
+    overlapped_button_icon :restart, :undo, data_placement
   end
 
   def format_icon
@@ -8,10 +12,14 @@ module OverlappedButtonsHelper
   end
 
   def restart_guide_link(guide)
-    link_to restart_icon, guide_progress_path(guide), class: 'mu-content-toolbar-item mu-restart-guide', data: {confirm: t(:confirm_restart)}, method: :delete
+    link_to restart_icon('top'),
+            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, data_placement='left')
+    fa_icon(icon, title: t(key), class: 'fa-fw', role: 'button', 'aria-label': t(key), 'data-placement': data_placement)
   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 %>
@@ -36,7 +36,7 @@
     <h2><%= t(:exams) %></h2>
     <% @exams.each_with_index do |it, index| %>
       <div class="chapter">
-        <h3> <%= t(:exam_number, number: index) %> <%= link_to_path_element it, mode: :plain %></h3>
+        <h3> <%= index + 1 %>. <%= link_to_path_element it, mode: :plain %></h3>
 
         <div class="text-box">
           <%= it.guide.description_teaser_html %>

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/_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/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/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

@@ -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)} %>
@@ -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/_discussions.html.erb

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