mumuki-laboratory 9.0.6 → 9.1.0

data/app/helpers/discussions_helper.rb

@@ -1,6 +1,6 @@
 module DiscussionsHelper
   def read_discussions_link(item)
-    discussions_link others_discussions_icon(t(:solve_your_doubts)), item_discussions_path(item, default_discussions_params)
+    discussions_link others_discussions_icon(t(:solve_your_doubts)), item_discussions_path(item, default_discussions_params), class: 'dropdown-item'
   end
 
   def kids_read_discussions_link(item)
@@ -8,11 +8,11 @@ module DiscussionsHelper
   end
 
   def solve_discussions_link
-    discussions_link others_discussions_icon(t(:solve_doubts)), discussions_path(solve_discussion_params_for(current_user))
+    discussions_link others_discussions_icon(t(:solve_doubts)), discussions_path(solve_discussion_params_for(current_user)), class: 'dropdown-item'
   end
 
   def user_discussions_link
-    discussions_link(user_discussions_icon(t(:my_doubts)), discussions_user_path) if current_user.watched_discussions.present?
+    discussions_link(user_discussions_icon(t(:my_doubts)), discussions_user_path, class: 'dropdown-item') if current_user.watched_discussions.present?
   end
 
   def others_discussions_icon(text)
@@ -60,18 +60,6 @@ module DiscussionsHelper
     }.html_safe
   end
 
