mumuki-laboratory 9.0.6 → 9.1.0

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

@@ -1,4 +1,4 @@
-<div class="modal new-message-modal" tabindex="-1" role="dialog" aria-hidden="true" style="display:block">
+<div class="modal new-message-modal d-block" tabindex="-1" role="dialog" aria-hidden="true">
   <div class="modal-dialog">
     <%= form_for(Message.new, html: {role: 'form'}) do |f| %>
         <div class="modal-content">
@@ -19,16 +19,16 @@
               </small>
             </div>
           </div>
-          <div class="modal-body hidden">
+          <div class="modal-body d-none">
             <div class="container-fluid">
               <div class="row">
                 <%= f.text_area :content, class: 'form-control mu-message-textarea', placeholder: t(:new_message_placeholder) %>
-                <%= f.text_field :exercise_id, value: exercise.id, class: 'hidden' %>
+                <%= f.text_field :exercise_id, value: exercise.id, class: 'd-none' %>
               </div>
             </div>
           </div>
-          <div class="modal-footer hidden">
-            <button class="btn btn-success btn-block"> <%= t :send %> </button>
+          <div class="modal-footer d-none">
+            <button class="btn btn-complementary w-100"> <%= t :send %> </button>
           </div>
         </div>
     <% end %>

data/app/views/notifications/_dropdown.html.erb

@@ -1,9 +1,9 @@
-<div class="dropdown mu-navbar-element notifications-box <%= 'notifications-box-empty' unless has_notifications? %>">
-  <div id="notificationsDropdown" class="profile-dropdown" data-toggle="dropdown" aria-label="<%= t(:notifications) %>" role="menu" tabindex="0">
+<div class="dropdown mu-navbar-element notifications-box <%= 'd-none' unless has_notifications? %>">
+  <div id="notificationsDropdown" class="profile-dropdown" data-bs-toggle="dropdown" aria-label="<%= t(:notifications) %>" role="menu" tabindex="0">
     <i class="fas fa-bell fa-fw fa-2x mu-navbar-icon"></i>
     <span class="badge badge-notifications"><%= notifications_count %></span>
   </div>
-  <ul id="notificationsPanel" class="dropdown-menu dropdown-menu-right" aria-labelledby="notificationsDropdown">
+  <ul id="notificationsPanel" class="dropdown-menu dropdown-menu-end" aria-labelledby="notificationsDropdown">
     <% notifications.each do |it| %>
       <li>
         <%= notification_preview_for it.target %>

data/app/views/users/_activity_indicator.html.erb

@@ -1,17 +1,17 @@
-<div class="row">
-  <div class="col-md-12">
-    <h3><%= title %></h3>
+<div class="mb-3">
+  <div class="row">
+    <div class="col-md-12">
+      <h3><%= title %></h3>
+    </div>
   </div>
-</div>
-<div class="row">
-  <% stats.each do |s| %>
-    <div class="col-md-6">
-      <div class="jumbotron mu-user-activity-indicator">
-        <h1>
-          <%= s[:value] %>
-          <p><%= s[:name].downcase %></p>
-        </h1>
+  <div class="row">
+    <% stats.each do |s| %>
+      <div class="col-md-6">
+        <div class="mu-user-activity-indicator bg-light">
+          <h1 class="display-1"><%= s[:value] %></h1>
+          <h4><%= s[:name].downcase %></h4>
+        </div>
       </div>
-    </div>
-  <% end %>
+    <% end %>
+  </div>
 </div>

data/app/views/users/_edit_user_form.html.erb

@@ -1,22 +1,22 @@
-<%= form_for :user, url: user_path, :html => { id: 'mu-user-form' }, method: :put do |f| %>
+<%= form_for :user, url: user_path, :html => { id: 'mu-user-form', class: 'mu-form' }, method: :put do |f| %>
   <div class="mu-user-header">
     <h1><%= t(:edit_profile) %></h1>
