mumuki-laboratory 9.8.2 → 9.12.0

data/app/helpers/application_helper.rb

@@ -45,7 +45,11 @@ module ApplicationHelper
     }.html_safe
   end
 
-  def notification_preview_for(target)
-    render "notifications/#{target.class.name.underscore}", { target: target }
+  def notification_preview_for(notification)
+    render "notifications/previews/#{notification.subject}", { notification: notification }
+  end
+
+  def current_time_zone_html
+    %Q{(<span class="select-date-timezone">#{Organization.current.time_zone}</span>)}.html_safe
   end
 end

data/app/helpers/discussions_helper.rb

@@ -60,11 +60,18 @@ module DiscussionsHelper
     }.html_safe
   end
 
-  def discussion_messages_icon(discussion)
+  def discussion_messages_count(discussion)
     %Q{
-      <span class="discussion-icon fa-stack fa-xs">
-        <i class="far fa-comment fa-stack-2x"></i>
-        <i class="fas fa-stack-1x">#{discussion.validated_messages_count}</i>
+      <span class="discussion-messages-count">
+        #{fa_icon :comments, type: :regular, text: discussion.messages_count}
+      </span>
+    }.html_safe
+  end
+
+  def discussion_validated_messages_count(discussion)
+    %Q{
+      <span class="discussion-validated-messages-count">
+        #{fa_icon :comment, type: :regular}#{fa_icon :check, text: discussion.validated_messages_count}
       </span>
     }.html_safe
   end

data/app/helpers/exam_registration_helper.rb

@@ -6,8 +6,4 @@ module ExamRegistrationHelper
       { icon: :info_circle, class: :info, t: :exam_registration_explanation_html }
     end
   end
-
-  def current_time_zone_html
-    %Q{(<span class="select-date-timezone">#{Organization.current&.time_zone}</span>)}.html_safe
-  end
 end

data/app/helpers/icons_helper.rb

@@ -50,6 +50,6 @@ module IconsHelper
   end
 
   def icon_for_read(read)
-    tag('i', class: "fa#{read ? 'r' : 's'} fa-envelope")
+    tag.i(class: "fa#{read ? 'r' : 's'} fa-envelope#{read ? '-open' : ''}")
   end
 end

data/app/helpers/menu_bar_helper.rb

@@ -39,8 +39,12 @@ module MenuBarHelper
     li_tag menu_item('sign-out-alt', :sign_out, logout_path(origin: url_for))
   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', class: 'dropdown-item'
+  def menu_item(icon, name, url, css_class = nil, **translation_params)
+    menu_text_item(icon, t(name, translation_params), url, css_class)
+  end
+
+  def menu_text_item(icon, text, url, css_class = nil)
+    link_to fixed_fa_icon(icon, text: text), url, role: 'menuitem', tabindex: '-1', class: "dropdown-item #{css_class}"
   end
 
   def any_menu_bar_links?
@@ -48,6 +52,6 @@ module MenuBarHelper
   end
 
   def menu_link_to_faqs
-    li_tag menu_item('question', :faqs, faqs_path)
+    li_tag menu_item(:info, :faqs_abbreviated, faqs_path)
   end
 end

data/app/helpers/messages_helper.rb

@@ -1,8 +1,4 @@
 module MessagesHelper
-  def messages_url(exercise)
-    exercise.messages_url_for(current_user) if current_user?
-  end
-
   def hidden_pending(assignment)
     assignment.pending_messages? ? '' : 'd-none'
   end
@@ -15,11 +11,11 @@ module MessagesHelper
     'pending-messages-filter' if assignment.pending_messages?
   end
 
-  def read_messages_caption(assignment)
-    assignment.pending_messages? ? :read_messages : :exit
-  end
-
   def sender_class(message)
     message.blank? || message.from_user?(current_user) ? 'self' : 'other'
   end
+
+  def staleness_class(message)
+    'mu-stale' if message.stale?
+  end
 end

data/app/helpers/notifications_helper.rb

@@ -0,0 +1,13 @@
+module NotificationsHelper
+  def background_for_notification(notification)
+    notification.read? ? '' : 'bg-light'
+  end
+
+  def notification_preview_item(icon, name, url, **translation_params)
+    menu_item icon, name, url, 'mu-notification-preview', **translation_params
+  end
+
+  def notification_text_preview_item(icon, text, url)
+    menu_text_item(icon, text, url, 'mu-notification-preview')
+  end
+end

data/app/helpers/profile_helper.rb

@@ -10,4 +10,8 @@ module ProfileHelper
   def save_edit_profile_button(form)
     form.submit t(:save), class: 'btn btn-complementary mu-edit-profile-btn'
   end
+
+  def show_verified_full_name_notice?(user, organization)
+    user.has_verified_full_name? && organization.private?
+  end
 end

data/app/helpers/time_zone_helper.rb

@@ -0,0 +1,5 @@
+module TimeZoneHelper
+  def local_time(time, time_zone = Time.zone.name)
+    "#{l(time.in_time_zone(time_zone), format: :long)} (#{time_zone})"
+  end
+end

data/app/helpers/user_discussions_helper.rb

@@ -0,0 +1,38 @@
+module UserDiscussionsHelper
+  def user_discussions_table_title(discussion, user, last_read)
+    %Q{
+      <tr></tr>
+      <thead>
+        <tr>
+          <td class="#{last_read.nil? ? '' : 'pt-5'}" colspan="4">
+            <strong>#{discussion.read_by?(user) ? t(:discussions_read) : t(:discussions_unread)}</strong>
+          </td>
+        </tr>
+      </thead>
+    }.html_safe
+  end
+
+  def user_discussions_table_header
+    %Q{
+      <tr class="fw-bold">
+        <td></td>
+        <td>#{t(:exercise)}</td>
+        <td>#{t(:discussion_created_by)}</td>
+        <td>#{t(:last_message)}</td>
+      </tr>
+    }.html_safe
+  end
+
+  def user_discussions_table_item(discussion, user)
+    %Q{
+      <tr>
+        <td class="text-center">
+          #{icon_for_read(discussion.read_by?(user))}
+        </td>
+        <td>#{link_to discussion.item.name, item_discussion_path(discussion)}</td>
+        <td>#{discussion_user_name discussion.initiator}</td>
+        <td>#{t(:time_since, time: time_ago_in_words(discussion.last_message_date))}</td>
+      </tr>
+    }.html_safe
+  end
+end

data/app/helpers/user_menu_helper.rb

@@ -31,6 +31,10 @@ module UserMenuHelper
     user_menu_item t(:exams), exam_authorizations_user_path, 'exam_authorizations'
   end
 
+  def notifications_user_menu_link
+    user_menu_item t(:notifications), notifications_user_path, 'notifications'
+  end
+
   private
 
   def user_menu_item(label, path, active_on)

data/app/mailers/user_mailer.rb

@@ -1,6 +1,8 @@
 class UserMailer < ApplicationMailer
   include WithCertificateRender
 
+  helper :time_zone
+
   def welcome_email(user, organization)
     with_locale(user, organization) do
       organization_name = organization.display_name || t(:your_new_organization)
@@ -23,7 +25,15 @@ class UserMailer < ApplicationMailer
   def certificate(certificate)
     with_locale certificate.user, certificate.organization do
       attachments[certificate.filename] = pdf_for(certificate)
-      mail to: certificate.user.email, subject: certificate.description
+      mail to: certificate.user.email, subject: t(:certificate_available)
+    end
+  end
+
+  def notification(notification)
+    @notification = notification
+
+    with_locale(notification.user, notification.organization) do
+      build_email notification.custom_title || t("mailer.title.#{notification.subject}"), 'notification'
     end
   end
 

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

@@ -28,6 +28,6 @@
         </div>
       </div>
     </div>
-    <%= f.submit t(:save), class: 'btn btn-complementary w-100 discussion-new-message-button' %>
+    <%= f.submit t(:publish_discussion), class: 'btn btn-complementary w-100 discussion-new-message-button' %>
   <% end %>
 <% end %>

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

@@ -1,2 +1,2 @@
-&copy; 2015-<%= DateTime.now.year %>
+&copy; 2015-<%= Time.current.year %>
 <a href="http://mumuki.org/" class="mu-org-link"><span class="da da-mumuki-circle"></span> Mumuki</a>

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

@@ -40,43 +40,7 @@
       </span>
     </div>
   <% else %>
-    <div class="discussions">
-      <% @filtered_discussions.each do |discussion| %>
-        <%= link_to exercise_discussion_path(discussion.exercise.id, discussion) do %>
-          <div class="discussion">
-            <div class="discussion-row">
-              <%= discussion_messages_icon(discussion) %>
-              <% unless @debatable.respond_to? :language %>
-                <div class="discussion-language-icon">
-                  <%= language_icon(discussion.exercise.language) %>
-                </div>
-              <% end %>
-              <div>
-                <div class="discussion-title">
-                  <span class="discussion-status-icon">
-                    <%= discussion_status_fa_icon(discussion) %>
-                  </span>
-                  <span class="d-none d-lg-inline"><%= discussion.exercise.guide.name %> -</span>
-                  <span><%= discussion.exercise.name %></span>
-                  <% if discussion.current_responsible_visible_for?(current_user) %>
-                    <div class="float-end discussion-moderator-access" >
-                      <%= profile_picture_for(discussion.responsible_moderator_by, height: 32) %>
-                      <span class="moderator-initials">
-                        <%= discussion.responsible_moderator_by.name_initials %>
-                      </span>
-                    </div>
-                  <% end %>
-
-                </div>
-                <span class="discussion-description">
-                  <%= discussion.description %>
-                </span>
-              </div>
-            </div>
-          </div>
-        <% end %>
-      <% end %>
-    </div>
+    <%= render partial: 'layouts/discussions_list' %>
 
     <div class="discussion-pagination">
       <%= paginate @filtered_discussions, nav_class: 'pagination' %>

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

@@ -0,0 +1,38 @@
+<div class="discussions">
+  <% @filtered_discussions.each do |discussion| %>
+    <%= link_to exercise_discussion_path(discussion.exercise.id, discussion), class: 'discussion-link' do %>
+      <div class="discussion">
+        <div class="discussion-row">
+          <div class="d-flex justify-content-between">
+            <div class="discussion-title">
+              <div class="discussion-language-icon">
+                <%= language_icon(discussion.exercise.language) %>
+              </div>
+              <span class="d-none d-lg-inline"><%= discussion.exercise.guide.name %> -</span>
+              <span><%= discussion.exercise.name %></span>
+              <% if discussion.current_responsible_visible_for?(current_user) %>
+                <span class="badge ms-1 bg-dark">
+                  <%= responsible_moderator_text_for(discussion, current_user)%>
+                </span>
+              <% end %>
+            </div>
+            <div class="discussion-title-icons">
+              <%= discussion_messages_count(discussion) %>
+              <%= discussion_validated_messages_count(discussion) %>
+            </div>
+          </div>
+          <span class="discussion-description">
+            <%= discussion.description %>
+          </span>
+          <span class="discussion-initiator">
+            <strong><%= discussion_user_name discussion.initiator %></strong>
+            <%= t(:asked_time_since, time: time_ago_in_words(discussion.created_at)) %>
+            <span class="discussion-status-icon">
+              <%= discussion_status_fa_icon(discussion) %>
+            </span>
+          </span>
+        </div>
+      </div>
+    <% end %>
+  <% end %>
+</div>

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

@@ -1,14 +1,8 @@
 <div class="mu-view-messages">
   <div class="mu-messages">
     <ol class="mu-chat">
-      <li>
-        <a href="javascript:{}"
-           onclick="mumuki.Chat.submitMessagesForm('<%= messages_url(@exercise) %>', '<%= read_messages_path(@exercise) %>', '<%= messages_errors_path %>')">
-          <%= t :more_messages %>
-        </a>
-      </li>
       <% messages.each do |message| %>
-          <li class="<%= sender_class(message) %>">
+          <li class="<%= sender_class(message) %> <%= staleness_class(message) %>">
             <div class="message">
               <p> <%= message.content_html %></p>
               <div class="sender"><%= message.sender unless message.sender == current_user_uid %></div>

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

@@ -4,6 +4,7 @@
       <%= user_menu_header %>
       <div class="mu-user-menu-items mu-hidden-sm-screen">
         <%= profile_user_menu_link %>
+        <%= notifications_user_menu_link %>
         <%= user_menu_divider %>
         <%= messages_user_menu_link %>
         <%= discussions_user_menu_link %>

data/app/views/layouts/exercise_inputs/forms/_interactive_form.html.erb

@@ -15,7 +15,7 @@
     <% if @assignment.pending_messages? %>
         <span class="pending-messages-text"> <%= t :pending_messages_explanation %>
           <a href="javascript:{}"
-             onclick="mumuki.Chat.submitMessagesForm('<%= messages_url(exercise) %>', '<%= read_messages_path(exercise) %>')"
+             onclick="mumuki.Chat.readMessages('<%= read_messages_path(exercise) %>')"
              class="<%= hidden_pending(@assignment) %>"
              data-waiting="<%= t(:sending_solution) %>">
             <%= t :get_messages %>

data/app/views/layouts/exercise_inputs/forms/_problem_form.html.erb

@@ -23,7 +23,7 @@
     <% if @assignment.pending_messages? %>
         <span class="pending-messages-text"> <%= t :pending_messages_explanation %>
           <a href="javascript:{}"
-             onclick="mumuki.Chat.submitMessagesForm('<%= messages_url(exercise) %>', '<%= read_messages_path(exercise) %>')"
+             onclick="mumuki.Chat.readMessages('<%= read_messages_path(exercise) %>')"
              class="<%= hidden_pending(@assignment) %>"
              data-waiting="<%= t(:sending_solution) %>">
             <%= t :get_messages %>

data/app/views/layouts/exercise_inputs/read_only_editors/_code.html.erb

@@ -1,3 +1,3 @@
 <div>
-  <%= read_only_editor content, exercise.language.name %>
+  <%= read_only_editor content, exercise.language.highlight_mode %>
 </div>

data/app/views/layouts/exercise_inputs/read_only_editors/_multiple_files.html.erb

@@ -4,10 +4,10 @@
 
   <div class="editor-files">
     <span class="files-tabs">
-      <ul class="nav nav-tabs">
+      <ul class="nav nav-tabs" role="tablist">
         <% files.each_with_index do |file, index| %>
-          <li role="presentation" class="file-tab <%= 'active' if index == 0 %>" data-bs-target="#editor-file-<%= index %>" tabindex='0' data-bs-toggle='tab'>
-            <a class="file-name" href="#"><%= file.name %></a>
+          <li role="presentation" class="nav-item file-tab">
+            <a class="file-name nav-link <%= 'active' if index == 0 %>" href="#" data-bs-target="#editor-file-<%= index %>" tabindex="0" data-bs-toggle="tab"><%= file.name %></a>
           </li>
         <% end %>
       </ul>
@@ -17,7 +17,7 @@
 
     <div class="tab-content">
       <% files.each_with_index do |file, index| %>
-        <div role="tabpanel" class="file-editor tab-pane mu-input-panel <%= 'fade in active' if index == 0 %>" id="editor-file-<%= index %>">
+        <div role="tabpanel" class="file-editor tab-pane mu-input-panel fade <%= 'show active' if index == 0 %>" id="editor-file-<%= index %>">
           <div class=<%="content[#{file.name}]"%>>
             <%= read_only_editor file.content, file.highlight_mode %>
           </div>

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

@@ -244,7 +244,7 @@
     @section Body Text
     */
     .bodyContainer .muMailTextContent,.bodyContainer .muMailTextContent p{
-      /*@editable*/color:#808080;
+      /*@editable*/color:#616060;
       /*@editable*/font-family:Helvetica;
       /*@editable*/font-size:16px;
       /*@editable*/line-height:150%;
@@ -309,6 +309,12 @@
       /*@editable*/font-weight:normal;
       /*@editable*/text-decoration:underline;
     }
+
+    .mu-stealth-link {
+      text-decoration: none !important;
+      color: unset !important;
+    }
+
     @media only screen and (min-width:768px){
       .templateContainer{
         width:600px !important;

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

@@ -0,0 +1 @@
+<%= notification.custom_content_plain_text %>

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

@@ -4,9 +4,9 @@
     <span class="badge badge-notifications"><%= notifications_count %></span>
   </div>
   <ul id="notificationsPanel" class="dropdown-menu dropdown-menu-end" aria-labelledby="notificationsDropdown">
-    <% notifications.each do |it| %>
+    <% user_notifications.each do |it| %>
       <li>
-        <%= notification_preview_for it.target %>
+        <%= notification_preview_for it %>
       </li>
     <% end %>
   </ul>

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

@@ -0,0 +1,2 @@
+<% target = notification.target %>
+<%= link_to t(:exam_authorization_request_updated, description: target.exam_registration.description), notification.organization.url_for('/user/exam_authorizations'), class: 'mu-stealth-link' %>

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

@@ -1 +1,2 @@
-<%= menu_item :book_open, :exam_registration_open, url_for(target), { description: target.description } %>
+<% target = notification.target %>
+<%= link_to t(:exam_registration_open, description: target.description), exam_registration_url(notification.organization, target), class: 'mu-stealth-link' %>

data/app/views/notifications/previews/_custom.html.erb

@@ -0,0 +1 @@
+<%= notification_text_preview_item :envelope, notification.custom_title, notification.organization.url_for('/user/notifications') %>