mumuki-laboratory 8.2.1 → 8.6.1

data/app/helpers/menu_bar_helper.rb

@@ -39,7 +39,11 @@ module MenuBarHelper
     li_tag menu_item('sign-out-alt', :sign_out, logout_path(origin: url_for))
   end
 
-  def menu_item(icon, name, url)
-    link_to fixed_fa_icon(icon, text: t(name)), url, role: 'menuitem', tabindex: '-1'
+  def menu_item(icon, name, url, translation_params = {})
+    link_to fixed_fa_icon(icon, text: t(name, translation_params)), url, role: 'menuitem', tabindex: '-1'
+  end
+
+  def any_menu_bar_links?
+    menu_bar_links.any?
   end
 end

data/app/helpers/overlapped_buttons_helper.rb

@@ -1,10 +1,10 @@
 module OverlappedButtonsHelper
   def expand_icon
-    overlapped_button_icon :fullscreen, :expand, " (F11)"
+    overlapped_button_icon :fullscreen, :expand
   end
 
-  def restart_icon
-    overlapped_button_icon :restart, :undo
+  def restart_icon(data_placement='left')
+    overlapped_button_icon :restart, :undo, data_placement
   end
 
   def format_icon
@@ -12,10 +12,14 @@ module OverlappedButtonsHelper
   end
 
   def restart_guide_link(guide)
-    link_to restart_icon, guide_progress_path(guide), class: 'mu-content-toolbar-item mu-restart-guide', data: {confirm: t(:confirm_restart)}, method: :delete
+    link_to restart_icon('top'),
+            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, extra_title='')
-    fa_icon(icon, title: t(key) + extra_title, class: 'fa-fw', role: 'button', 'aria-label': t(key), 'data-placement': 'left')
+  def overlapped_button_icon(key, icon, data_placement='left')
+    fa_icon(icon, title: t(key), class: 'fa-fw', role: 'button', 'aria-label': t(key), 'data-placement': data_placement)
   end
 end

data/app/helpers/progress_bar_helper.rb

@@ -1,8 +1,8 @@
 module ProgressBarHelper
   include IconsHelper
 
-  def class_for_progress_list_item(exercise, active)
-    "progress-list-item text-center #{class_for_exercise(exercise)} #{active ? 'active' : ''}"
+  def class_for_progress_list_item(assignment, active)
+    "progress-list-item text-center #{icon_class_for(assignment)} #{active ? 'active' : ''}"
   end
 
 end

data/app/views/book_discussions/index.html.erb

@@ -10,7 +10,7 @@
 
 <div class="row">
   <div class="mu-inline-block-left">
-    <h1><%= @debatable.name %></h1>
+    <h1><%= t :forum %></h1>
   </div>
 </div>
 
@@ -21,3 +21,5 @@
     <%= render partial: 'layouts/discussions' %>
   <% end %>
 </div>
+
+<%= forum_terms_link %>

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

@@ -3,9 +3,14 @@
 <% end %>
 
 <div class="chapter-description">
-  <h1>
-    <span class="hidden-xs"><%= t(:chapter_number, number: @chapter.number) %>:&nbsp;</span>
-    <span><%= @chapter.name %></span>
+  <h1 class="pull-left">
+    <span class="hidden-xs pull-left"><%= t(:chapter_number, number: @chapter.number) %>:&nbsp;</span>
+    <span class="pull-left"><%= @chapter.name %></span>
+    <% if @chapter.monolesson? %>
+      <div class="mu-monolesson pull-left">
+        <%= render partial: 'layouts/guide_title_icons' %>
+      </div>
+    <% end %>
   </h1>
 
   <%= @chapter.description_html %>
@@ -13,14 +18,21 @@
 </div>
 
 <% if @chapter.lessons.present? %>
-<div>
-  <h3><%= t(:lessons) %></h3>
+  <% if @chapter.monolesson? %>
+    <div class="mu-monolesson">
+      <%= render partial: 'layouts/guide', locals: { subject: @monolesson } %>
+    </div>
+  <% else %>
+    <div>
+      <h3><%= t(:lessons) %></h3>
 
-  <% @chapter.lessons.each do |lesson| %>
-    <h4><%= lesson.number %>. <%= link_to_path_element lesson, mode: :plain %></h4>
-    <%= render partial: 'layouts/progress_listing', locals: {exercises: lesson.exercises} %>
+      <% @chapter.lessons.includes(guide: :exercises).each do |lesson| %>
+        <h4><%= lesson.number %>. <%= link_to_path_element lesson, mode: :plain %></h4>
+        <%= render partial: 'layouts/progress_listing', locals: { guide: lesson.guide } %>
+      <% end %>
+    </div>
   <% end %>
