mumuki-laboratory 7.10.5 → 7.12.3

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/exercise_solutions/_contextualization_results_container.html.erb

@@ -1,4 +1,13 @@
 <div class="<%= "bs-callout bs-callout-#{icon_class_for contextualization.submission_status}" %>">
   <%= render partial: 'exercise_solutions/results_title', locals: {contextualization: contextualization} %>
+
+  <% if in_gamified_context? %>
+    <div id="mu-exp-earned-message" class="hidden">
+      <span><%= t(:you_earned) %></span>
+      <strong><span id="mu-exp-points"></span></strong>
+      <span><%= t(:exp_points) %></span>
+    </div>
+  <% end %>
+
   <%= yield %>
 </div>

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

@@ -0,0 +1,11 @@
+<div>
+  <h3 class="text-center">
+    <%= t :level_up %>
+  </h3>
+  <div class="text-center mu-level">
+    <i class="fa 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>
+  </div>
+</div>

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

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

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

@@ -1,3 +1,8 @@
 <h4 class="text-<%= icon_class_for(contextualization.submission_status) %>">
   <strong><%= fa_icon icon_type_for(contextualization.submission_status) %> <%= t_contextualization_status contextualization %></strong>
+  <% if in_gamified_context? %>
+    <strong><small class="text-success">
+      <span class="mu-experience"></span>
+    </small></strong>
+  <% end %>
 </h4>

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

@@ -61,6 +61,10 @@
     <%= render partial: 'layouts/exercise_skipped' %>
   <% end %>
 
+  <% if in_gamified_context? %>
+    <%= render partial: 'layouts/modals/level_up' %>
+  <% 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/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

@@ -84,3 +84,7 @@
 
   <% end %>
 </div>
+
+<span>
+  <%= t(:forum_terms_link, terms_link: link_to_forum_terms).html_safe %>
+</span>

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

@@ -0,0 +1,38 @@
+<div class="mu-kindergarten-header">
+  <div class="mu-kindergarten-character">
+    <img class="mu-kids-character-animation" alt="">
+    <div class="mu-kindergarten-character-speech-bubble">
+      <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="">
+        </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-stop hidden" src="https://mumuki.io/static/audio-stop.svg" alt="">
+        </button>
+      </div>
+    </div>
+  </div>
+  <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="">
+      </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>
+        </button>
+      </div>
+    <% else %>
+      <img class="mu-hint-light off" src="https://mumuki.io/static/lamparita_off.svg" alt="">
+    <% end %>
+  </div>
+</div>
+
+<div id="mu-kids-discussion-link-html" class="hidden">
+  <%= kids_read_discussions_link(exercise) %>
+</div>

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

@@ -0,0 +1,6 @@
+<% if user.has_profile_terms_to_accept? %>
+  <br>
+  <span>
+    <%= t(:terms_and_conditions_continue_disclaimer, terms_link: link_to_profile_terms).html_safe %>
+  </span>
+<% end %>

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

@@ -1,4 +1,5 @@
 <%= content_for :navbar do %>
+  <%= hidden_field_tag("mu-current-exp", UserStats.exp_for(@current_user)) if in_gamified_context? %>
   <div class="<%= exercise_container_type %>">
     <nav class="mu-navbar">
       <div class="mu-navbar-breadcrumb hidden-xs">
@@ -18,18 +19,23 @@
       </div>
       <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>
+          <% 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-lg"></i>
+                <i class="fa fa-bell fa-fw fa-2x navbar-icon"></i>
                   <span class="badge badge-notifications"><%= notifications_count %></span>
               </a>
             </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 navbar-icon" 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>
@@ -75,3 +81,4 @@
 <% end %>
 
 <%= render partial: 'layouts/main' %>
+

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

@@ -1,40 +1,40 @@
 <% content_for :no_container do %>
 
-    <div <%= turbolinks_enable_for exercise %>>
+  <div <%= turbolinks_enable_for exercise %>>
 
-      <div class="mu-kids-landscape-support container-fluid">
-        <img class="mu-kids-character-animation"/>
-        <h3><%= t :only_landscape_support %></h3>
-      </div>
+    <div class="mu-kids-landscape-support container-fluid">
+      <img class="mu-kids-character-animation"/>
+      <h3><%= t :only_landscape_support %></h3>
+    </div>
 
-      <div class="mu-kids-exercise mu-kindergarten container-fluid">
+    <div class="mu-kids-exercise mu-kindergarten container-fluid">
 
