mumuki-laboratory 7.10.5 → 7.11.0

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

@@ -20,6 +20,15 @@
       border-color: lighten($mu-color-complementary, 15%);
     }
   }
+
+  &.mobile {
+    text-align: center;
+    margin: 20px 5px -20px -10px;
+
+    .btn {
+      width: calc(50% - 20px);
+    }
+  }
 }
 
 .mu-profile-info {

data/app/controllers/application_controller.rb

@@ -19,7 +19,7 @@ class ApplicationController < ActionController::Base
   before_action :ensure_user_enabled!, if: :current_user?
   before_action :validate_active_organization!
 
-  before_action :redirect_to_main_organization!, if: :should_redirect_to_main_organization?
+  before_action :redirect_to_proper_context!, if: :immersive_context_wrong?
 
   before_action :authorize_if_private!
   before_action :validate_active_organization!
@@ -39,18 +39,20 @@ class ApplicationController < ActionController::Base
                 :theme_stylesheet_url,
                 :extension_javascript_url
 
-  def should_redirect_to_main_organization?
-    should_choose_organization? && current_user.has_immersive_main_organization?
+  def immersive_context_wrong?
+    current_immersive_context != Organization.current
   end
 
-  def redirect_to_main_organization!
-    redirect_to current_user.main_organization.url_for(request.path)
+  def redirect_to_proper_context!
+    # TODO: redirect to subject (if it exists on the immersive context)
+    redirect_to current_immersive_context.url_for('/')
   end
 
   def should_choose_organization?
-    current_user? &&
-      current_user.has_student_granted_organizations? &&
-      Mumukit::Platform.implicit_organization?(request)
+    return false unless current_user?
+
+    # TODO: replace `nil` with `subject` to consider exercise, guide, etc
+    current_user.immersive_organizations_at(nil).size > 1
   end
 
   # ensures contents are accessible to current user
@@ -82,6 +84,11 @@ class ApplicationController < ActionController::Base
 
   private
 
+  def current_immersive_context
+    # TODO: replace `nil` with `subject` to consider exercise, guide, etc
+    current_user&.current_immersive_context_at(nil) || Organization.current
+  end
+
   def from_sessions?
     params['controller'] == 'login'
   end

data/app/controllers/users_controller.rb

@@ -22,7 +22,7 @@ class UsersController < ApplicationController
   end
 
   def permissible_params
-    super << :avatar_id
+    super << [:avatar_id, :avatar_type]
   end
 
   private

data/app/helpers/avatar_helper.rb

@@ -1,9 +1,17 @@
 module AvatarHelper
   def avatars_for(user)
-    (Avatar.with_current_audience_for(user) + [user.avatar]).compact.uniq
+    (Avatar.with_current_audience_for(user) + user.acquired_medals + [user.avatar]).compact.uniq
   end
 
-  def show_avatar_item(item)
-    avatar_image(item.image_url, alt: item.description, 'mu-avatar-id': item.id, class: 'mu-avatar-item')
+  def locked_avatars_for(user)
+    user.unacquired_medals.compact.uniq
+  end
+
+  def show_locked_avatar_item(item)
+    show_avatar_item(item, class: 'mu-avatar-item mu-locked')
+  end
+
+  def show_avatar_item(item, **options)
+    avatar_image(item.image_url, alt: item.description, 'mu-avatar-id': item.id, class: 'mu-avatar-item', type: item.class.name, **options)
   end
 end

data/app/helpers/medal_helper.rb

@@ -0,0 +1,36 @@
+module MedalHelper
+  def should_display_medal?(content, organization)
+    content.medal.present? && organization.gamification_enabled?
+  end
+
+  def content_medal_for(content, user)
+    medal_for content, 'content', completion_class_for(content, user)
+  end
+
+  def corollary_medal_for(content)
+    medal_for content, 'corollary'
+  end
+
+  private
+
+  def completion_class_for(content, user)
+    content.once_completed_for?(user, Organization.current) ? '' : 'unacquired'
+  end
+
+  def medal_for(content, view, completion='')
+    %Q{
+      <div class="mu-medal #{completion}">
+        #{outline_image(view)}
+        #{inlay_image_for(content, view)}
+      </div>
+    }.html_safe
+  end
+
+  def outline_image(clazz)
+    image_tag '/medal/outline.svg', class: "mu-medal outline #{clazz}", alt: I18n.t(:medal)
+  end
+
+  def inlay_image_for(content, clazz)
+    image_tag content.medal.image_url, class: "mu-medal inlay #{clazz}", alt: content.medal.description
+  end
+end

data/app/helpers/open_graph_helper.rb

@@ -1,9 +1,9 @@
 module OpenGraphHelper
   def open_graph_tags(subject)
     %Q{
-      <meta property="og:site_name" content="#{Organization.current.site_name}" />
+      <meta property="og:site_name" content="#{Organization.current.display_name}" />
       <meta property="og:title" content="#{h page_title(subject)}"/>
-      <meta property="og:description" content="#{Organization.current.central? ? t(:mumuki_short_description) : Organization.current.description}"/>
+      <meta property="og:description" content="#{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}"/>

data/app/helpers/organization_list_helper.rb

@@ -1,5 +1,6 @@
 module OrganizationListHelper
   def organizations_for(user)
+    # TODO use immersive contexts here
     (user.student_granted_organizations + [Organization.central]).uniq.compact
   end
 end

data/app/helpers/page_title_helper.rb

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

data/app/helpers/profile_helper.rb

@@ -1,5 +1,13 @@
 module ProfileHelper
   def edit_profile_button
-    link_to t(:edit_profile), edit_user_path, class: 'btn btn-success'
+    link_to t(:edit_profile), :edit_user, class: 'btn btn-success'
+  end
+
+  def cancel_edit_profile_button
+    link_to t(:cancel), :user, class: 'btn btn-default' if current_user.profile_completed?
+  end
+
+  def save_edit_profile_button(form)
+    form.submit t(:save), disabled: true, class: 'btn btn-success mu-edit-profile-btn'
   end
 end

data/app/views/book/_header.html.erb

@@ -0,0 +1,17 @@
+<% @organization = Organization.current %>
+<div class="book-header <%= current_user? ? '' : 'logged' %>">
+  <%#
+    H1 is not actually displayed.
+    This weird title structure is kept for backward compatibility only
+  %>
+  <h1><%= @organization.page_name %></h1>
+
+  <img src="<%= @organization.banner_url %>" alt="<%= @organization.display_name %>">
+  <h2><%= @organization.page_name %></h2>
+
+  <h3><small><%= @organization.description %></small></h3>
+</div>
+
+<div class="text-box">
+  <%= @organization.page_description_html %>
+</div>

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

@@ -3,24 +3,7 @@
 <% end %>
 
 <div class="col-md-offset-2 col-md-8">
-  <div class="book-header <%= current_user? ? '' : 'logged' %>">
-    <h1>ム mumuki<%= Organization.current.title_suffix %></h1>
-
-    <img src="<%= Organization.current.banner_url %>" alt="<%= Organization.current.name %> - Mumuki">
-    <h2><%= @book.name %></h2>
-
-    <% unless Organization.current.central? %>
-      <h3>
-        <small><%= Organization.current.description %></small>
-        <br>
-        <small><%= t :powered_by_mumuki_html %></small>
-      </h3>
-    <% end %>
-  </div>
-
-  <div class="text-box">
-    <%= @book.description_html %>
-  </div>
+  <%= render partial: 'book/header' %>
 
   <% @book.next_lesson_for(current_user).try do |lesson| %>
     <div class="actions">

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

@@ -48,6 +48,7 @@
 <%= hidden_field_tag "mu-exercise-id", @exercise.id %>
 <%= hidden_field_tag "mu-exercise-layout", @exercise.layout %>
 <%= hidden_field_tag "mu-exercise-settings", @exercise.settings.to_json %>
+<%= hidden_field_tag "mu-current-exp", UserStats.exp_for(@current_user) %>
 
 <div style="display: none" id="processing-template">
   <div class="bs-callout bs-callout-info">

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

@@ -2,9 +2,6 @@
     <%= home_breadcrumb %>
 <% end %>
 
-
-<%= content_for :no_container do %>
-  <div class="error-message">
-    <%= yield %>
-  </div>
-<% end %>
+<div class="error-message">
+  <%= yield %>
+</div>

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

@@ -14,9 +14,16 @@
   <div class="mu-inline-block-right">
     <h1><%= language_icon @guide.language %></h1>
   </div>
-  <div class="mu-inline-block-left">
-    <h1>
-      <%= subject.name %>
+  <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>

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

@@ -6,7 +6,9 @@
     <meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no">
   <% end %>
 
-  <meta name="description" content="<%= t :mumuki_short_description %>"/>
+  <meta name="description" content="<%= Organization.current.description %>"/>
+
+
 
   <%= open_graph_tags subject %>
   <%= assets_include_tags %>

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

@@ -10,13 +10,6 @@
           <%= render partial: 'layouts/organizations_listing' %>
         </div>
       </div>
-      <div class="modal-footer">
-        <div class="row">
-          <div class="col-md-12 pull-right">
-            <%= link_to t(:stay_here), Organization.central.url_for(request.path) %>
-          </div>
-        </div>
-      </div>
     </div>
   </div>
 </div>

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

@@ -27,9 +27,10 @@
             </span>
           </div>
           <div class="dropdown">
-            <span id="profileDropdown" data-toggle="dropdown" aria-label="<%= t(:user) %>" role="menu" tabindex="0">
+            <div id="profileDropdown" class="profile-dropdown" data-toggle="dropdown" aria-label="<%= t(:user) %>" role="menu" tabindex="0">
               <%= profile_picture_for current_user %>
-            </span>
+              <span class="caret"></span>
+            </div>
             <ul class="dropdown-menu dropdown-menu-right" aria-labelledby="profileDropdown">
               <%= menu_bar_list_items %>
               <li class="divider"></li>

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

@@ -15,6 +15,15 @@
               <%= corollary_box guide %>
             </div>
           </div>
+          <div class="row">
+            <div class="col-md-12 mu-last-box">
+              <hr>
+              <% if should_display_medal? @guide, Organization.current %>
+                <p><%= t :unlocked_medal_as_avatar %></p>
+                <%= corollary_medal_for guide %>
+              <% end %>
+            </div>
+          </div>
           <div class="row">
             <div class="col-md-12 text-center">
               <%= next_lesson_button guide %>

data/app/views/users/_avatar_list.html.erb

@@ -1,11 +1,15 @@
 <div class="row">
   <div class="mu-avatar-list">
-    <% avatars_for(@user).sort_by(&:id).each do |avatar| %>
+    <% avatars_for(@user).each do |avatar| %>
       <%= show_avatar_item(avatar) %>
     <% end %>
 
+    <% locked_avatars_for(@user).sort_by(&:id).each do |avatar| %>
+      <%= show_locked_avatar_item(avatar) %>
+    <% end %>
+
     <% if @user.image_url %>
-      <%= avatar_image @user.image_url, class: 'mu-avatar-item', id: 'mu-user-image' %>
+      <%= avatar_image @user.image_url, class: 'mu-avatar-item', id: 'mu-user-image', tabindex: 0 %>
     <% end %>
   </div>
 </div>

data/app/views/users/_edit_user_form.html.erb

@@ -1,20 +1,24 @@
 <%= form_for :user, url: update_user_path, :html => { id: 'mu-user-form' }, method: :put do |f| %>
   <div class="mu-user-header">
     <h1><%= t(:edit_profile) %></h1>
-    <div class="mu-profile-actions">
-      <%= link_to t(:cancel), :back, class: 'btn btn-default' if @user.profile_completed? %>
-      <%= f.submit t(:save), disabled: true, class: 'btn btn-success', id: 'mu-edit-profile-btn' %>
+    <div class="mu-profile-actions hidden-xs">
+      <%= cancel_edit_profile_button %>
+      <%= save_edit_profile_button f %>
     </div>
   </div>
   <div class="row mu-tab-body">
     <div class="col-md-4 text-center">
       <%= profile_picture_for(@user, id: 'mu-user-avatar', class: 'mu-user-avatar') %>
-      <i class="fa fa-pencil fa-2x pointer mu-edit-avatar" id="mu-edit-avatar-icon"></i>
+      <i class="fa fa-pencil fa-2x pointer mu-edit-avatar" id="mu-edit-avatar-icon" tabindex="0"></i>
     </div>
     <div class="col-md-8">
       <%= render partial: 'profile_fields', locals: {form: f} %>
     </div>
   </div>
+  <div class="mu-profile-actions mobile visible-xs">
+    <%= cancel_edit_profile_button %>
+    <%= save_edit_profile_button f %>
+  </div>
 <% end %>
 
 <%= content_for :no_container do %>

data/app/views/users/_user_form.html.erb

@@ -1,6 +1,6 @@
 <div class="mu-user-header">
   <h1><%= @user.name %></h1>
-  <div class="mu-profile-actions">
+  <div class="mu-profile-actions hidden-xs">
     <%= edit_profile_button %>
   </div>
 </div>
@@ -21,4 +21,8 @@
       <span> <strong><%= t :programming_since %>:</strong> <%= t(:time_since, time: time_ago_in_words(@user.created_at)) %> </span>
     </div>
   </div>
+
+  <div class="mu-profile-actions mobile visible-xs">
+    <%= edit_profile_button %>
+  </div>
 </div>

data/lib/mumuki/laboratory/controllers/current_organization.rb

@@ -2,7 +2,7 @@ module Mumuki::Laboratory::Controllers::CurrentOrganization
   def set_current_organization!
     Organization.find_by!(name: organization_name).switch!
   rescue => e
-    Organization.central.switch!
+    Organization.base.switch!
     raise e
   end
 

data/lib/mumuki/laboratory/controllers/results_rendering.rb

@@ -19,7 +19,8 @@ module Mumuki::Laboratory::Controllers::ResultsRendering
                   .merge(progress_json)
                   .merge(
                     html: render_results(layout, assignment),
-                    remaining_attempts_html: remaining_attempts_text(assignment))
+                    remaining_attempts_html: remaining_attempts_text(assignment),
+                    current_exp: UserStats.exp_for(assignment.submitter))
   end
 
   def merge_kids_specific_renders(assignment, results)
@@ -28,7 +29,7 @@ module Mumuki::Laboratory::Controllers::ResultsRendering
         title_html: render_results_title(assignment),
         expectations: assignment.affable_expectation_results,
         tips: assignment.affable_tips,
-        test_results: assignment.affable_test_results)
+        test_results: assignment.sanitized_affable_test_results) # these results could include escaped characters so they should be rendered as HTML to display properly
   end
 
   def progress_json