-    <div class="mu-profile-actions hidden-xs">
+    <div class="mu-profile-actions d-none d-md-block">
       <%= cancel_edit_profile_button %>
       <%= save_edit_profile_button f %>
     </div>
   </div>
   <div class="row mu-tab-body">
-    <div class="col-md-4 text-center">
+    <div class="col-md-6 col-lg-4 mu-user-avatar-container">
       <%= profile_picture_for(@user, id: 'mu-user-avatar', class: 'mu-user-avatar') %>
-      <i class="fas fa-pencil-alt fa-2x pointer mu-edit-avatar" id="mu-edit-avatar-icon" tabindex="0"></i>
+      <button class="fas fa-pencil-alt fa-2x btn mu-edit-avatar" type="button" data-bs-toggle="modal" data-bs-target="#mu-avatar-picker" tabindex="0"></button>
     </div>
-    <div class="col-md-8">
+    <div class="col-md-6 col-lg-8">
       <%= render partial: 'profile_fields', locals: {form: f} %>
       <%= render partial: 'layouts/terms_acceptance_disclaimer', locals: {user: @user} %>
     </div>
   </div>
-  <div class="mu-profile-actions mobile visible-xs">
+  <div class="mu-profile-actions mobile d-block d-md-none">
     <%= cancel_edit_profile_button %>
     <%= save_edit_profile_button f %>
   </div>

data/app/views/users/_profile_fields.html.erb

@@ -1,20 +1,20 @@
-<fieldset class="form-group">
+<fieldset>
   <div><%= form.label(t :first_name) %></div>
   <div><%= form.text_field :first_name, required: true, class: 'form-control' %></div>
 </fieldset>
-<fieldset class="form-group">
+<fieldset>
   <div><%= form.label(t :last_name) %></div>
   <div><%= form.text_field :last_name, required: true, class: 'form-control' %></div>
 </fieldset>
-<fieldset class="form-group">
+<fieldset>
   <div><%= form.label(t :gender) %></div>
-  <div><%= form.select :gender, options_for_select(User.genders.map { |gender, _| [t(gender), gender] }, @user.gender), {}, required: true, class: 'form-control' %></div>
+  <div><%= form.select :gender, options_for_select(User.genders.map { |gender, _| [t(gender), gender] }, @user.gender), {}, required: true, class: 'form-control form-select' %></div>
 </fieldset>
-<fieldset class="form-group">
+<fieldset>
   <div><%= form.label(t :birthdate) %></div>
   <div><%= form.date_field :birthdate, min: Date.new(1900), max: 3.years.ago.end_of_year, required: true, class: 'form-control' %></div>
 </fieldset>
-<fieldset class="form-group">
+<fieldset>
   <div><%= form.label(t :email) %></div>
   <div><%= form.text_field :email, readonly: true, class: 'form-control' %></div>
 </fieldset>

data/app/views/users/_user_form.html.erb

@@ -1,6 +1,6 @@
 <div class="mu-user-header">
   <h1><%= t(:my_profile) %></h1>
-  <div class="mu-profile-actions hidden-xs">
+  <div class="mu-profile-actions d-none d-md-block">
     <%= edit_profile_button %>
   </div>
 </div>
@@ -35,6 +35,6 @@
     </div>
   </div>
 </div>
-<div class="mu-profile-actions mobile visible-xs">
+<div class="mu-profile-actions mobile d-block d-md-none">
   <%= edit_profile_button %>
 </div>

data/app/views/users/activity.html.erb

@@ -2,36 +2,36 @@
   <%= breadcrumbs_for_my_account %>
 <% end %>
 
-<%= render partial: 'layouts/user_menu' %>
+<div class="row">
+  <%= render partial: 'layouts/user_menu' %>
 