-  def discussions_link_with_teaser(item)
-    %Q{
-      <div>
-        <h3>#{t(:discussions)}</h3>
-        <p>
-          #{t(:solve_your_doubts_teaser)}
-          #{read_discussions_link(item)}
-        </p>
-      </div>
-    }.html_safe
-  end
-
   def discussion_messages_icon(discussion)
     %Q{
       <span class="discussion-icon fa-stack fa-xs">
@@ -148,7 +136,7 @@ module DiscussionsHelper
     if filters.present?
       %Q{
         <div class="dropdown discussions-toolbar-filter">
-          <a id="dropdown-#{label}" data-toggle="dropdown" role="menu">
+          <a id="dropdown-#{label}" data-bs-toggle="dropdown" role="menu">
             #{t label} #{fa_icon :'caret-down', class: 'fa-xs'}
           </a>
           <ul class="dropdown-menu" aria-labelledby="dropdown-#{label}">
@@ -161,17 +149,17 @@ module DiscussionsHelper
   end
 
   def discussion_filter_list(label, filters, &block)
-    filters.map { |it| discussion_filter_item(label, it, &block) }.join("\n")
+    filters.map { |it| discussion_filter_item(label, it, 'dropdown-item', &block) }.join("\n")
   end
 
-  def discussion_filter_item(label, filter, &block)
-    content_tag(:li, discussion_filter_link(label, filter, &block), class: ('selected' if discussion_filter_selected?(label, filter)))
+  def discussion_filter_item(label, filter, link_class=nil, &block)
+    content_tag(:li, discussion_filter_link(label, filter, link_class, &block), class: ('selected' if discussion_filter_selected?(label, filter)))
   end
 
   def discussion_filter_unselect_item(label, can_select_all)
     if can_select_all
       content_tag(:li,
-                  link_to(t(:all), discussion_filter_params_without_page.except(label)),
+                  link_to(t(:all), discussion_filter_params_without_page.except(label), class: 'dropdown-item'),
                   class: ('selected' unless discussion_filter_params.include?(label)))
     end
   end
@@ -180,12 +168,12 @@ module DiscussionsHelper
     filter.to_s == discussion_filter_params[label]
   end
 
-  def discussion_filter_link(label, filter, &block)
-    link_to capture(filter, &block), discussion_filter_params_without_page.merge(Hash[label, filter])
+  def discussion_filter_link(label, filter, clazz, &block)
+    link_to capture(filter, &block), discussion_filter_params_without_page.merge(Hash[label, filter]), class: clazz
   end
 
   def discussion_info(discussion)
-    "#{t(:time_since, time: time_ago_in_words(discussion.created_at))} · #{t(:message_count, count: discussion.messages.size)}"
+    "#{t(:time_since, time: time_ago_in_words(discussion.created_at))} · #{t(:message_count, count: discussion.visible_messages.size)}"
   end
 
   def discussion_filter_params_without_page
@@ -197,6 +185,55 @@ module DiscussionsHelper
   end
 
   def discussion_user_name(user)
-    user.name
+    user.abbreviated_name
+  end
+
+  def subscription_icon
+    fa_icon :bell, text: t(:subscribe)
+  end
+
+  def unsubscription_icon
+    fa_icon :bell, type: :regular, text: t(:unsubscribe)
+  end
+
+  def upvote_icon
+    fa_icon 'thumbs-up', text: t(:upvote)
+  end
+
+  def undo_upvote_icon
+    fa_icon 'thumbs-up', type: :regular, text: t(:undo_upvote)
+  end
+
+  def discussion_delete_message_link(discussion, message)
+    link_to fa_icon('trash-alt', type: :regular, class: 'fa-lg'), discussion_message_path(discussion, message, motive: :self_deleted),
+            method: :delete, data: { confirm: t(:are_you_sure, action: t(:destroy_message)) }, class: 'discussion-delete-message'
+  end
+
+  def discussion_delete_message_dropdown(discussion, message)
+    %Q{
+      <span class="dropdown">
+        #{content_tag :span, fa_icon('trash-alt', type: :regular, class: 'fa-lg'), role: 'menu', 'data-bs-toggle': 'dropdown',
+                      class: 'discussion-delete-message', id: 'deleteDiscussionDropdown'}
+        <ul class="dropdown-menu dropdown-menu-right" aria-labelledby="deleteDiscussionDropdown">
+          #{discussion_delete_message_option discussion, message, :inappropriate_content, 'times-circle'}
+          #{discussion_delete_message_option discussion, message, :shares_solution, :code}
+          #{discussion_delete_message_option discussion, message, :discloses_personal_information, 'user-tag'}
+        </ul>
+      </span>
+    }.html_safe
+  end
+
+  def discussion_delete_message_option(discussion, message, motive, icon)
+    %Q{
+      <li>
+        #{link_to fa_icon(icon, text: t("deletion_motive.#{motive}.present"), class: 'fa-fw fixed-icon'),
+                  discussion_message_path(discussion, message, motive: motive), method: :delete, class: 'dropdown-item',
+                  role: 'menuitem', data: { confirm: t(:are_you_sure, action: t(:destroy_message)) } }
+      </li>
+    }.html_safe
+  end
+
+  def message_deleted_text(message)
+    t(:message_deleted, motive: t("deletion_motive.#{message.deletion_motive}.past").downcase, forum_terms: link_to_forum_terms).html_safe
   end
 end

data/app/helpers/editor_tabs_helper.rb

@@ -1,20 +1,24 @@
 module EditorTabsHelper
   def extra_code_tab
-    "<li role='presentation'> <a data-target='#visible-extra' aria-controls='visible-extra' role='tab' data-toggle='tab' class='editor-tab'>#{fa_icon 'code'} #{t 'activerecord.attributes.exercise.extra'}</a> </li>".html_safe
+    "<li role='presentation'>
+        <a class='editor-tab nav-link' data-bs-target='#visible-extra' aria-controls='visible-extra' role='tab' data-bs-toggle='tab'>
+          #{fa_icon 'code', text: (t 'activerecord.attributes.exercise.extra')}
+        </a>
+    </li>".html_safe
   end
 
   def console_tab(active: false)
-    "<li role='presentation' class='#{'active' if active}'>
-        <a data-target='#console' aria-controls='console' tabindex='0' role='tab' data-toggle='tab' class='editor-tab'>
-          #{fa_icon 'terminal'}#{t :console }
+    "<li role='presentation'>
+        <a class='editor-tab nav-link #{'active' if active}' data-bs-target='#console' aria-controls='console' tabindex='0' role='tab' data-bs-toggle='tab' >
+          #{fa_icon 'terminal', text: (t :console)}
         </a>
      </li>".html_safe
   end
 
   def messages_tab(exercise, organization = Organization.current)
     "<li id='messages-tab' role='presentation'>