-        <div class="mu-kids-exercise-description mu-kids-exercise-description-fixed">
-          <div class="mu-kids-character">
-            <%= render partial: 'layouts/kids', locals: {exercise: exercise} %>
-          </div>
+      <div class="mu-kids-exercise-description mu-kids-exercise-description-fixed">
+        <div class="mu-kids-character">
+          <%= render partial: 'layouts/kindergarten', locals: {exercise: exercise} %>
         </div>
-        <div class="mu-kids-exercise-workspace">
-          <div class="mu-exercise-content mu-kids-blocks">
-            <%= yield :exercise_content %>
-          </div>
-          <div class="mu-kids-states mu-kids-single-state mu-multiple-scenarios">
-            <div class="mu-scenarios">
-              <div class="mu-kids-state mu-state-initial mu-kids-gbs-board-initial mu-initial-state">
-                <div class="mu-kids-state-image"><%= exercise.initial_state&.html_safe %></div>
-              </div>
-              <div class="mu-kids-state mu-state-final mu-final-state">
-                <div class="mu-kids-state-image"><%= exercise.final_state&.html_safe %></div>
-              </div>
+      </div>
+      <div class="mu-kids-exercise-workspace <%= 'mu-full-workspace' if kindergarten_full_workspace? exercise %>">
+        <div class="mu-exercise-content mu-kids-blocks">
+          <%= yield :exercise_content %>
+        </div>
+        <div class="mu-kids-states mu-kids-single-state mu-multiple-scenarios">
+          <div class="mu-scenarios">
+            <div class="mu-kids-state mu-state-initial mu-kids-gbs-board-initial mu-initial-state">
+              <div class="mu-kids-state-image"><%= exercise.initial_state&.html_safe %></div>
+            </div>
+            <div class="mu-kids-state mu-state-final mu-final-state">
+              <div class="mu-kids-state-image"><%= exercise.final_state&.html_safe %></div>
             </div>
-            <ol class="indicators"></ol>
           </div>
+          <ol class="indicators"></ol>
         </div>
       </div>
+    </div>
 
-      <%= render partial: 'layouts/modals/kids_results', locals: {exercise: exercise, assignment: @assignment} %>
-      <%= render partial: 'layouts/modals/kids_results_aborted' %>
-      <%= render partial: 'layouts/modals/kids_context', locals: {exercise: exercise, assignment: @assignment} %>
+    <%= render partial: 'layouts/modals/kindergarten_results', locals: {exercise: exercise, assignment: @assignment} %>
+    <%= render partial: 'layouts/modals/kindergarten_results_aborted' %>
+    <%= render partial: 'layouts/modals/kindergarten_context', locals: {exercise: exercise, assignment: @assignment} %>
 
-    </div>
+  </div>
 <% end %>

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

@@ -1,4 +1,4 @@
-<div class="modal fade guide-corollary" id="guide-done" tabindex="-1" role="dialog" aria-hidden="true">
+<div class="modal fade guide-corollary mu-kids-modal-border" id="guide-done" tabindex="-1" role="dialog" aria-hidden="true">
   <div class="modal-dialog">
     <div class="modal-content">
       <div class="modal-header">
@@ -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/layouts/modals/_kids_context.html.erb

@@ -1,4 +1,4 @@
-<div class="modal fade mu-kids-context" id="mu-kids-context" tabindex="-1" role="dialog" aria-hidden="true">
+<div class="modal fade mu-kids-context mu-kids-modal-border" id="mu-kids-context" tabindex="-1" role="dialog" aria-hidden="true">
   <div class="modal-dialog">
     <div class="modal-content">
       <div class="modal-header">

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

@@ -1,17 +1,27 @@
-<div class="modal fade mu-kids-results" id="kids-results" tabindex="-1" role="dialog" aria-hidden="true">
+<div class="modal fade mu-kids-results mu-kids-modal-border" id="kids-results" tabindex="-1" role="dialog" aria-hidden="true">
   <div class="modal-dialog">
-    <div class="modal-content">
-      <div class="modal-header">
+    <div class="modal-content success">
+      <button type="button" class="mu-kids-modal-button mu-previous hidden" onclick="mumuki.kids.resultsCarrousel.prevSlide()" aria-label="Previous">
+        <span aria-hidden="true">
+          <i class="fa fa-fw fa-arrow-left fa-3x"></i>
+        </span>
+      </button>
+      <button type="button" class="mu-kids-modal-button mu-next" onclick="mumuki.kids.resultsCarrousel.nextSlide()" aria-label="Next">
+        <span aria-hidden="true">
+          <i class="fa fa-fw fa-arrow-right fa-3x"></i>
+        </span>
+      </button>
+      <div class="modal-header text-center">
       </div>
       <div class="modal-body">
         <div class="container-fluid">
           <div class="row">
             <div class="col-md-12">
