mumuki-laboratory 8.1.0 → 8.2.1

data/app/assets/javascripts/mumuki_laboratory/application/results-renderer.js

@@ -49,7 +49,7 @@ mumuki.renderers.results = (() => {
     classForStatus,
     iconForStatus,
     progressListItemClassForStatus
-  }
+  };
 })();
 
 /** @deprecated use {@code mumuki.renderers.results.classForStatus} instead */

data/app/assets/javascripts/mumuki_laboratory/application/speech-bubble-renderer.js

@@ -20,7 +20,7 @@ mumuki.renderers.speechBubble = (()=> {
 
     _chooseResultItem() {
       if (this._responseStatus() !== 'passed' && this._hasTips()) {
-        this._appendFirstTip()
+        this._appendFirstTip();
       } else if (this._responseStatus() === 'failed') {
         this._appendFirstFailedTestResultSummary();
       } else if (this._responseStatus() === 'passed_with_warnings') {
@@ -29,7 +29,7 @@ mumuki.renderers.speechBubble = (()=> {
     }
 
     _appendFirstFailedTestResultSummary() {
-      const failedTestResult = this._failedTestResults()[0]
+      const failedTestResult = this._failedTestResults()[0];
       if (failedTestResult && failedTestResult.summary) {
         this._appendResultItem(mumuki.renderers.renderSpeechBubbleResultItem(failedTestResult.summary));
       }
@@ -67,7 +67,7 @@ mumuki.renderers.speechBubble = (()=> {
     }
 
     _hasTips() {
-      return this.responseData.tips && this.responseData.tips.length
+      return this.responseData.tips && this.responseData.tips.length;
     }
 
     _failedTestResults() {
@@ -97,7 +97,7 @@ mumuki.renderers.speechBubble = (()=> {
   return {
     SpeechBubbleRenderer,
     renderSpeechBubbleResultItem
-  }
+  };
 })();
 
 /** @deprecated use {@code mumuki.renderers.speechBubble.SpeechBubbleRenderer} instead */

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

@@ -101,7 +101,7 @@ mumuki.submission = (() => {
         });
         mumuki.kids.showResult(data);
       });
-    }
+    };
   }
 
   /** Processor for non-kids layouts */
@@ -118,7 +118,7 @@ mumuki.submission = (() => {
         $(document).renderMuComponents();
         resultsBox.done(data, submitButton);
       });
-    }
+    };
   }
 
   /** Selects the most appropriate solution processor */

data/app/assets/javascripts/mumuki_laboratory/application/submissions-store.js

@@ -96,7 +96,7 @@ mumuki.SubmissionsStore = (() => {
     _keyFor(exerciseId) {
       return `/exercise/${exerciseId}/submission`;
     }
-  };
+  }();
 
   return SubmissionsStore;
 })();
@@ -106,5 +106,5 @@ mumuki.load(() => {
     if (e.detail[0]) {
       mumuki.SubmissionsStore.clear();
     }
-  })
-})
+  });
+});

data/app/assets/javascripts/mumuki_laboratory/application/sync-mode.js

@@ -65,11 +65,11 @@ mumuki.syncMode = (() => {
 
     /** @type {ClientSyncMode|ServerSyncMode}*/
     _current: null
-  }
+  };
 })();
 
 mumuki.load(() => {
   mumuki.syncMode._selectSyncMode();
   mumuki.syncMode._current.syncProgress();
   mumuki.syncMode._current.syncEditorContent();
-})
+});

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

@@ -16,5 +16,5 @@ mumuki.startTimer = (() => {
       }
     }, intervalDuration);
   }
-  return startTimer
+  return startTimer;
 })();

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

@@ -25,13 +25,13 @@ body {
   margin-bottom: 110px;
 }
 
-.footer {
-  position: absolute;
-  bottom: 0;
-  width: 100%;
-  height: 110px;
-  .container {
-    margin-top: 33px;
+.mu-footer {
+  &.container {
+    margin-top: 45px;
+  }
+  .mu-footer-terms {
+    font-size: 15px;
+    text-align: center;
   }
 }
 

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/controllers/application_controller.rb

@@ -131,6 +131,7 @@ class ApplicationController < ActionController::Base
 
   def validate_accepted_role_terms!
     if current_user&.has_role_terms_to_accept?
+      save_location_before! :terms_acceptance
       flash.notice = I18n.t :accept_terms_to_continue
       redirect_to terms_user_path
     end

data/app/controllers/concerns/with_user_discussion_validation.rb

@@ -2,12 +2,18 @@ module WithUserDiscussionValidation
   extend ActiveSupport::Concern
 
   included do
+    # users are not allowed to access discussions during exams
+    before_action :validate_not_blocked_in_forum!
     # discussions are not enabled for all organizations nor all users
     before_action :validate_user_can_discuss!
   end
 
   private
 
+  def validate_not_blocked_in_forum!
+    raise Mumuki::Domain::BlockedForumError if current_user&.currently_in_exam?
+  end
+
   def validate_user_can_discuss!
     raise Mumuki::Domain::NotFoundError unless current_user&.can_discuss_here?
   end

data/app/controllers/discussions_controller.rb

@@ -1,8 +1,6 @@
 class DiscussionsController < ApplicationController
   include Mumuki::Laboratory::Controllers::Content
   include WithUserDiscussionValidation
-  # users are not allowed to access discussions during exams
-  before_action :validate_not_in_exam!
 
   before_action :set_debatable, except: [:subscription]
   before_action :authenticate!, only: [:update, :create]
@@ -74,8 +72,4 @@ class DiscussionsController < ApplicationController
   def discussion_filter_params
     @filter_params ||= params.permit(Discussion.permitted_query_params)
   end
-
-  def validate_not_in_exam!
-    raise Mumuki::Domain::BlockedForumError if current_user&.currently_in_exam?
-  end
 end

data/app/controllers/users_controller.rb

@@ -19,7 +19,8 @@ class UsersController < ApplicationController
 
   def accept_profile_terms
     current_user.accept_profile_terms!
-    redirect_to root_path, notice: I18n.t(:terms_accepted)
+    flash.notice = I18n.t(:terms_accepted)
+    redirect_after! :terms_acceptance, fallback_location: root_path
   end
 
   def terms

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

@@ -52,11 +52,11 @@ module LinksHelper
   end
 
   def link_to_profile_terms
-    link_to t(:terms_and_conditions).downcase, terms_user_path, target: '_blank'
+    link_to t(:terms_and_conditions), terms_user_path, target: '_blank'
   end
 
   def link_to_forum_terms
-    link_to t(:forum_terms).downcase, discussions_terms_path, target: '_blank'
+    link_to t(:forum_terms), discussions_terms_path, target: '_blank'
   end
 
   def turbolinks_enable_for(exercise)
@@ -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 %>
@@ -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/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/_copyright.html.erb

@@ -1,2 +1,2 @@
-&copy; Copyright 2015-<%= DateTime.now.year %>
+&copy; 2015-<%= DateTime.now.year %>
 <a href="http://mumuki.org/" class="mu-org-link"><span class="da da-mumuki-circle"></span> Mumuki</a>

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>