-        <a data-target='#messages' tabindex='0' aria-controls='console' role='tab' data-toggle='tab' class='editor-tab'>
-          #{fa_icon 'comments', type: :regular} #{t :messages }
+        <a class='editor-tab nav-link' data-bs-target='#messages' tabindex='0' aria-controls='console' role='tab' data-bs-toggle='tab'>
+          #{fa_icon 'comments', type: :regular, text: (t :messages)}
         </a>
      </li>".html_safe if organization.raise_hand_enabled? && exercise.has_messages_for?(current_user)
   end

data/app/helpers/email_helper.rb

@@ -12,9 +12,9 @@ See #{transparent_exercise_url(assignment.exercise.transparent_params)}
 EOM
   end
 
-  def permissions_help_email_body(user)
+  def permissions_help_email_body(user, organization)
 <<EOM
-#{t :want_permissions}: #{user.try(:uid)} - #{user.try(:email)}
+#{t :want_permissions} #{organization.name}: #{user.try(:uid)} - #{user.try(:email)}
 EOM
   end
 end

data/app/helpers/exercise_input_helper.rb

@@ -53,10 +53,9 @@ module ExerciseInputHelper
     waiting_text = t(options.waiting_t) if options.waiting_t.present?
     %Q{
       <div class="btn-submit-container">
-        <button class="btn btn-success btn-block btn-submit #{options.classes}"
+        <button class="btn btn-complementary w-100 btn-submit #{options.classes}"
                        data-waiting="#{waiting_text}">
-          #{fa_icon 'play'}
-          #{text} #{remaining_attempts_text(assignment)}
+          #{fa_icon 'play', text: ([text, remaining_attempts_text(assignment)].join('')).html_safe}
        </button>
       </div>
     }.html_safe

data/app/helpers/links_helper.rb

@@ -25,13 +25,16 @@ module LinksHelper
   def teacher_info_button(item)
     if current_user&.teacher_here? && item.teacher_info.present?
       %Q{
-        <a
-          class="mu-popover"
-          data-toggle="popover"
-          data-html="true"
-          title="#{t :teacher_info}"
-          data-placement="bottom"
-          data-content="#{html_rescape item.teacher_info_html}">#{fixed_fa_icon('info-circle')}</a>
+        <div data-bs-toggle="tooltip" title="#{t :teacher_info}">
+          <a
+            class="mu-popover"
+            data-bs-toggle="popover"
+            data-bs-html="true"
+            title="#{t :teacher_info}"
+            data-bs-placement="bottom"
+            data-bs-content="#{html_rescape item.teacher_info_html}">#{fixed_fa_icon('info-circle')}
+          </a>
+        </div>
       }.html_safe
     end
   end
@@ -48,7 +51,7 @@ module LinksHelper
     mail_to Organization.current.contact_email,
             Organization.current.contact_email,
             subject: I18n.t(:permissions),
-            body: permissions_help_email_body(current_user)
+            body: permissions_help_email_body(current_user, Organization.current)
   end
 
   def link_to_profile_terms
@@ -88,7 +91,7 @@ module LinksHelper
     return unless current_user&.writer?
 
     url = yield
-    link_to fixed_fa_icon('pencil-alt'), url, target: "_blank", title: t(:edit)
+    link_to fixed_fa_icon('pencil-alt'), url, target: "_blank", 'data-bs-toggle': 'tooltip', title: t(:edit)
   end
 
   def url_for_bibliotheca_guide(guide)

data/app/helpers/menu_bar_helper.rb

@@ -40,7 +40,7 @@ module MenuBarHelper
   end
 
   def menu_item(icon, name, url, translation_params = {})
-    link_to fixed_fa_icon(icon, text: t(name, translation_params)), url, role: 'menuitem', tabindex: '-1'
+    link_to fixed_fa_icon(icon, text: t(name, translation_params)), url, role: 'menuitem', tabindex: '-1', class: 'dropdown-item'
   end
 
   def any_menu_bar_links?