-</div>
+
 <% end %>
 
 <% if @chapter.appendix.present? %>

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

@@ -1 +1 @@
-<%= render partial: "layouts/guide", locals: { subject: @complement }%>
+<%= render partial: "layouts/guide_container", locals: { subject: @complement }%>

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

@@ -3,29 +3,29 @@
     <div class="discussion-message-bubble-header">
       <div class="discussion-message-bubble-title">
         <%= user.name %>
+        <% if user.moderator_here? %>
+          <span class="moderator-badge"><%= t(:moderation) %></span>
+        <% end %>
         <span class="message-date">
           <%= t(:time_since, time: time_ago_in_words(message.created_at)) %>
         </span>
-        <% if user.moderator_here? %>
-          <%= fa_icon(:star, 'data-toggle': 'tooltip', title: (t :moderator), class: 'moderator-star') %>
-        <% end %>
         <span class="actions">
           <% if message.authorized? current_user %>
             <% if current_user&.moderator_here? %>
               <a class="discussion-message-approved <%= 'selected' if message.approved? %>" onclick="mumuki.Forum.discussionMessageToggleApprove('<%= approve_discussion_message_url(@discussion, message) %>', $(this))">
-                <%= fa_icon(:check, class: 'fa-xs') %>
+                <%= fa_icon(:check, class: 'fa-lg') %>
               </a>
               <% if message.from_initiator? %>
                 <a class="discussion-message-not-actually-a-question <%= 'selected' if message.not_actually_a_question? %>" onclick="mumuki.Forum.discussionMessageToggleNotActuallyAQuestion('<%= question_discussion_message_url(@discussion, message) %>', $(this))">
-                  <%= fa_icon('question-circle', type: 'regular', class: 'fa-xs') %>
+                  <%= fa_icon('question-circle', type: 'regular', class: 'fa-lg') %>
                 </a>
               <% end %>
             <% end %>
-            <%= link_to fa_icon('trash-alt', type: :regular), discussion_message_path(@discussion, message), method: :delete, data: { confirm: t(:are_you_sure, action: t(:destroy_message)) } %>
+            <%= link_to fa_icon('trash-alt', type: :regular, class: 'fa-lg'), discussion_message_path(@discussion, message), method: :delete, data: { confirm: t(:are_you_sure, action: t(:destroy_message)) }, class: 'discussion-delete-message' %>
           <% end %>
           <% if should_show_approved_for?(current_user, message) %>
             <span class="discussion-message-approved selected">
-              <%= fa_icon(:check, class: 'fa-xs', 'data-toggle': 'tooltip', title: (t :approved_message)) %>
+              <%= fa_icon(:check, class: 'fa-lg', 'data-toggle': 'tooltip', title: (t :approved_message)) %>
             </span>
           <% end %>
         </span>

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

@@ -2,17 +2,22 @@
   <%= breadcrumbs(@debatable, t(:discussions)) %>
 <% end %>
 
+<div class="row">
+  <div class="mu-inline-block-left">
+    <h1><%= t :forum %></h1>
+  </div>
+</div>
 <div class="row">
   <% if @debatable.respond_to? :language %>
     <div class="mu-inline-block-right hidden-xs">
-      <h1><%= language_icon @debatable.language %></h1>
+      <h3><%= language_icon @debatable.language %></h3>
     </div>
   <% end %>
   <div class="mu-inline-block-left">
-    <h1>
+    <h3>
       <span class="hidden-xs"><%= t("#{@debatable_class.downcase}_number", number: @debatable.number) %>:&nbsp;</span>
       <span><%= @debatable.name %></span>
-    </h1>
+    </h3>
   </div>
 </div>
 
@@ -23,7 +28,9 @@
   <%= new_discussion_link(:no_useful_result, :ask_a_question) %>
 <% end %>
 
-  <%= content_for :no_container do %>
+<%= content_for :no_container do %>
 <% end if current_user? %>
 
+<%= forum_terms_link %>
+
 

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

@@ -0,0 +1,17 @@
+<%= content_for :breadcrumbs do %>
+  <%= breadcrumbs @authorization_request %>
+<% end %>
+
+<div class="row">
+  <div class="mu-inline-block-left">
+    <h1>
+      <%= t :exam_registration_to, description: @authorization_request.exam_registration.description %>
+    </h1>
+  </div>
+</div>
+
+<% if @authorization_request.approved? %>
+  <%= t :exam_authorization_request_approved_html, date: l(@authorization_request.exam.start_time, format: :long) %>
+<% else %>
+  <%= t :exam_authorization_request_rejected %>
+<% end %>

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