-              <div class="row">
-                <div class="col-md-12 submission-results">
+              <div class="mu-kids-results-carrousel">
+                <div class="active submission-results">
                   <% if current_user? && @assignment.solved? %>
                     <%= render partial: 'exercise_solutions/kids_results',
-                                 locals: {assignment: @assignment, guide_finished_by_solution: false} %>
+                               locals: {assignment: @assignment, guide_finished_by_solution: false} %>
                   <% end %>
                 </div>
               </div>

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

@@ -0,0 +1,30 @@
+<div class="modal fade mu-kids-modal-border" id="mu-kids-context" tabindex="-1" role="dialog" aria-hidden="true">
+  <div class="modal-dialog">
+    <div class="modal-content kindergarten">
+      <button type="button" class="mu-kids-modal-button mu-close" data-waiting="" data-dismiss="modal" aria-label="Close">
+        <span aria-hidden="true">
+          <i class="fa fa-fw fa-times fa-3x"></i>
+        </span>
+      </button>
+      <button type="button" class="mu-kids-modal-button mu-previous hidden" onclick="mumuki.kids.context.prevSlide()" aria-label="Previous">
+        <span aria-hidden="true">
+          <i class="fa fa-fw fa-arrow-left fa-3x"></i>
+        </span>
+      </button>
+      <button type="button" class="mu-kids-modal-button mu-next" onclick="mumuki.kids.context.nextSlide()" aria-label="Next">
+        <span aria-hidden="true">
+          <i class="fa fa-fw fa-arrow-right fa-3x"></i>
+        </span>
+      </button>
+      <div class="modal-body mu-kids-context-body">
+        <div class="container-fluid">
+          <div class="row">
+            <div class="col-md-12">
+              <%= exercise.description_context %>
+            </div>
+          </div>
+        </div>
+      </div>
+    </div>
+  </div>
+</div>

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

@@ -0,0 +1,36 @@
+<div class="modal fade mu-kids-results mu-kids-modal-border" id="kids-results" tabindex="-1" role="dialog" aria-hidden="true">
+  <div class="modal-dialog">
+    <div class="modal-content kindergarten">
+      <button type="button" class="mu-kids-modal-button mu-close" data-waiting="" data-dismiss="modal" aria-label="Close">
+        <span aria-hidden="true">
+          <i class="fa fa-fw fa-times fa-3x"></i>
+        </span>
+      </button>
+      <button type="button" class="mu-kids-modal-button mu-previous hidden" onclick="mumuki.kids.resultsCarrousel.prevSlide()" aria-label="Previous">
+        <span aria-hidden="true">
+          <i class="fa fa-fw fa-arrow-left fa-3x"></i>
+        </span>
+      </button>
+      <button type="button" class="mu-kids-modal-button mu-next" onclick="mumuki.kids.resultsCarrousel.nextSlide()" aria-label="Next">
+        <span aria-hidden="true">
+          <i class="fa fa-fw fa-arrow-right fa-3x"></i>
+        </span>
+      </button>
+      <div class="modal-header">
+      </div>
+      <div class="modal-body">
+        <div class="container-fluid">
+          <div class="row">
+            <div class="col-md-12">
+              <div class="mu-kids-results-carrousel">
+                <div class="active submission-results kindergarten"></div>
+              </div>
+            </div>
+          </div>
+        </div>
+      </div>
+      <div class="modal-footer">
+      </div>
+    </div>
+  </div>
+</div>

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

@@ -0,0 +1,27 @@
+<div class="modal fade mu-kids-results-aborted mu-kids-modal-border" id="kids-results-aborted" tabindex="-1" role="dialog" aria-hidden="true">
+  <div class="modal-dialog">
+    <div class="modal-content broken kindergarten">
+      <button type="button" class="mu-kids-modal-button mu-close" data-dismiss="modal" aria-label="Close" data-waiting="">
+            <span aria-hidden="true">
+              <i class="fa fa-fw fa-times fa-3x"></i>
+            </span>
+      </button>
+      <div class="modal-header">
+        <h4 class="modal-title text-broken">
+          <strong><%= t :kindergarten_aborted %></strong>
+        </h4>
+      </div>
+      <div class="modal-body">
+        <div class="container-fluid">
+          <div class="row">
+            <div class="col-md-12">
+              <div class="mu-kids-character kindergarten">
+                <img class="mu-kids-character-result-aborted"/>
+              </div>
+            </div>
+          </div>
+        </div>
+      </div>
+    </div>
+  </div>
+</div>