mumuki-laboratory 8.1.1 → 8.3.0

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/_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/_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,47 +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 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>
+<%= yield if block_given? %>
 
 <h3>
   <%= t :exercises %>
@@ -63,6 +28,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/_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/_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-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>

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,28 @@
       <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>
+              <% if any_menu_bar_links? %>
+                <li class="divider"></li>
+              <% end %>
+              <%= logout_link %>
             </ul>
           </div>
         <% else %>
@@ -52,30 +54,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/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/_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>