mumuki-laboratory 9.0.2 → 9.1.0

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

@@ -9,6 +9,7 @@ module MultipleFileEditorHelper
 
   def multifile_hidden_inputs
     hidden_field_tag('highlight-modes', highlight_modes.to_json) +
-    hidden_field_tag('multifile-locales', multifile_locales.to_json)
+    hidden_field_tag('multifile-locales', multifile_locales.to_json) +
+    hidden_field_tag('multifile-default-content', @files.to_json)
   end
 end

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

@@ -0,0 +1,48 @@
+module UserActivityHelper
+  def activity_selector_week_range_for(organization = Organization.current)
+    start = organization.activity_start_date min_week
+    (start.prev_occurring(:monday) + 1..Date.today)
+        .step(7)
+        .to_a
+        .reverse
+        .map { |it| [it, it + 7.days] }
+  end
+
+  def mark_period_if_active(period_start)
+    active_period?(period_start) ? 'nav-link active' : 'nav-link'
+  end
+
+  def solved_exercises_percentage
+    percentage = @activity[:exercises][:solved_count].to_f / @activity[:exercises][:count] * 100
+    "#{percentage.ceil}%"
+  end
+
+  def exercises_activity_stats
+    solved_count = {
+        name: t(:solved_exercises_count, count: @activity[:exercises][:solved_count]),
+        value: @activity[:exercises][:solved_count] }
+    solved_percentage = {
+        name: t(:solved_exercises_percentage),
+        value: solved_exercises_percentage }
+
+    @date_from ? [solved_count] : [solved_count, solved_percentage]
+  end
+
+  def messages_activity_stats
+    count = @activity[:messages][:count]
+    approved = @activity[:messages][:approved]
+
+    [{name: t(:messages_pluralized, count: count), value: count},
+     {name: t(:approved_messages, count: approved), value: approved}]
+  end
+
+  private
+
+  def active_period?(period_start)
+    period_start ? @date_from == period_start : !@date_from
+  end
+
+  def min_week
+    8.week.ago.to_date
+  end
+end

data/app/helpers/user_menu_helper.rb

@@ -1,22 +1,40 @@
 module UserMenuHelper
+  def user_menu_header
+    content_tag :div, user_menu_header_icon, class: 'mu-user-menu-header'
+  end
+
+  def user_menu_divider
+    content_tag :div, '', class: 'mu-user-menu-divider horizontal'
+  end
+
   def profile_user_menu_link
-    user_menu_link t(:my_profile), user_path, 'show'
+    user_menu_item t(:my_profile), user_path, 'show'
   end
 
   def messages_user_menu_link
-    user_menu_link t(:messages), messages_user_path, 'messages'
+    user_menu_item t(:messages), messages_user_path, 'messages'
   end
 
   def discussions_user_menu_link
-    user_menu_link t(:discussions), discussions_user_path, 'discussions'
+    user_menu_item t(:discussions), discussions_user_path, 'discussions' if current_user&.can_discuss_here?
+  end
+
+  def activity_user_menu_link
+    user_menu_item t(:activity), activity_user_path, 'activity'
   end
 
   def certificates_user_menu_link
-    user_menu_link t(:certificates), certificates_user_path, 'certificates'
+    user_menu_item t(:certificates), certificates_user_path, 'certificates'
   end
 
-  def user_menu_link(label, path, active_on)
+  private
+
+  def user_menu_item(label, path, active_on)
     link_klass = 'active' if action_name == active_on
-    link_to label, path, { class: link_klass }.compact
+    content_tag :div, link_to(label, path, { class: link_klass }.compact), class: 'mu-user-menu-item'
+  end
+
+  def user_menu_header_icon
+    fa_icon('chevron-down', text: t(:my_account), id: 'mu-user-menu-header-icon', right: true)
   end
 end

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

@@ -2,7 +2,7 @@
   <div class="discussion-message-bubble">
     <div class="discussion-message-bubble-header">
       <div class="discussion-message-bubble-title">
-        <%= discussion.initiator.name %>
+        <%= discussion_user_name(discussion.initiator) %>
         <span class="message-date">
           <%= t(:time_since, time: time_ago_in_words(discussion.created_at)) %>
         </span>

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

@@ -2,7 +2,7 @@
   <div class="discussion-message-bubble">
     <div class="discussion-message-bubble-header">
       <div class="discussion-message-bubble-title">
-        <%= user.name %>
+        <%= discussion_user_name user %>
         <% if user.moderator_here? %>
           <span class="moderator-badge"><%= t(:moderation) %></span>
         <% end %>
@@ -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>

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

@@ -10,12 +10,23 @@
         <div class="container-fluid">
           <div class="row">
             <div class="discussion-new-message-content">
-              <%= f.editor :content, '', { id: 'new-discussion-message', class: 'form-control', placeholder: t(:message) } %>
+              <%= f.editor :content, '', { id: 'discussion-new-message', class: 'form-control', placeholder: t(:message) } %>
             </div>
+            <div class="discussion-message-content d-none" id="discussion-new-message-preview"></div>
           </div>
         </div>
       </div>
     </div>
-    <button class="btn btn-success btn-block discussion-new-message-button"> <%= t :comment %> </button>
+    <div class="discussion-new-message-buttons">
+      <% if user.moderator_here? %>
+        <button class="btn btn-secondary discussion-new-message-preview-button preview" type="button" error-text="<%= t :preview_error %>"
+                onclick="mumuki.Forum.discussionMessagePreview('<%= preview_discussion_message_url %>')"> <%= fa_icon('eye', text: t(:preview)) %> </button>
+        <button class="btn btn-secondary discussion-new-message-preview-button edit d-none" type="button"
+                onclick="mumuki.Forum.hidePreviewAndShowEditor()"> <%= fa_icon('pencil-alt', text: t(:edit_message)) %> </button>
+      <% end %>
+      <%= button_tag type: 'submit', class: 'btn btn-complementary discussion-new-message-button', data: { disable: true } do %>
+        <%= fa_icon('comment', text: t(:comment)) %>
+      <% end %>
+    </div>
   <% end %>
 <% end %>