mumuki-laboratory 7.4.0 → 7.5.2

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

@@ -5,5 +5,5 @@
 }
 
 .popover {
-  max-width: 30%;
+  max-width: 50%;
 }

data/app/controllers/application_controller.rb

@@ -7,12 +7,14 @@ class ApplicationController < ActionController::Base
   include Mumukit::Login::AuthenticationHelpers
 
   include Mumuki::Laboratory::Controllers::Authorization
+  include Mumuki::Laboratory::Controllers::Disabling
   include Mumuki::Laboratory::Controllers::Notifications
   include Mumuki::Laboratory::Controllers::DynamicErrors
   include Mumuki::Laboratory::Controllers::EmbeddedMode
 
   before_action :set_current_organization!
   before_action :set_locale!
+  before_action :ensure_user_enabled!, if: :current_user?
   before_action :redirect_to_main_organization!, if: :should_redirect_to_main_organization?
   before_action :authorize_if_private!
   before_action :validate_user_profile!, if: :current_user?
@@ -62,6 +64,10 @@ class ApplicationController < ActionController::Base
 
   private
 
+  def from_sessions?
+    params['controller'] == 'login'
+  end
+
   def login_settings
     Organization.current.login_settings
   end

data/app/controllers/concerns/users_controller_template.rb

@@ -6,16 +6,21 @@ module UsersControllerTemplate
     before_action :set_user!, only: [:show, :update]
     before_action :set_new_user!, only: :create
     before_action :protect_permissions_assignment!, only: [:create, :update]
+    after_action :verify_user_name!, only: :create
   end
 
   private
 
+  def verify_user_name!
+    @user.verify_name!
+  end
+
   def protect_permissions_assignment!
     current_user.protect_permissions_assignment! user_params[:permissions], @user.permissions_was
   end
 
   def permissible_params
-    super + [:email, :image_url, permissions: Mumukit::Auth::Roles::ROLES]
+    super + [:email, :image_url, :verified_first_name, :verified_last_name, permissions: Mumukit::Auth::Roles::ROLES]
   end
 
   def set_user!

data/app/helpers/application_helper.rb

@@ -7,7 +7,7 @@ module ApplicationHelper
   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')}'")
+    image_tag(current_user.profile_picture, height: 40, class: 'img-circle', onError: "this.onerror = null; this.src = '#{image_url('user_shape.png')}'")
   end
 
   def paginate(object, options={})
@@ -39,7 +39,3 @@ module ApplicationHelper
     }.html_safe
   end
 end
-
-def sanitized(html)
-  Mumukit::ContentType::Sanitizer.sanitize html
-end

data/app/helpers/contextualization_result_helper.rb

@@ -1,10 +1,6 @@
 module ContextualizationResultHelper