-<div class="col-md-9 mu-tab-body">
-  <div class="mu-user-header">
-    <h1><%= t(:activity) %></h1>
-  </div>
-  <div class="col-md-8">
-    <%= render partial: 'activity_indicator',
-               locals: {
-                 title: t(:exercises),
-                 stats: exercises_activity_stats
-               } %>
-
-    <%= render partial: 'activity_indicator',
-               locals: {
-                 title: t(:forum),
-                 stats: messages_activity_stats
-               } %>
-  </div>
+  <div class="col-md-9">
+    <div class="mu-user-header">
+      <h1><%= t(:activity) %></h1>
+    </div>
+    <div class="row">
+      <div class="col-lg-8 mu-tab-body">
+        <%= render partial: 'activity_indicator',
+                   locals: {
+                     title: t(:exercises),
+                     stats: exercises_activity_stats
+                   } %>
 
-  <div class="col-md-4">
-    <ul class="nav nav-pills nav-stacked mu-user-activity-selector">
-      <li <%= mark_period_if_active nil %>>
-        <%= link_to t(:total), activity_user_path %>
-      </li>
-      <% activity_selector_week_range_for.each do |(week_start, week_end)| %>
-        <li <%= mark_period_if_active week_start %>>
-          <%= link_to t(:week_of, date: l(week_start)), activity_user_path(date_from: week_start, date_to: week_end) %>
-        </li>
-      <% end %>
-    </ul>
+        <%= render partial: 'activity_indicator',
+                   locals: {
+                     title: t(:forum),
+                     stats: messages_activity_stats
+                   } %>
+      </div>
+      <div class="col-lg-4 mu-tab-body">
+        <div class="nav nav-pills flex-column">
+          <%= link_to t(:total), activity_user_path, class: "mu-user-activity-week-selector #{mark_period_if_active(nil)}" %>
+          <% activity_selector_week_range_for.each do |(week_start, week_end)| %>
+            <%= link_to t(:week_of, date: l(week_start)), activity_user_path(date_from: week_start, date_to: week_end),
+                        class: "mu-user-activity-week-selector #{mark_period_if_active(week_start)}" %>
+          <% end %>
+        </div>
+      </div>
+    </div>
   </div>
 </div>

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

@@ -2,31 +2,33 @@
   <%= breadcrumbs_for_my_account %>
 <% end %>
 
-<%= render partial: 'layouts/user_menu' %>
+<div class="row">
+  <%= render partial: 'layouts/user_menu' %>
 
-<div class="col-md-9 mu-tab-body">
-  <div class="mu-user-header">
-    <h1><%= t(:certificates) %></h1>
-  </div>
-  <% if @certificates.empty? %>
-    <div class="mu-tab-body">
-      <%= t :certificates_will_be_here %>
+  <div class="col-md-9 mu-tab-body">
+    <div class="mu-user-header">
+      <h1><%= t(:certificates) %></h1>
     </div>
-  <% else %>
-    <div class="col-md-12">
-      <div class="mu-list-group">
-        <% @certificates.each do |certificate| %>
-            <span class="mu-list-group-item">
-              <a href="<%= download_certificate_path certificate.code %>" target="_blank"><i class="fas fa-fw fa-download"></i></a>
-              <span class="mu-divider-vertical"></span>
-              <a href="<%= linkedin_post_url certificate %>" target="_blank"><i class="fab fa-fw fa-linkedin"></i></a>
-              <span class="mu-divider-vertical"></span>
-              <a href="<%= verify_certificate_path certificate.code %>" target="_blank">
-                <span class="mu-text-capitalize"><%= certificate.title %> - <%= certificate.description %></span>
-              </a>
-            </span>
-        <% end %>
+    <% if @certificates.empty? %>
+      <div class="mu-tab-body">
+        <%= t :certificates_will_be_here %>
       </div>
