mumuki-laboratory 6.1.5 → 6.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 5da7fc2c103d42bde8cb1d9ee7a4f4586e2a1203
-  data.tar.gz: 43f4d2c1a46755599b66c0ed3ff745cf6076b1a0
+SHA256:
+  metadata.gz: 909a92d416ba2c5299aab4c4479952dbbe177b12fae72c72f9ea17ff21dadcd6
+  data.tar.gz: b385470e51e9e2113aa06c28b3f2c3f1aac302eec558a53ce5444f26621e8c95
 SHA512:
-  metadata.gz: f5c8d70ce1e9328d08333eefefc7caf3532df1939b1b6a48e972abf818bbf783f67bbe94eec1d30a2b80abf375007b8a94e0332d9cdb85008271ca025e21f692
-  data.tar.gz: 3045fa6100e55a01fb8041a4b52363facb5d27dfaa8e44c90a8aceaa5932a32ef1a0e6adb629b6f590bdc1573ff1ec698082a88713617f51816164670c617b24
+  metadata.gz: 7aceb26a541f78d303313bf5947aaaffda98f9357d17db6d406627a5c54e7b93563b92c12e01e70d1ce0845209ced3162c67e89dbba895db795da3628760d492
+  data.tar.gz: 830887ef20609c824490c7e4c2b15470c03cbc5a491aa620afbfc5fb3c9e6e205087adcef6071d11db7aa58da42253d708a0263bc84e13574bc09c358fafdf41

data/app/assets/javascripts/application.js

@@ -23,6 +23,7 @@
 //= require jquery-console
 
 //= require codemirror.min
+//= require codemirror-autorefresh
 //= require_tree ../../../vendor/assets/javascripts/codemirror-modes
 //= require analytics
 //= require hotjar

data/app/assets/javascripts/application/codemirror-builder.js

@@ -25,7 +25,8 @@ var mumuki = mumuki || {};
     lineWiseCopyCut: true,
     autoCloseBrackets: true,
     showCursorWhenSelecting: true,
-    lineWrapping: true
+    lineWrapping: true,
+    autoRefresh: true
   };
 
   CodeMirrorBuilder.prototype = {
@@ -61,6 +62,15 @@ var mumuki = mumuki || {};
 
       return this;
     },
+    setupReadOnlyEditor: function () {
+      this.editor = this.createEditor({
+        readOnly: true,
+        cursorBlinkRate: -1, //Hides the cursor
+        lineNumbers: true
+      });
+
+      return this;
+    },
     setupLanguage: function (language) {
       var highlightMode = language || this.$textarea.data('editor-language');
       if (highlightMode === 'dynamic') {

data/app/assets/javascripts/application/codemirror.js

@@ -83,7 +83,6 @@ var mumuki = mumuki || {};
     $('.editor-resize').click(function () {
       toggleFullscreen();
     });
-
   });
 
 }(mumuki));

data/app/assets/javascripts/application/discussions.js