-  def humanized_expectation_result_item(expectation_result)
-    %Q{<li>#{status_icon(expectation_result[:result])} #{humanized_expectation_explanation expectation_result}</li>}.html_safe
-  end
-
-  def humanized_expectation_explanation(expectation_result)
-    sanitized Mumukit::ContentType::Markdown.to_html(expectation_result[:explanation], one_liner: true)
+  def render_affable_expectation_result(affable_expectation_result)
+    %Q{#{status_icon(affable_expectation_result[:result])} #{affable_expectation_result[:explanation]}}.html_safe
   end
 
   def render_feedback?(contextualization)
@@ -19,12 +15,16 @@ module ContextualizationResultHelper
     if contextualization.exercise.hidden?
       :hidden_done
     elsif contextualization.exercise.choice?
-      contextualization.passed? ? :correct_answer : :wrong_answer
+      contextualization.solved? ? :correct_answer : :wrong_answer
     else
       contextualization.submission_status
     end
   end
 
+  def render_test_result_header(test_result)
+    [test_result[:title].presence, test_result[:summary]].compact.join(': ').html_safe
+  end
+
   def render_test_results(contextualization)
     if contextualization.test_results.present?
       template = contextualization.result.present? ? 'layouts/mixed_results' : 'layouts/test_results'

data/app/helpers/discussions_helper.rb

@@ -48,7 +48,7 @@ module DiscussionsHelper
   end
 
   def user_avatar(user, image_class='')
-    image_tag user.image_url, height: 40, class: "img-circle #{image_class}"
+    image_tag user.profile_picture, height: 40, class: "img-circle #{image_class}"
   end
 
   def discussions_link_with_teaser(item)
@@ -132,7 +132,7 @@ module DiscussionsHelper
 
   def discussion_status_filter(status, discussions_count)
     %Q{
-      #{status_fa_icon(status)}
+      #{discussion_status_fa_icon(status)}
       <span>
         #{t("#{status}_count", count: discussions_count)}
       </span>

data/app/helpers/exercise_input_helper.rb

@@ -44,7 +44,7 @@ module ExerciseInputHelper
   end
 
   def should_render_need_help_dropdown?(assignment, organization = Organization.current)
-    !assignment.passed? && organization.ask_for_help_enabled?(assignment.submitter)
+    !assignment.solved? && organization.ask_for_help_enabled?(assignment.submitter)
   end
 
   def render_submit_button(assignment)

data/app/helpers/icons_helper.rb

@@ -52,7 +52,7 @@ module IconsHelper
     %Q{
       <span class="text-#{iconized[:class]} status-label">
         #{fa_icon "#{iconized[:type]}"}
-        <span>#{t s}</span>
+        <span>#{t contextualization.visible_status}</span>
       </span>
     }.html_safe
   end

data/app/helpers/overlapped_buttons_helper.rb

@@ -0,0 +1,17 @@
+module OverlappedButtonsHelper
+  def restart_icon
+    overlapped_button_icon :restart, :undo
+  end
+
+  def format_icon
+    overlapped_button_icon :format, :indent
+  end
+
+  def restart_guide_link(guide)
+    link_to restart_icon, guide_progress_path(guide), class: 'mu-content-toolbar-item', 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))
+  end
+end

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

@@ -29,7 +29,7 @@
         </h3>
       </div>
       <div class="discussion-description">
-        <%= label_for_status(@discussion.status) %> ·
+        <%= label_for_contextualization(@discussion) %> ·
         <span class="discussion-info">
           <span class="discussion-initiator-name">
             <%= @discussion.initiator.name %>

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

@@ -5,8 +5,8 @@
     <% end %>
 
     <ul class="results-list">
-      <% assignment.humanized_expectation_results.each do |it| %>
-        <%= humanized_expectation_result_item it %>
+      <% assignment.affable_expectation_results.each do |it| %>
+        <li><%= render_affable_expectation_result it %></li>
       <% end %>
     </ul>
   </div>

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

@@ -1,7 +1,7 @@
 <div class="row">
   <div class="col-md-12">
     <div class="actions">
-      <% if assignment.passed? %>
+      <% if assignment.solved? %>
         <%= next_exercise_button(@exercise) || close_modal_button %>
       <% else %>
         <button class="btn btn-success btn-block submission-control" id="kids-btn-retry" data-dismiss="modal" aria-label="<%= t :retry_exercise %>"> <%= t :retry_exercise %> </button>

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

@@ -94,7 +94,7 @@
         </div>
       </div>
 
-      <div role="tabpanel" class="tab-pane mu-input-panel fade" id="visible-extra">
+      <div role="tabpanel" class="tab-pane mu-input-panel fade mu-elipsis" id="visible-extra">
         <%= @discussion.extra_preview_html %>
       </div>
     </div>

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

@@ -9,23 +9,23 @@
 <% @stats = @exercise.guide.stats_for(current_user) if current_user && @exercise.guide %>
 
 <% if @exercise.navigable_parent.timed? && !current_user.teacher? %>
-    <%= render partial: 'layouts/timer', locals: {end_time: @exercise.navigable_parent.real_end_time(current_user)} %>
+  <%= render partial: 'layouts/timer', locals: {end_time: @exercise.navigable_parent.real_end_time(current_user)} %>
 <% end %>
 
 <% unless @exercise.input_kids? %>
-    <div class="row">
-      <div class="mu-inline-block-right hidden-xs">
-        <h1><%= language_icon @exercise.language %></h1>
-      </div>
-      <div class="mu-inline-block-left">
-        <h1>
-          <span class="hidden-xs"><%= t(:exercise_number, number: @exercise.number) %>:&nbsp;</span>
-          <span><%= @exercise.name %></span>
-          <%= teacher_info_button @exercise %>
-          <%= link_to_bibliotheca_exercise @exercise %>
-        </h1>
-      </div>
+  <div class="row">
+    <div class="mu-inline-block-right hidden-xs">
+      <h1><%= language_icon @exercise.language %></h1>
     </div>
+    <div class="mu-inline-block-left">
+      <h1>
+        <span class="hidden-xs"><%= t(:exercise_number, number: @exercise.number) %>:&nbsp;</span>
+        <span><%= @exercise.name %></span>
+        <%= teacher_info_button @exercise %>
+        <%= link_to_bibliotheca_exercise @exercise %>
+      </h1>
+    </div>
+  </div>
 <% end %>
 
 <div>
@@ -54,6 +54,10 @@
 </div>
 
 <%= content_for :no_container do %>
-    <%= render partial: 'layouts/modals/guide_corollary', locals: {guide: @guide} %>
-    <%= render partial: 'layouts/modals/new_message', locals: {exercise: @exercise} if should_render_message_input?(@exercise) %>
+  <% if @assignment.skipped? %>
+    <%= render partial: 'layouts/exercise_skipped' %>
+  <% end %>
+
+  <%= render partial: 'layouts/modals/guide_corollary', locals: {guide: @guide} %>
+  <%= render partial: 'layouts/modals/new_message', locals: {exercise: @exercise} if should_render_message_input?(@exercise) %>
 <% end if current_user? %>

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

@@ -0,0 +1,28 @@
+<div class="modal fade mu-exercise-skipped" id="exercise-skipped" tabindex="-1" role="dialog" aria-hidden="true">
+  <div class="modal-dialog">
+    <div class="modal-content">
+      <div class="modal-header">
+        <p class="modal-title text-center title-font"><%= t :skipped_congratulations %></p>
+      </div>
+      <div class="modal-body">
+        <div class="container-fluid">
+          <%= t :skipped_description %>
+          <%= link_to (t :skipped_solve_anyway), "", "data-dismiss" => "modal" %>
+        </div>
+      </div>
+      <div class="modal-footer">
+        <div class="row">
+          <div class="col-md-12">
+            <%= next_exercise_button(@exercise) %>
+          </div>
+        </div>
+      </div>
+    </div>
+  </div>
+</div>
+<script>
+  $("#exercise-skipped").modal({
+    backdrop: 'static',
+    keyboard: false
+  });
+</script>

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

@@ -1,27 +1,30 @@
-<% if contextualization.single_visual_result? %>
-  <%= contextualization.single_visual_result_html %>
+<% if contextualization.single_visible_test_result? %>
+  <div class="mu-single-test-result">
+    <h5 class="text-danger mu-test-result-header"><%= render_test_result_header contextualization.affable_test_results.first %></h5>
+    <%= contextualization.first_test_result_html %>
+  </div>
 <% else %>
   <strong><%= t :test_results %>:</strong>
-  <ul class="results-list">
-    <% contextualization.test_results.each_with_index do |test_result, index| %>
+  <ul class="results-list mu-multiple-test-results">
+    <% contextualization.affable_test_results.each_with_index do |test_result, index| %>
       <li>
         <% if test_result[:status].failed? %>
-          <span class="text-danger">
+          <span class="text-danger mu-test-result-header">
             <%= status_icon(test_result[:status]) %>
-            <strong class="example-title"><%= test_result[:title] %></strong>
+            <%= render_test_result_header test_result %>
             <% unless contextualization.visible_success_output? %>
               <a data-toggle="collapse" href="#example-result-<%= index %>"  class="example-see-more"><%= t :view_details %></a>
             <% end %>
           </span>
         <% else %>
-          <span class="text-success example-title">
+          <span class="text-success mu-test-result-header">
             <%= status_icon(test_result[:status]) %>
             <%= test_result[:title] %>
           </span>
         <% end %>
 
         <div class="example-result collapse <%= 'in' if contextualization.visible_success_output? %>" id="example-result-<%= index %>">
-          <%= contextualization.output_content_type.to_html test_result[:result] %>
+          <%= contextualization.test_result_html test_result %>
         </div>
       </li>
     <% end %>

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

@@ -4,13 +4,14 @@
                   class: 'form-control editor',
                   value: @current_content,
                   data: {lines: 17} %>
-  <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>
   <div class="mu-overlapped">
-    <a class="editor-reset submission-reset"><%= restart_icon %></a>
+    <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-format"><%= format_icon %></a>
+    <a class="editor-reset submission-reset" data-confirm="<%= t(:confirm_reset) %>"><%= restart_icon %></a>
   </div>
 </div>

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

@@ -26,15 +26,14 @@
       <% end %>
     </div>
 
-    <a class="editor-resize multiple-files" 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>
-
     <div class="mu-overlapped">
-      <a class="editor-reset submission-reset"><%= restart_icon %></a>
+      <a class="editor-resize multiple-files" 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-reset submission-reset" data-confirm="<%= t(:confirm_reset) %>"><%= restart_icon %></a>
     </div>
 
   </div>

data/app/views/layouts/exercise_inputs/forms/_interactive_form.html.erb

@@ -28,7 +28,7 @@
       <a class="console-reset submission-reset"><%= restart_icon %></a>
     </div>
    </div>
-  <div role="tabpanel" class="tab-pane mu-input-panel fade" id="visible-extra">
+  <div role="tabpanel" class="tab-pane mu-input-panel fade mu-elipsis" id="visible-extra">
     <%= @assignment.extra_preview_html %>
   </div>
   <div role="tabpanel" class="tab-pane mu-input-panel fade" id="messages">
@@ -40,7 +40,7 @@
   <% if current_user? %>
     <div class="row">
       <div class="col-md-12 submission-results">
-        <% if @assignment.passed?  %>
+        <% if @assignment.solved?  %>
           <%= render partial: 'exercise_solutions/results',
                      locals: {assignment: @assignment, guide_finished_by_solution: false} %>
         <% end %>

data/app/views/layouts/exercise_inputs/forms/_playground_form.html.erb

@@ -17,7 +17,7 @@
       <a class="console-reset submission-reset"><%= restart_icon %></a>
     </div>
   </div>
-  <div role="tabpanel" class="tab-pane mu-input-panel fade" id="visible-extra">
+  <div role="tabpanel" class="tab-pane mu-input-panel fade mu-elipsis" id="visible-extra">
     <%= @assignment.extra_preview_html %>
   </div>
 </div>

data/app/views/layouts/exercise_inputs/forms/_problem_form.html.erb

@@ -51,7 +51,7 @@
       <label for="include_solution"><p><%= t(:load_solution_into_console) %></p></label>
     </div>
   </div>
-  <div role="tabpanel" class="tab-pane mu-input-panel fade" id="visible-extra">
+  <div role="tabpanel" class="tab-pane mu-input-panel fade mu-elipsis" id="visible-extra">
     <%= @assignment.extra_preview_html %>
   </div>
   <div role="tabpanel" class="tab-pane mu-input-panel fade" id="messages">

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

@@ -9,7 +9,7 @@
             <div class="col-md-12">
               <div class="row">
                 <div class="col-md-12 submission-results">
-                  <% if @assignment.passed? %>
+                  <% if @assignment.solved? %>
                     <%= render partial: 'exercise_solutions/kids_results',
                                  locals: {assignment: @assignment, guide_finished_by_solution: false} %>
                   <% end %>

data/app/views/user_mailer/1st_reminder.html.erb

@@ -313,7 +313,7 @@
 
                             <td valign="top" class="muMailTextContent" style="padding-top:0; padding-right:18px; padding-bottom:9px; padding-left:18px;">
 
-                              © Copyright 2015-2018&nbsp;<a href="https://mumuki.org/home/">Mumuki Project</a><em>.</em><br>
+                              © Copyright 2015-<%= DateTime.now.year %>&nbsp;<a href="https://mumuki.org/home/">Mumuki Project</a><em>.</em><br>
                               <br>
                               <%= t :stop_emails? %><br>
                               <%= link_to t(:cancel_subscription), @organization.url_for("/user/unsubscribe?id=#{@unsubscribe_code}"), target: :_blank %>

data/app/views/user_mailer/1st_reminder.text.erb

@@ -7,7 +7,7 @@
 <%= t :keep_learning %>
 
 
-© Copyright 2015-2018 Mumuki Project.
+© Copyright 2015-<%= DateTime.now.year %> Mumuki Project.
 
 <%= t :stop_emails? %>
 <%= t :cancel_subscription %>

data/app/views/user_mailer/2nd_reminder.html.erb

@@ -313,7 +313,7 @@
 
                             <td valign="top" class="muMailTextContent" style="padding-top:0; padding-right:18px; padding-bottom:9px; padding-left:18px;">
 
-                              © Copyright 2015-2018&nbsp;<a href="https://mumuki.org/home/">Mumuki Project</a><em>.</em><br>
+                              © Copyright 2015-<%= DateTime.now.year %>&nbsp;<a href="https://mumuki.org/home/">Mumuki Project</a><em>.</em><br>
                               <br>
                               <%= t :stop_emails? %><br>
                               <%= link_to t(:cancel_subscription), @organization.url_for("/user/unsubscribe?id=#{@unsubscribe_code}"), target: :_blank %>