-    </div>
-  <% end %>
+    <% else %>
+      <div class="col-md-12">
+        <div class="mu-list-group">
+          <% @certificates.each do |certificate| %>
+              <span class="mu-list-group-item">
+                <a href="<%= download_certificate_path certificate.code %>" target="_blank"><i class="fas fa-fw fa-download"></i></a>
+                <span class="mu-divider-vertical"></span>
+                <a href="<%= linkedin_post_url certificate %>" target="_blank"><i class="fab fa-fw fa-linkedin"></i></a>
+                <span class="mu-divider-vertical"></span>
+                <a href="<%= verify_certificate_path certificate.code %>" target="_blank">
+                  <span class="mu-text-capitalize"><%= certificate.title %> - <%= certificate.description %></span>
+                </a>
+              </span>
+          <% end %>
+        </div>
+      </div>
+    <% end %>
+  </div>
 </div>

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

@@ -2,27 +2,29 @@
   <%= breadcrumbs_for_my_account %>
 <% end %>
 
-<%= render partial: 'layouts/user_menu' %>
+<div class="row">
+  <%= render partial: 'layouts/user_menu' %>
 
-<div class="col-md-9 mu-tab-body">
-  <div class="mu-user-header">
-    <h1><%= t(:discussions) %></h1>
-  </div>
-  <% if @watched_discussions.empty? %>
-    <div class="mu-tab-body">
-      <%= t :discussions_will_be_here %>
+  <div class="col-md-9 mu-tab-body">
+    <div class="mu-user-header">
+      <h1><%= t(:discussions) %></h1>
     </div>
-  <% else %>
-    <table class="table table-striped">
-      <% @watched_discussions.each do |discussion| %>
-        <tr>
-          <td>
-            <%= icon_for_read(discussion.read_by?(@user)) %>
-          </td>
-          <td><%= link_to discussion.item.name, item_discussion_path(discussion) %></td>
-          <td><%= time_ago_in_words discussion.last_message_date %></td>
-        </tr>
-      <% end %>
-    </table>
-  <% end %>
+    <% if @watched_discussions.empty? %>
+      <div class="mu-tab-body">
+        <%= t :discussions_will_be_here %>
+      </div>
+    <% else %>
+      <table class="table table-striped">
+        <% @watched_discussions.each do |discussion| %>
+          <tr>
+            <td>
+              <%= icon_for_read(discussion.read_by?(@user)) %>
+            </td>
+            <td><%= link_to discussion.item.name, item_discussion_path(discussion) %></td>
+            <td><%= time_ago_in_words discussion.last_message_date %></td>
+          </tr>
+        <% end %>
+      </table>
+    <% end %>
+  </div>
 </div>

data/app/views/users/messages.html.erb

@@ -2,26 +2,28 @@
   <%= breadcrumbs_for_my_account %>
 <% end %>
 
-<%= render partial: 'layouts/user_menu' %>
+<div class="row">
+  <%= render partial: 'layouts/user_menu' %>
 
-<div class="col-md-9 mu-tab-body">
-  <div class="mu-user-header">
-    <h1><%= t(:messages) %></h1>
-  </div>
-  <% if @messages.empty? %>
-    <div class="mu-tab-body">
-      <%= t :no_messages %>
+  <div class="col-md-9 mu-tab-body">
+    <div class="mu-user-header">
+      <h1><%= t(:messages) %></h1>
     </div>
-  <% else %>
-    <table class="table table-striped">
-      <% @messages.each do |message| %>
-        <tr>
-          <td><%= icon_for_read(message.read?) %></td>
-          <td><%= link_to message.exercise.name, exercise_path(message.exercise.id) %></td>
-          <td><%= mail_to message.sender %></td>
-          <td><%= time_ago_in_words message.created_at %></td>
-        </tr>
-      <% end %>
-    </table>
-  <% end %>
+    <% if @messages.empty? %>
+      <div class="mu-tab-body">
+        <%= t :no_messages %>
+      </div>
+    <% else %>
+      <table class="table table-striped">
+        <% @messages.each do |message| %>
+          <tr>
+            <td><%= icon_for_read(message.read?) %></td>
+            <td><%= link_to message.exercise.name, exercise_path(message.exercise.id) %></td>
+            <td><%= mail_to message.sender %></td>
+            <td><%= time_ago_in_words message.created_at %></td>
+          </tr>
+        <% end %>
+      </table>
+    <% end %>
+  </div>
 </div>

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