@@ -0,0 +1,37 @@
+<%= content_for :breadcrumbs do %>
+  <%= breadcrumbs @registration %>
+<% end %>
+
+<div class="row">
+  <div class="mu-inline-block-left">
+    <h1>
+      <%= t :exam_registration_to, description: @registration.description %>
+    </h1>
+  </div>
+</div>
+
+<div class="row">
+  <div class="mu-inline-block-left">
+    <div class="bs-callout bs-callout-info">
+      <h4 class="text-info">
+        <strong><%= fa_icon :info_circle %> <%= t :important_info %></strong>
+      </h4>
+      <p>
+        <%= t :exam_registration_explanation_html, date: l(@registration.end_time, format: :long) %>
+      </p>
+    </div>
+    <%= form_for @authorization_request do |f| %>
+      <%= f.hidden_field :exam_registration_id, value: @registration.id %>
+      <div class="form-group">
+        <%= f.label :exam_id, t(:exam_registration_choose_exam) %>
+        <% @registration.exams.each do |exam| %>
+          <div class="field radio complementary complementary-radio">
+            <%= f.radio_button(:exam_id, exam.id, id: exam.id, required: true, checked: @authorization_request.exam_id == exam.id) %>
+            <%= label_tag exam.id, l(exam.start_time, format: :long) %>
+          </div>
+        <% end %>
+      </div>
+      <button class="btn btn-success"> <%= t :save %> </button>
+    <% end %>
+  </div>
+</div>

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

@@ -1 +1 @@
-<%= render partial: "layouts/guide", locals: { subject: @exam }%>
+<%= render partial: "layouts/guide_container", locals: { subject: @exam }%>

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

@@ -6,7 +6,7 @@
 
 <%= render partial: 'layouts/authoring', locals: {guide: @guide} %>
 
-<% @stats = @exercise.guide.stats_for(current_user) if current_user && @exercise.guide %>
+<% @stats = @exercise.stats_for(current_user) %>
 
 <% if @exercise.navigable_parent.timed? && !current_user.teacher? %>
   <%= render partial: 'layouts/timer', locals: {end_time: @exercise.navigable_parent.real_end_time(current_user)} %>
@@ -65,6 +65,6 @@
     <%= render partial: 'layouts/modals/level_up' %>
   <% end %>
 
-  <%= render partial: 'layouts/modals/guide_corollary', locals: {guide: @guide} %>
+  <%= render partial: 'layouts/modals/guide_corollary', locals: {guide: @guide} if @stats.almost_done? %>
   <%= render partial: 'layouts/modals/new_message', locals: {exercise: @exercise} if should_render_message_input?(@exercise) %>
 <% end if current_user? %>

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

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

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

@@ -1,48 +1,19 @@
 <%= render_runner_assets @guide.language, :layout %>
 
-<%= content_for :breadcrumbs do %>
-  <%= breadcrumbs subject %>
-<% end %>
-
 <%= render partial: 'layouts/authoring', locals: {guide: @guide} %>
 
-<% if subject.timed? && subject.started?(current_user) && !current_user.teacher? %>
+<% if subject.timed? && @stats.started? && !current_user.teacher? %>
   <%= render partial: 'layouts/timer', locals: {end_time: subject.real_end_time(current_user)} %>
 <% end %>
 
-<div class="row">
-  <div class="mu-inline-block-right">
-    <h1><%= language_icon @guide.language %></h1>
-  </div>
-  <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>
-  </div>
-</div>
-<div class="row">
-  <div class="col-md-12">
-    <div class="text-box">
-      <%= @guide.description_html %>
-    </div>
-  </div>
-</div>
+<%= yield if block_given? %>
 
 <h3>
   <%= t :exercises %>
-  <%= restart_guide_link(@guide) if current_user && @guide.started?(current_user) && @guide.resettable? %>
+  <%= restart_guide_link(@guide) if current_user && @stats.started? && @guide.resettable? %>
 </h3>
 
-<%= render partial: 'layouts/progress_listing', locals: {exercises: @guide.exercises} %>
+<%= render partial: 'layouts/progress_listing', locals: { guide: @guide } %>
 
 <% if @stats&.done? %>
   <div class="text-box">

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