data/app/helpers/messages_helper.rb

@@ -4,7 +4,7 @@ module MessagesHelper
   end
 
   def hidden_pending(assignment)
-    assignment.pending_messages? ? '' : 'hidden'
+    assignment.pending_messages? ? '' : 'd-none'
   end
 
   def disabled_submit_class(assignment)

data/app/helpers/overlapped_buttons_helper.rb

@@ -1,25 +1,35 @@
 module OverlappedButtonsHelper
   def expand_icon
-    overlapped_button_icon :fullscreen, :expand
+    overlapped_link :fullscreen, :expand, class: 'editor-resize'
   end
 
-  def restart_icon(data_placement='left')
-    overlapped_button_icon :restart, :undo, data_placement
+  def format_icon
+    overlapped_link :format, :indent, class: 'editor-format'
   end
 
-  def format_icon
-    overlapped_button_icon :format, :indent
+  def restart_icon(source='console', **options)
+    overlapped_link :restart, :undo, class: "#{source}-reset submission-reset", **options
   end
 
   def restart_guide_link(guide)
-    link_to restart_icon('top'),
-            guide_progress_path(guide),
-            class: 'mu-content-toolbar-item mu-restart-guide',
-            data: {confirm: t(:confirm_restart)},
-            method: :delete
+    all_options = tooltip_options(:restart).merge!(
+      {class: 'mu-content-toolbar-item mu-restart-guide',
+       data: {confirm: t(:confirm_restart)}, method: :delete, 'data-bs-placement': 'top'})
+
+    link_to overlapped_button_icon(:undo), guide_progress_path(guide), all_options
+  end
+
+  private
+
+  def overlapped_link(key, icon, **options)
+    content_tag :a, overlapped_button_icon(icon), tooltip_options(key).merge!(options)
+  end
+
+  def overlapped_button_icon(icon)
+    fa_icon icon, class: 'fa-fw', role: 'button'
   end
 
-  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)
+  def tooltip_options(key)
+    {title: t(key), 'aria-label': t(key), 'data-bs-toggle': 'tooltip', 'data-bs-placement': 'left'}
   end
 end

data/app/helpers/profile_helper.rb

@@ -1,13 +1,13 @@
 module ProfileHelper
   def edit_profile_button
-    link_to t(:edit_profile), :edit_user, class: 'btn btn-success'
+    link_to t(:edit_profile), :edit_user, class: 'btn btn-complementary'
   end
 
   def cancel_edit_profile_button
-    link_to t(:cancel), :user, class: 'btn btn-default' if current_user.profile_completed?
+    link_to t(:cancel), :user, class: 'btn btn-secondary' 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'
+    form.submit t(:save), disabled: true, class: 'btn btn-complementary mu-edit-profile-btn'
   end
 end

data/app/helpers/toast_helper.rb

@@ -0,0 +1,27 @@
+module ToastHelper
+  def toast_notice(text)
+    toast_for('success', 'check-circle', text)
+  end
+
+  def toast_alert(text)
+    toast_for('error', 'times-circle', text)
+  end
+
+  def toast_info(text)
+    toast_for('info', 'info-circle', text)
+  end
+
+  private
+
+  def toast_for(type, icon, text)
+    "<div class='toast mu-toast-#{type}' role='alert'>
+       <div class='toast-body'>
+         <div class='d-flex align-items-center'>
+           #{fa_icon icon, class: 'fa-lg me-3'}
+           <span class='flex-grow-1 text-break'>#{text}</span>
+           <button type='button' class='btn-close btn-close-white mx-2 flex-shrink-0' data-bs-dismiss='toast' aria-label='Close'></button>
+         </div>
+       </div>
+     </div>".html_safe
+  end
+end

data/app/helpers/user_activity_helper.rb

@@ -9,7 +9,7 @@ module UserActivityHelper
   end
 
   def mark_period_if_active(period_start)
-    active_period?(period_start) && 'class=active'
+    active_period?(period_start) ? 'nav-link active' : 'nav-link'
   end
 
   def solved_exercises_percentage

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