data/lib/mumuki/laboratory/locales/en.yml

@@ -140,6 +140,7 @@ en:
   locked_content: 'This content will be unlocked when you finish previous chapters'
   male: Male
   manual_evaluation_pending: Thanks for submitting your solution! It will be revised by the course teachers soon
+  medal: Medal
   message_count:
     one: 1 message
     other: '%{count} messages'
@@ -148,8 +149,6 @@ en:
   messages_error: Previous messages are unavailable. Please try again later.
   more_messages: More
   moderator: Mentor
-  mumuki_catchphrase: Improve your programming skills
-  mumuki_short_description: Mumuki is a simple, open and collaborative platform for sharing and solving programming exercises. It is aimed to help people with learning and teaching programing languages and paradigms
   my_doubts: My doubts
   my_submissions: My Submissions
   name: Name
@@ -191,7 +190,6 @@ en:
   permissions: Permissions
   please_fill_profile_data: Please complete your profile data to continue!
   please_validate: 'Please validate your data before continue:'
-  powered_by_mumuki_html: "powered by <span class=\"da da-mumuki-circle\"></span> mumuki"
   previous_exercise: Previous
   problem_with_exercise: '[Mumuki] Problem with exercise: %{title}'
   processing_your_solution: We are processing you solution
@@ -234,7 +232,6 @@ en:
   start_practicing: Start Practicing!
   start_using_mumuki: Start using Mumuki!
   status: Status
-  stay_here: I want to stay here
   stop_emails?: Want to stop getting emails?
   submission: submission
   submission_date: Submission date
@@ -258,6 +255,7 @@ en:
   to_solved: Mark as solved
   unauthorized_explanation: You have no permissions for this content. Maybe you logged in with another account.
   undo_upvote: Undo upvote
+  unlocked_medal_as_avatar: You earned this medal! You can now choose it as an avatar.
   unspecified: I'd rather not say
   unmeet_expectations: "Goals that weren't met"
   unprepared_organization_explanation: This path hasn't started yet.