@@ -0,0 +1,28 @@
+<%= content_for :breadcrumbs do %>
+  <%= breadcrumbs subject %>
+<% end %>
+
+<%= render layout: 'layouts/guide', locals: { subject: subject } do %>
+
+  <div class="row">
+    <div class="mu-inline-block-right">
+      <h1><%= language_icon @guide.language %></h1>
+    </div>
+    <div class="mu-inline-block-left guide-header">
+      <h1 class="pull-left">
+        <span class="pull-left">
+          <%= subject.name %>
+        </span>
+        <%= render partial: 'layouts/guide_title_icons' %>
+      </h1>
+    </div>
+  </div>
+  <div class="row">
+    <div class="col-md-12">
+      <div class="text-box">
+        <%= @guide.description_html %>
+      </div>
+    </div>
+  </div>
+
+<% end %>

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

@@ -0,0 +1,9 @@
+<div class="guide-title-icons pull-left">
+  <% 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 %>
+</div>

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

@@ -1,12 +1,14 @@
 <div class="progress-list-flex">
-  <% guide.exercises.each do |e| %>
+  <% assignments = guide.assignments_for(current_user) %>
+  <% assignments.each do |assignment| %>
+    <% exercise = assignment.exercise %>
     <a
-      <%= turbolinks_enable_for e %>
-      href="<%= exercise_path(e)%>"
-      aria-label="<%= e.navigable_name %>"
-      title="<%= e.navigable_name %>"
-      data-mu-exercise-id="<%= e.id %>"
-      class="<%= class_for_progress_list_item(e, e == actual)%>">
+      <%= turbolinks_enable_for exercise %>
+      href="<%= exercise_path(exercise)%>"
+      aria-label="<%= exercise.navigable_name %>"
+      title="<%= exercise.navigable_name %>"
+      data-mu-exercise-id="<%= exercise.id %>"
+      class="<%= class_for_progress_list_item(assignment, exercise == actual)%>">
     </a>
   <% end %>
 </div>

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

@@ -1,9 +1,9 @@
 <ul class="progress-listing">
-  <% exercises.each do |exercise| %>
-      <% cache [exercise, exercise.status_for(current_user), Organization.current] do %>
-          <li <%= turbolinks_enable_for(exercise) %>>
-            <%= exercise_status_icon exercise %>
-            <%= link_to_path_element(exercise) %>
+  <% guide.assignments_for(current_user).each do |assignment| %>
+      <% cache [assignment.exercise, assignment.status, Organization.current] do %>
+          <li <%= turbolinks_enable_for(assignment.exercise) %>>
+            <%= assignment_status_icon assignment %>
+            <%= link_to_path_element(assignment.exercise) %>
           </li>
       <% end %>
   <% end %>

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

@@ -1,4 +1,4 @@
-<a class="fab fa-facebook-f social-icon" aria-label="Facebook" href="https://www.facebook.com/MumukiOrg" target="_blank"></a>
+<a class="fab fa-instagram social-icon" aria-label="Instagram" href="https://www.instagram.com/mumukiorg" target="_blank"></a>
 <a class="fab fa-twitter social-icon" aria-label="Twitter" href="https://twitter.com/MumukiOrg" target="_blank"></a>
+<a class="fab fa-youtube social-icon" aria-label="Youtube" href="https://www.youtube.com/c/MumukiOrg" target="_blank"></a>
 <a class="fab fa-github social-icon" aria-label="Github" href="https://github.com/mumuki" target="_blank"></a>
-<a class="fab fa-linkedin-in social-icon" aria-label="LinkedIn" href="https://www.linkedin.com/company/mumukiorg" target="_blank"></a>

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

@@ -25,12 +25,7 @@
               <span class="mu-level-number"></span>
             </div>
           <% end %>
-          <div class="dropdown mu-navbar-element notifications-box <%= 'notifications-box-empty' unless has_notifications? %>">
-            <a href=<%= "#{user_notifications_path}" %>>
-              <i class="fas fa-bell fa-fw fa-2x mu-navbar-icon"></i>
-                <span class="badge badge-notifications"><%= notifications_count %></span>
-            </a>
-          </div>
+          <%= render partial: 'notifications/dropdown' %>
           <div class="dropdown mu-navbar-element">
             <div id="profileDropdown" class="profile-dropdown" data-toggle="dropdown" aria-label="<%= t(:user) %>" role="menu" tabindex="0">
               <%= profile_picture_for current_user %>
@@ -38,7 +33,9 @@
             </div>
             <ul class="dropdown-menu dropdown-menu-right" aria-labelledby="profileDropdown">
               <%= menu_bar_list_items %>
-              <li class="divider"></li>
+              <% if any_menu_bar_links? %>
+                <li class="divider"></li>
+              <% end %>
               <%= logout_link %>
             </ul>
           </div>