@@ -2,12 +2,12 @@
   <%= header_breadcrumbs(link_for_organization: false) %>
 <% end %>
 
-<div class="col-md-offset-2 col-md-8">
+<div class="col-lg-8 offset-lg-2">
   <%= render partial: 'book/header' %>
 
   <% @book.next_lesson_for(current_user).try do |lesson| %>
     <div class="actions">
-      <a href="<%= lesson_path(lesson) %>" class="btn btn-success">
+      <a href="<%= lesson_path(lesson) %>" class="btn btn-complementary">
         <%= t book_practice_key_for(current_user) %>
       </a>
     </div>

data/app/views/certificates/verify.html.erb

@@ -22,7 +22,7 @@
           <a href="<%= linkedin_post_url @certificate %>" target="_blank">
             <img src="https://download.linkedin.com/desktop/add2profile/buttons/<%= t :linkedin_profile_button_locale %>.png" alt="LinkedIn Add to Profile button">
           </a>
-          <a class="btn btn-success mu-certificate-download-btn pull-right" href="<%= download_certificate_path @certificate.code %>" target="_blank">
+          <a class="btn btn-complementary mu-certificate-download-btn pull-right" href="<%= download_certificate_path @certificate.code %>" target="_blank">
             <i class="fas fa-fw fa-lg fa-download mu-certificate-download-btn-icon"></i>
             <span class="mu-certificate-download-btn-text"><%= t :certificate %></span>
           </a>

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

@@ -4,8 +4,8 @@
 
 <div class="row">
   <div class="mu-inline-block-left">
-    <h1 class="hidden-xs"><%= full_title_for @chapter %></h1>
-    <h1 class="visible-xs"><%= short_title_for @chapter %></h1>
+    <h1 class="d-none d-sm-block"><%= full_title_for @chapter %></h1>
+    <h1 class="d-block d-sm-none"><%= short_title_for @chapter %></h1>
 
     <% if @chapter.monolesson? %>
       <%= render partial: 'guides/guide_title_icons' %>

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

@@ -10,22 +10,28 @@
           <%= t(:time_since, time: time_ago_in_words(message.created_at)) %>
         </span>
         <span class="actions">
-          <% if message.authorized? current_user %>
+          <% if message.authorized?(current_user) && !message.deleted? %>
             <% 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))">
+              <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-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))">
+                <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-lg') %>
                 </a>
               <% end %>
             <% end %>
-            <%= 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' %>
+            <% if message.from_user? current_user %>
+              <%= discussion_delete_message_link @discussion, message %>
+            <% else %>
+              <%= discussion_delete_message_dropdown @discussion, message %>
+            <% end %>
           <% end %>
           <% if should_show_approved_for?(current_user, message) %>
             <span class="discussion-message-approved selected">
-              <%= fa_icon(:check, class: 'fa-lg', 'data-toggle': 'tooltip', title: (t :approved_message)) %>
+              <%= fa_icon(:check, class: 'fa-lg', 'data-bs-toggle': 'tooltip', title: (t :approved_message)) %>
             </span>
           <% end %>
         </span>
@@ -33,7 +39,26 @@
     </div>
     <div class="discussion-message-bubble-content">
       <div class="discussion-message-content">
-        <%= message.content_html %>
+        <% if message.deleted? %>
+          <em><%= message_deleted_text message %></em>
+          <% if message.from_user? current_user %>
+            <p><%= t :deleted_message_warning %></p>
+          <% end %>
+          <% if current_user&.moderator_here? %>
+            <hr>
+            <%= t :deleted_by, deleter: message.deleted_by.name %>
+            <%= t(:time_since, time: time_ago_in_words(message.deleted_at)) %>.
+            <a href='<%= "#deletedMessage#{message.id}" %>' data-bs-toggle="collapse">
+              <%= t :show_message %>
+            </a>
+            <div id='<%= "deletedMessage#{message.id}" %>' class="collapse">
+              <hr>
+              <%= message.content_html %>
+            </div>
+          <% end %>
+        <% else %>
+          <%= message.content_html %>
+        <% end %>
       </div>
     </div>
   </div>