mumuki-laboratory 7.10.3 → 7.12.0

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

@@ -0,0 +1,48 @@
+.mu-medal {
+  &.outline {
+    position: absolute;
+
+    &.content {
+      height: 75px;
+
+      margin-left: 10px;
+    }
+
+    &.corollary {
+      height: 150px;
+
+      margin-left: auto;
+      margin-right: auto;
+      left: 0;
+      right: 0;
+    }
+  }
+
+  &.inlay {
+    position: relative;
+    border-radius: 50%;
+
+    &.content {
+      height: 55px;
+
+      left: 20px;
+      top: 17px;
+
+      margin-right: 30px;
+      margin-bottom: 15px;
+    }
+
+    &.corollary {
+      height: 107px;
+
+      display: block;
+      top: 35px;
+
+      margin: 0 auto 20px;
+    }
+  }
+
+  &.unacquired {
+    filter: grayscale(100%);
+  }
+}

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

@@ -0,0 +1,44 @@
+summary.terms-summary {
+  font-size: 29px;
+  outline: 0;
+  cursor: pointer;
+  .terms-summary-title {
+    display: inline;
+  }
+}
+
+.terms-card {
+  position: relative;
+  display: -ms-flexbox;
+  display: flex;
+  -ms-flex-direction: column;
+  flex-direction: column;
+  min-width: 0;
+  word-wrap: break-word;
+  background-color: #fff;
+  background-clip: border-box;
+  border: 1px solid rgba(0,0,0,.125);
+  border-radius: .25rem;
+  &:not(:first-child) {
+    border-top: none;
+  }
+  .terms-card-header {
+    cursor: pointer;
+    font-weight: bold;
+    padding: .75rem 1.25rem;
+    margin-bottom: 0;
+    background-color: rgba(0,0,0,.03);
+    border-bottom: 1px solid rgba(0,0,0,.125);
+  }
+  &:first-child .terms-card-header{
+    border-radius: calc(.25rem - 1px) calc(.25rem - 1px) 0 0;
+  }
+}
+.terms-card-body {
+  padding: 1.25rem;
+}
+
+.terms-acceptance-btn {
+  margin-top: 10px;
+  display: block
+}

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/book_discussions_controller.rb

@@ -1,4 +1,8 @@
 class BookDiscussionsController < DiscussionsController
+  def terms
+    @forum_terms ||= Term.forum_related_terms
+  end
+  
   private
 
   def set_debatable

data/app/controllers/users_controller.rb

@@ -1,7 +1,7 @@
 class UsersController < ApplicationController
   include WithUserParams
 
-  before_action :authenticate!
+  before_action :authenticate!, except: :terms
   before_action :set_user!
 
   def show
@@ -11,9 +11,14 @@ class UsersController < ApplicationController
 
   def update
     current_user.update_and_notify! user_params
+    current_user.accept_profile_terms!
     redirect_to user_path, notice: I18n.t(:user_data_updated)
   end
 
+  def terms
+    @profile_terms ||= Term.profile_terms_for(current_user)
+  end
+
   def unsubscribe
     user_id = User.unsubscription_verifier.verify(params[:id])
     User.find(user_id).unsubscribe_from_reminders!
@@ -22,7 +27,7 @@ class UsersController < ApplicationController
   end
 
   def permissible_params
-    super << :avatar_id
+    super << [:avatar_id, :avatar_type]
   end
 
   private
@@ -33,4 +38,5 @@ class UsersController < ApplicationController
   def set_user!
     @user = current_user
   end
+
 end

data/app/helpers/application_helper.rb

@@ -7,8 +7,8 @@ module ApplicationHelper
   end
 
   def profile_picture_for(user, **options)
-    options.merge!(height: 40, onError: "this.onerror = null; this.src = '#{image_url(user.placeholder_image_url)}'")
-    avatar_image(user.profile_picture, options)
+    default_options = { height: 40, onError: "this.onerror = null; this.src = '#{image_url(user.placeholder_image_url)}'" }
+    avatar_image(user.profile_picture, default_options.merge(options))
   end
 
   def avatar_image(avatar_url, **options)

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/kindergarten_helper.rb

@@ -0,0 +1,5 @@
+module KindergartenHelper
+  def kindergarten_full_workspace?(exercise)
+    !exercise.initial_state && !exercise.final_state
+  end
+end

data/app/helpers/links_helper.rb

@@ -51,6 +51,14 @@ module LinksHelper
             body: permissions_help_email_body(current_user)
   end
 
+  def link_to_profile_terms
+    link_to t(:terms_and_conditions).downcase, user_terms_path, target: '_blank'
+  end
+
+  def link_to_forum_terms
+    link_to t(:forum_terms).downcase, discussions_terms_path, target: '_blank'
+  end
+
   def turbolinks_enable_for(exercise)
     %Q{data-turbolinks="#{!exercise.input_kids?}"}.html_safe
   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,5 @@
 module OrganizationListHelper
   def organizations_for(user)
-    (user.student_granted_organizations + [Organization.central]).uniq.compact
+    user.immersive_organizations_at(nil)
   end
 end

data/app/helpers/overlapped_buttons_helper.rb

@@ -8,7 +8,7 @@ module OverlappedButtonsHelper
   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
+    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)

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/discussions/terms.html.erb

@@ -0,0 +1,10 @@
+<div class="mu-user-header">
+  <h1><%= t :forum_terms %></h1>
+</div>
+
+<div>
+  <% @forum_terms.each do |term| %>
+    <%= term.content_html %>
+  <% end %>
+</div>
+

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/invitations/_invitation_form.html.erb

@@ -4,6 +4,7 @@
       <div class="row mu-tab-body">
         <div class="col-md-12">
           <%= render partial: 'users/profile_fields', locals: {form: f} %>
+          <%= render partial: 'layouts/terms_acceptance_disclaimer', locals: {user: @user} %>
         </div>
       </div>
     </div>

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

@@ -60,7 +60,7 @@
                   <span><%= discussion.exercise.name %></span>
                   <% if discussion.last_moderator_access_visible_for?(current_user) %>
                     <div class="pull-right discussion-moderator-access" >
-                      <%= profile_picture_for(discussion.last_moderator_access_by, 32) %>
+                      <%= profile_picture_for(discussion.last_moderator_access_by, height: 32) %>
                       <span class="moderator-initials">
                         <%= discussion.last_moderator_access_by.name_initials %>
                       </span>
@@ -84,3 +84,7 @@
 
   <% end %>
 </div>
+
+<span>
+  <%= t(:forum_terms_link, terms_link: link_to_forum_terms).html_safe %>
+</span>