@@ -19,14 +19,27 @@ mumuki.load(function () {
     var textarea = $textarea[0];
     if(!textarea) return;
 
-    new mumuki.editor.CodeMirrorBuilder(textarea)
+    return new mumuki.editor.CodeMirrorBuilder(textarea)
       .setupSimpleEditor()
       .setupMinLines($textarea.data('lines'))
       .build();
   }
 
-  createNewMessageEditor();
+  function createReadOnlyEditors() {
+    return $(".read-only-editor").map(function (index, textarea) {
+      var $textarea = $("#solution_content");
 
+      return new mumuki.editor.CodeMirrorBuilder(textarea)
+        .setupReadOnlyEditor()
+        .setupMinLines($textarea.data('lines'))
+        .setupLanguage()
+        .build();
+    });
+  }
+
+  createReadOnlyEditors();
+  createNewMessageEditor();
+  
   var Forum = {
     toggleButton: function (spans) {
       spans.toggleClass('hidden');

data/app/assets/javascripts/application/free-form.js

@@ -20,7 +20,7 @@ mumuki.load(() => {
     if (!json) return;
 
     let values = JSON.parse(json);
-    $('.mu-read-only-free-form .mu-free-form-input').prop('disabled', true);
+    $('.mu-read-only-editor .mu-free-form-input').prop('disabled', true);
 
     $('.mu-free-form-input').each(function () {
       loadInput(values, $(this));

data/app/assets/javascripts/application/kids.js

@@ -160,7 +160,7 @@ mumuki.load(function () {
       mumuki.kids._hideMessageOnCharacterBubble();
       var $bubble = mumuki.kids.getCharacterBubble();
       Object.keys(mumuki.kids.resultAction).forEach($bubble.removeClass.bind($bubble));
-      mumuki.kids.getCharaterImage().attr('src', '/anim_amarillo.svg');
+      mumuki.kids.getCharaterImage().attr('src', '/kibi_animated.svg');
     },
 
     _hideMessageOnCharacterBubble: function () {
@@ -186,7 +186,7 @@ mumuki.load(function () {
 
     _showOnSuccessPopup: function (data) {
       mumuki.kids.getSubmissionResult().html(data.html);
-      mumuki.kids.getCharaterImage().attr('src', '/amarillo_exito.svg');
+      mumuki.kids.getCharaterImage().attr('src', '/kibi_success.svg');
       mumuki.kids._showMessageOnCharacterBubble(data);
       setTimeout(function () {
         var results_kids_modal = mumuki.kids.getResultsModal();
@@ -209,7 +209,7 @@ mumuki.load(function () {
     },
 
     _showOnCharacterBubble: function (data) {
-      mumuki.kids.getCharaterImage().attr('src', '/amarillo_fracaso.svg');
+      mumuki.kids.getCharaterImage().attr('src', '/kibi_failure.svg');
       mumuki.kids._showMessageOnCharacterBubble(data);
     },
 

data/app/assets/javascripts/application/load-error-svg.js

@@ -8,7 +8,7 @@ mumuki.load(function () {
     addImage(mumuki.errors, 'error_' + svgErrorSuffix, '/');
   });
 
-  addImage(mumuki.characters, 'yellow_context', '/character/kids/');
+  addImage(mumuki.characters, 'kibi_context', '/character/kids/');
   addImage(mumuki.characters, 'magnifying_glass_apparition', '/');
   addImage(mumuki.characters, 'magnifying_glass_loop', '/');
 

data/app/controllers/invitations_controller.rb

@@ -28,7 +28,7 @@ class InvitationsController < ApplicationController
   end
 
   def set_invitation!
-    @invitation = Invitation.find_by_code params[:code]
+    @invitation = Invitation.locate!(params[:code]).unexpired
     @organization = @invitation.organization
   end
 end

data/app/helpers/application_helper.rb

@@ -1,20 +1,6 @@
 module ApplicationHelper
   include WithStudentPathNavigation
 
-  def contact_email
-    Organization.current.contact_email
-  end
-
-  def page_title(subject)
-    name = "Mumuki#{Organization.current.title_suffix}"
-
-    if subject && !subject.new_record?
-      "#{subject.friendly} - #{name}"
-    else
-      "#{name} - #{t :mumuki_catchphrase}"
-    end
-  end
-
   def profile_picture
     image_tag(current_user.image_url, height: 40, class: 'img-circle', onError: "this.onerror = null; this.src = '#{image_url('user_shape.png')}'")
   end
@@ -33,14 +19,6 @@ module ApplicationHelper
     end
   end
 
-  def assistance_box(assignment)
-    if assignment.tips.present?
-      %Q{<div class="mu-tips-box">
-        #{Mumukit::Assistant::Narrator.random.compose_explanation_html assignment.tips}
-      </div>}.html_safe
-    end
-  end
-
   def chapter_finished(chapter)
     t :chapter_finished_html, chapter: link_to_path_element(chapter) if chapter
   end

data/app/helpers/assets_helper.rb

@@ -0,0 +1,12 @@
+module AssetsHelper
+  def assets_include_tags
+    %Q{
+      <meta name="turbolinks-cache-control" content="no-cache">
+      #{stylesheet_link_tag 'application', media: 'all', 'data-turbolinks-track': 'reload'}
+      #{javascript_include_tag 'application', 'data-turbolinks-track': 'reload'}
+      <link rel="icon" type="image/x-icon" href="#{Organization.current.favicon_url}" data-turbolinks-track="reload">
+      <link rel="stylesheet" type="text/css" href="#{theme_stylesheet_url}" data-turbolinks-track="reload">
+      <script type="text/javascript" src="#{extension_javascript_url}" defer data-turbolinks-track="reload"></script>
+    }.html_safe
+  end
+end

data/app/helpers/assignment_result_helper.rb

@@ -21,7 +21,7 @@ module AssignmentResultHelper
 
   def report_bug_link(assignment, organization=Organization.current)
     if organization.report_issue_enabled?
-      mail_to contact_email,
+      mail_to organization.contact_email,
         fa_icon(:bug, text: t(:notify_problem_with_exercise), class: 'fa-fw'),
         subject: t(:problem_with_exercise, title: @exercise.name),
         body: assignment_help_email_body(assignment),

data/app/helpers/assistance_box_helper.rb

@@ -0,0 +1,9 @@
+module AssistanceBoxHelper
+  def assistance_box(assignment)
+    if assignment.tips.present?
+      %Q{<div class="mu-tips-box">
+        #{Mumukit::Assistant::Narrator.random.compose_explanation_html assignment.tips}
+      </div>}.html_safe
+    end
+  end
+end

data/app/helpers/editor_helper.rb

@@ -0,0 +1,13 @@
+module EditorHelper
+  def editor_defaults(language, options, styles = '')
+    {class: styles,
+     data: {placeholder: I18n.t(:editor_placeholder),
+            'editor-language' => language},
+     rows: 15}.deep_merge(options)
+  end
+
+  def read_only_editor(content, language, options = {})
+    editor_options = editor_defaults(language, options, 'read-only-editor')
+    text_area_tag :solution_content, content, editor_options
+  end
+end

data/app/helpers/locale_helper.rb

@@ -0,0 +1,11 @@
+module LocaleHelper
+  def locale_tags
+    %Q{
+      <script type="text/javascript">
+        window.mumukiLocale = #{raw Organization.current.locale_json};
+        mumuki.locale = '#{Organization.current.locale}';
+        moment.locale('#{Organization.current.locale}');
+      </script>
+    }.html_safe
+  end
+end

data/app/helpers/menu_bar_helper.rb

@@ -1,4 +1,17 @@
 module MenuBarHelper
+  def menu_bar_links
+    [
+      link_to_classroom,
+      link_to_bibliotheca,
+      solve_discussions_link,
+      user_discussions_link
+    ]
+  end
+
+  def menu_bar_list_items
+    menu_bar_links.compact.map { |link| "<li>#{link}<li>" }.join.html_safe
+  end
+
   def link_to_classroom
     link_to_application 'graduation-cap', :classroom, :teacher_here?
   end

data/app/helpers/multiple_file_editor_helper.rb

@@ -6,4 +6,9 @@ module MultipleFileEditorHelper
   def multifile_locales
     :insert_file_name.try { |it| { it => t(it) } }
   end
+
+  def multifile_hidden_inputs
+    hidden_field_tag('highlight-modes', highlight_modes.to_json)
+    hidden_field_tag('multifile-locales', multifile_locales.to_json)
+  end
 end

data/app/helpers/open_graph_helper.rb

@@ -0,0 +1,12 @@
+module OpenGraphHelper
+  def open_graph_tags(subject)
+    %Q{
+      <meta property="og:site_name" content="#{Organization.current.site_name}" />
+      <meta property="og:title" content="#{page_title subject}"/>
+      <meta property="og:description" content="#{Organization.current.central? ? t(:mumuki_short_description) : Organization.current.description}"/>
+      <meta property="og:type" content="website"/>
+      <meta property="og:image" content="#{Organization.current.open_graph_image_url}"/>
+      <meta property="og:url" content="#{request.original_url}"/>
+    }.html_safe
+  end
+end

data/app/helpers/page_title_helper.rb

@@ -0,0 +1,11 @@
+module PageTitleHelper
+  def page_title(subject)
+    name = "Mumuki#{Organization.current.title_suffix}"
+
+    if subject && !subject.new_record?
+      "#{subject.friendly} - #{name}"
+    else
+      "#{name} - #{t :mumuki_catchphrase}"
+    end
+  end
+end

data/app/views/exercise_solutions/_kids_results.html.erb

@@ -12,7 +12,7 @@
   <%= corollary_box @exercise %>
 <% else %>
   <div class="mu-kids-default-success">
-    <img src="/amarillo_exito_bailarin.svg" class="capital-animation"/>
+    <img src="/kibi_success_dancing.svg" class="capital-animation"/>
     <p><%= t :kids_default_success %></p>
   </div>
 <% end %>

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

@@ -55,7 +55,9 @@
         <div role="tabpanel" class="tab-pane active" id="solution">
           <div class="mu-tab-body">
             <div role="tabpanel" class="tab-pane mu-input-panel fade in active" id="editor">
-              <%= render_exercise_read_only_editor exercise, @discussion.solution %>
+              <div class="mu-read-only-editor">
+                <%= render_exercise_read_only_editor exercise, @discussion.solution %>
+              </div>
             </div>
           </div>
         </div>

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

@@ -2,7 +2,7 @@
     <%= breadcrumbs @invitation %>
 <% end %>
 <div>
-  <h3><%= raw t(:joining, course: @invitation.course) %> </h3>
+  <h3><%= raw t(:joining, course: @invitation.course.name) %> </h3>
 </div>
 <div>
   <span><%= t :please_validate %></span>

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

@@ -1,4 +1,4 @@
-<img src="/anim_amarillo.svg" alt="">
+<img src="/kibi_animated.svg" alt="">
 <div class="mu-kids-character-speech-bubble <%= 'no-tabs' unless exercise.hint? %>">
   <% if exercise.hint? %>
       <ul class="mu-kids-character-speech-bubble-tabs">

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

@@ -6,28 +6,13 @@
     <meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no">
   <% end %>
 
-  <link rel="icon" type="image/x-icon" href="<%= Organization.current.favicon_url %>" data-turbolinks-track="reload">
-  <link rel="stylesheet" type="text/css" href="<%= theme_stylesheet_url %>" data-turbolinks-track="reload">
-
-  <meta property="og:site_name" content="<%= Organization.current.site_name %>" />
-  <meta property="og:title" content="<%= page_title subject %>"/>
-  <meta property="og:description" content="<%= Organization.current.central? ? t(:mumuki_short_description) : Organization.current.description %>"/>
-  <meta property="og:type" content="website"/>
-  <meta property="og:image" content="<%= Organization.current.open_graph_image_url %>"/>
-  <meta property="og:url" content="<%= request.original_url %>"/>
-
-  <meta name="turbolinks-cache-control" content="no-cache">
-
   <meta name="description" content="<%= t :mumuki_short_description %>"/>
-  <%= stylesheet_link_tag 'application', media: 'all', 'data-turbolinks-track': 'reload' %>
+
+  <%= open_graph_tags subject %>
+  <%= assets_include_tags %>
   <%= csrf_meta_tags %>
-  <%= javascript_include_tag 'application', 'data-turbolinks-track': 'reload' %>
-  <script type="text/javascript" src="<%= extension_javascript_url %>" defer data-turbolinks-track="reload"></script>
-  <script type="text/javascript">
-    window.mumukiLocale = <%= raw Organization.current.locale_json %>;
-    mumuki.locale = '<%= Organization.current.locale %>';
-    moment.locale('<%= Organization.current.locale %>');
-  </script>
+  <%= locale_tags %>
+
   <%= login_form.header_html %>
 </head>
 <body>

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

@@ -31,13 +31,8 @@
               <%= profile_picture %>
             </span>
             <ul class="dropdown-menu dropdown-menu-right" aria-labelledby="profileDropdown">
-              <li>
-                <%= link_to fixed_fa_icon('user-o', text: t(:profile)), user_path, role: 'menuitem' %>
-              </li>
-              <li><%= link_to_classroom %></li>
-              <li><%= link_to_bibliotheca %></li>
-              <li><%= solve_discussions_link %></li>
-              <li><%= user_discussions_link %></li>
+              <li><%= link_to fixed_fa_icon('user-o', text: t(:profile)), user_path, role: 'menuitem' %></li>
+              <%= menu_bar_list_items %>
               <li class="divider"></li>
               <li><%= link_to(t(:sign_out), logout_path(origin: url_for), role: 'menuitem') %></li>
             </ul>

data/app/views/layouts/exercise_inputs/editors/_multiple_files.html.erb

@@ -4,26 +4,25 @@
     <span class="files-tabs">
       <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>
-            </li>
+          <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>
+          </li>
         <% end %>
       </ul>
       <i class="add-file-button fa fa-plus"></i>
     </span>
 
-    <input id="highlight-modes" type="hidden" value="<%=highlight_modes.to_json%>" />
-    <input id="multifile-locales" type="hidden" value="<%=multifile_locales.to_json%>" />
+    <%= multifile_hidden_inputs %>
 
     <div class="tab-content">
       <% @files.each_with_index do |file, index| %>
-          <div role="tabpanel" class="file-editor tab-pane mu-input-panel <%= 'fade in active' if index == 0 %>" id="editor-file-<%= index %>">
-            <%= form.editor "content[#{file.name}]", file.highlight_mode,
-                            placeholder: t(:editor_placeholder),
-                            class: 'form-control editor',
-                            value: file.content,
-                            data: {lines: 17} %>
-          </div>
+        <div role="tabpanel" class="file-editor tab-pane mu-input-panel <%= 'fade in active' if index == 0 %>" id="editor-file-<%= index %>">
+          <%= form.editor "content[#{file.name}]", file.highlight_mode,
+                          placeholder: t(:editor_placeholder),
+                          class: 'form-control editor',
+                          value: file.content,
+                          data: {lines: 17} %>
+        </div>
       <% end %>
     </div>
 

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

@@ -3,7 +3,7 @@
     <div <%= turbolinks_enable_for exercise %>>
 
       <div class="mu-kids-landscape-support container-fluid">
-        <img src="/anim_amarillo.svg"/>
+        <img src="/kibi_animated.svg"/>
         <h3><%= t :only_landscape_support %></h3>
       </div>
 

data/app/views/layouts/exercise_inputs/read_only_editors/_code.html.erb

@@ -1,3 +1,3 @@
 <div class="field form-group">
-  <%= Mumukit::ContentType::Markdown.to_html(Mumukit::ContentType::Markdown.highlighted_code(exercise.language.name, content)) %>
+  <%= read_only_editor content, exercise.language.name %>
 </div>

data/app/views/layouts/exercise_inputs/read_only_editors/_free_form.html.erb

@@ -1,4 +1,4 @@
-<div class="form-group mu-read-only-free-form">
+<div class="form-group">
   <%= hidden_field_tag :solution_content, content %>
   <%= raw exercise.free_form_editor_source %>
 </div>