@@ -2,8 +2,10 @@
   <%= breadcrumbs_for_my_account %>
 <% end %>
 
-<%= render partial: 'layouts/user_menu' %>
+<div class="row">
+  <%= render partial: 'layouts/user_menu' %>
 
-<div class="col-md-9 mu-tab-body">
-  <%= render partial: 'user_form' %>
+  <div class="col-md-9 mu-tab-body">
+    <%= render partial: 'user_form' %>
+  </div>
 </div>

data/app/views/users/terms.html.erb

@@ -20,10 +20,12 @@
   <div class="terms-acceptance">
     <%= form_for :user, url: terms_user_path, method: :post  do |f| %>
       <span class="terms-acceptance-checkbox">
-        <%= f.check_box :terms_of_service, required: true, onInvalid: "this.setCustomValidity('#{t(:terms_and_conditions_must_be_accepted)}')", onChange: "this.setCustomValidity(validity.valueMissing ? '#{t(:terms_and_conditions_must_be_accepted)}' : '')" %>
+        <%= f.check_box :terms_of_service, required: true, class: 'form-check-input',
+                        onInvalid: "this.setCustomValidity('#{t(:terms_and_conditions_must_be_accepted)}')",
+                        onChange: "this.setCustomValidity(validity.valueMissing ? '#{t(:terms_and_conditions_must_be_accepted)}' : '')" %>
         <%= t(:accept_terms) %>
       </span>
-      <%= f.submit t(:accept), class: 'btn btn-success terms-acceptance-btn' %>
+      <%= f.submit t(:accept), class: 'btn btn-complementary terms-acceptance-btn' %>
     <% end %>
   </div>
 <% end %>

data/lib/mumuki/laboratory.rb

@@ -14,7 +14,7 @@ require 'mumukit/nuntius'
 require 'mumukit/platform'
 
 require 'kaminari'
-require 'bootstrap-kaminari-views'
+require 'bootstrap5-kaminari-views'
 
 Mumukit::Nuntius.configure do |config|
   config.app_name = 'laboratory'

data/lib/mumuki/laboratory/locales/en.yml

@@ -66,6 +66,18 @@ en:
   create_submission: Submit
   created_at: Created at
   date: Date
+  deleted_by: Deleted by %{deleter}
+  deleted_message_warning: If you repeateadly violate these or other rules, you may be prohibited from accessing the forum or you may suffer more severe consequences, such as being expulsed from the course.
+  deletion_motive:
+    inappropriate_content:
+      present: Includes inappropriate content
+      past: Included inappropriate content
+    shares_solution:
+      present: Shares the correct solution
+      past: Shared the correct solution
+    discloses_personal_information:
+      present: Discloses personal information
+      past: Disclosed personal information
   description: Description
   destroy: Destroy
   destroy_message: delete the message
@@ -176,6 +188,7 @@ en:
     one: 1 message
     other: '%{count} messages'
   message: Message
+  message_deleted: This message was deleted because it %{motive}, which violates the %{forum_terms}.
   messages: Messages
   messages_error: Previous messages are unavailable. Please try again later.
   moderation: Mentoring
@@ -254,6 +267,7 @@ en:
   select_file: Select file
   sending_solution: Sending solution
   show: Show
+  show_message: Show message
   sign_in: Sign in
   sign_in_action: sign in
   sign_out: Sign Out
@@ -319,7 +333,7 @@ en:
   user_data_updated: Your data was updated successfully
   username: Username
   view_details: View details
-  want_permissions: The next user requires permissions
+  want_permissions: The following user requires permissions for the organization
   we_miss_you: We miss you!
   week_of: Week of %{date}
   welcome: Welcome to %{name}!