mumuki-laboratory 7.6.2 → 7.8.0

data/app/helpers/discussions_helper.rb

@@ -23,31 +23,32 @@ module DiscussionsHelper
     fixed_fa_icon 'comment', text: text
   end
 
-  def discussions_link(item, path, html_options=nil, organization=Organization.current)
-    link_to item, path, html_options if organization.forum_enabled?
+  def discussions_link(item, path, html_options = nil)
+    return unless current_user&.can_discuss_here?
+    link_to item, path, html_options
   end
 
-  def item_discussion_path(discussion, params={})
+  def item_discussion_path(discussion, params = {})
     polymorphic_path([discussion.item, discussion], params)
   end
 
-  def item_discussions_path(item, params={})
+  def item_discussions_path(item, params = {})
     polymorphic_path([item, :discussions], params)
   end
 
   def solve_discussion_params_for(user)
     if user&.moderator_here?
-      { status: :pending_review, sort: :created_at_asc }
+      {status: :pending_review, sort: :responses_count_asc, requires_moderator_response: true}
     else
-      { status: :opened, sort: :created_at_asc }
+      {status: :opened, sort: :responses_count_desc}
     end
   end
 
   def default_discussions_params
-    { status: :solved, sort: :upvotes_count_desc }
+    {status: :solved, sort: :upvotes_count_desc}
   end
 
-  def user_avatar(user, image_class='')
+  def user_avatar(user, image_class = '')
     image_tag user.profile_picture, height: 40, class: "img-circle #{image_class}"
   end
 
@@ -67,7 +68,7 @@ module DiscussionsHelper
     %Q{
       <span class="discussion-icon fa-stack fa-xs">
         <i class="fa fa-comment-o fa-stack-2x"></i>
-        <i class="fa fa-stack-1x">#{discussion.messages.size}</i>
+        <i class="fa fa-stack-1x">#{discussion.validated_messages_count}</i>
       </span>
     }.html_safe
   end
@@ -91,22 +92,16 @@ module DiscussionsHelper
   end
 
   def new_discussion_link(teaser_text, link_text)
-    return '' unless Organization.current.can_create_discussions?(current_user)
-
     %Q{
       <h4>
         <span>#{t(teaser_text)}</span>
-        <a>
-          <span class="discussion-create">
-            #{t(link_text)}
-          </span>
-        </a>
+        #{link_to t(link_text), new_exercise_discussion_path(@debatable, anchor: 'new-discussion-description-container') }
       </h4>
     }.html_safe
   end
 
   def discussion_count_for_status(status, discussions)
-    discussions.scoped_query_by(discussion_filter_params, :status).by_status(status).count
+    discussions.scoped_query_by(discussion_filter_params, excluded_params: [:status], excluded_methods: [:page]).by_status(status).count
   end
 
   def discussions_reset_query_link
@@ -117,8 +112,10 @@ module DiscussionsHelper
     Mumuki::Domain::Status::Discussion::STATUSES
   end
 
+  #TODO: this one uses a long method chain in order to take advantage of eager load
+  # Delegate it once again when polymorphic association is removed
   def discussions_languages(discussions)
-    discussions.map { |it| it.language.name }.uniq
+    @languages ||= discussions.map { |it| it.exercise.language.name }.uniq
   end
 
   def discussion_status_filter_link(status, discussions)
@@ -132,14 +129,14 @@ module DiscussionsHelper
 
   def discussion_status_filter(status, discussions_count)
     %Q{
-      #{discussion_status_fa_icon(status)}
+    #{discussion_status_fa_icon(status)}
       <span>
         #{t("#{status}_count", count: discussions_count)}
       </span>
     }.html_safe
   end
 
-  def discussion_dropdown_filter(label, filters, &block)
+  def discussion_dropdown_filter(label, filters, can_select_all = false, &block)
     if filters.present?
       %Q{
         <div class="dropdown discussions-toolbar-filter">
@@ -147,6 +144,7 @@ module DiscussionsHelper
             #{t label} #{fa_icon :'caret-down', class: 'fa-xs'}
           </a>
           <ul class="dropdown-menu" aria-labelledby="dropdown-#{label}">
+            #{discussion_filter_unselect_item(label, can_select_all)}
             #{discussion_filter_list(label, filters, &block)}
           </ul>
         </div>
@@ -159,7 +157,15 @@ module DiscussionsHelper
   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)}")
+    content_tag(:li, discussion_filter_link(label, filter, &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)),
+                  class: ('selected' unless discussion_filter_params.include?(label)))
+    end
   end
 
   def discussion_filter_selected?(label, filter)
@@ -167,10 +173,18 @@ module DiscussionsHelper
   end
 
   def discussion_filter_link(label, filter, &block)
-    link_to capture(filter, &block), discussion_filter_params.merge(Hash[label, filter])
+    link_to capture(filter, &block), discussion_filter_params_without_page.merge(Hash[label, filter])
   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.messages.size)}"
+  end
+
+  def discussion_filter_params_without_page
+    discussion_filter_params.except(:page)
+  end
+
+  def should_show_approved_for?(user, message)
+    !user&.moderator_here? && message.approved? && !message.from_moderator?
   end
 end

data/app/helpers/exercise_input_helper.rb

@@ -75,7 +75,7 @@ module ExerciseInputHelper
 
   def render_custom_editor(exercise, read_only=false)
     custom_editor_tag = "mu-#{exercise.language}-custom-editor"
-    "<#{custom_editor_tag} class='#{custom_editor_tag}' #{custom_editor_read_only if read_only}> </#{custom_editor_tag}>".html_safe
+    "<#{custom_editor_tag} id='#{custom_editor_tag}' class='#{custom_editor_tag}' #{custom_editor_read_only if read_only}> </#{custom_editor_tag}>".html_safe
   end
 
   def custom_editor_read_only

data/app/helpers/{locale_helper.rb → globals_helper.rb}

@@ -1,10 +1,14 @@
-module LocaleHelper
-  def locale_tags
+module GlobalsHelper
+  def globals_tags
     %Q{
       <script type="text/javascript">
         window.mumukiLocale = #{raw Organization.current.locale_json};
         mumuki.locale = '#{Organization.current.locale}';
         moment.locale('#{Organization.current.locale}');
+
+        mumuki.incognitoUser = #{current_incognito_user?};
+
+        mumuki.version = '#{Mumuki::Laboratory::VERSION}';
       </script>
     }.html_safe
   end

data/app/helpers/icons_helper.rb

@@ -3,7 +3,7 @@ module IconsHelper
     fa_icon *icon_for(status_like.to_submission_status)
   end
 
-  def fixed_fa_icon(name, options={})
+  def fixed_fa_icon(name, options = {})
     fa_icon name, options.merge(class: 'fa-fw fixed-icon')
   end
 
@@ -47,12 +47,12 @@ module IconsHelper
     iconizable.iconize[:type].to_s
   end
 
-  def label_for_contextualization(contextualization)
+  def label_for_contextualization(contextualization, **options)
     iconized = contextualization.iconize
     %Q{
       <span class="text-#{iconized[:class]} status-label">
         #{fa_icon "#{iconized[:type]}"}
-        <span>#{t contextualization.visible_status}</span>
+        <span class="#{options[:class]}">#{t contextualization.visible_status}</span>
       </span>
     }.html_safe
   end

data/app/mailers/user_mailer.rb

@@ -1,24 +1,37 @@
 class UserMailer < ApplicationMailer
+  def welcome_email(user, organization)
+    with_locale(user, organization) do
+      organization_name = organization.display_name || t(:your_new_organization)
+      build_email t(:welcome, name: organization_name), { inline: organization.welcome_email_template }
+    end
+  end
 
   def we_miss_you_reminder(user, cycles)
-    send_reminder! user, :we_miss_you, "#{cycles.ordinalize}_reminder"
+    with_locale(user) do
+      build_email t(:we_miss_you), "#{cycles.ordinalize}_reminder"
+    end
   end
 
   def no_submissions_reminder(user)
-    send_reminder! user, :start_using_mumuki, "no_submissions_reminder"
+    with_locale(user) do
+      build_email t(:start_using_mumuki), 'no_submissions_reminder'
+    end
   end
 
-  private
-
-  def send_reminder!(user, subject, template_name)
+  def with_locale(user, organization = nil, &block)
     @user = user
     @unsubscribe_code = User.unsubscription_verifier.generate(user.id)
-    @organization = user.last_organization
+    @organization = organization || user.last_organization
 
-    I18n.with_locale(@organization.locale) do
-      mail to: user.email,
-           subject: t(subject),
-           template_name: template_name
-    end
+    I18n.with_locale(@organization.locale, &block)
+  end
+
+  private
+
+  def build_email(subject, template)
+    mail to: @user.email,
+         subject: subject,
+         content_type: 'text/html',
+         body: render(template)
   end
 end

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

@@ -36,7 +36,7 @@
     <div class="chapter-container">
       <div class="chapter <%= enabled ? '' : 'mu-locked' %>">
         <h3><%= it.number %>. <%= link_to_path_element it, mode: :plain %></h3>
-        <div class="text-box" <%= 'aria-label=""' unless enabled %>%>
+        <div class="text-box" <%= 'aria-label=""' unless enabled %>>
           <%= it.description_teaser_html %>
         </div>
       </div>

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

@@ -1,9 +1,9 @@
 <%= content_for :breadcrumbs do %>
-  <%= home_breadcrumb %>
+  <%= header_breadcrumbs %> <%= breadcrumb_list_item(t(:discussions), 'last') %>
 <% end %>
 
 <%= content_for :extra_filters do %>
-  <%= discussion_dropdown_filter :language, discussions_languages(@discussions) do |language_filter| %>
+  <%= discussion_dropdown_filter :language, discussions_languages(@discussions), true do |language_filter| %>
     <%= language_filter.capitalize %>
   <% end %>
 <% end %>
@@ -18,6 +18,6 @@
   <% if @discussions.empty? %>
     <h4><%= t :no_questions %></h4>
   <% else %>
-      <%= render partial: 'layouts/discussions' %>
+    <%= render partial: 'layouts/discussions' %>
   <% end %>
 </div>

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

@@ -7,16 +7,28 @@
           <%= 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'}) %>
+          <%= fa_icon(:star, 'data-toggle': 'tooltip', title: (t :moderator), class: 'moderator-star') %>
         <% end %>
-        <% if message.authorized? current_user %>
-          <span class="actions">
-            <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') %>
-            </a>
+        <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') %>
+              </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-o', class: 'fa-xs') %>
+                </a>
+              <% end %>
+            <% end %>
             <%= link_to fa_icon('trash-o'), discussion_message_path(@discussion, message), method: :delete, data: { confirm: t(:are_you_sure, action: t(:destroy_message)) } %>
-          </span>
-        <% end %>
+          <% 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)) %>
+            </span>
+          <% end %>
+        </span>
       </div>
     </div>
     <div class="discussion-message-bubble-content">

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

@@ -24,7 +24,6 @@
 <% end %>
 
   <%= content_for :no_container do %>
-  <%= render partial: 'layouts/modals/new_discussion', locals: {debatable: @debatable} %>
 <% end if current_user? %>
 
 

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

@@ -0,0 +1,33 @@
+<%= content_for :breadcrumbs do %>
+  <%= breadcrumbs_for_discussion @discussion, @debatable %>
+<% end %>
+
+<%= form_for [@debatable, @discussion] do |f| %>
+  <div>
+    <div class="discussion-context">
+      <%= render partial: 'exercises/read_only', locals: {exercise: @debatable} %>
+    </div>
+  </div>
+
+  <hr class="message-divider">
+
+  <%= render layout: 'discussions/message_container', locals: {user: @discussion.initiator} do %>
+    <div class="discussion-message-bubble" id="new-discussion-description-container">
+      <div class="discussion-message-bubble-header">
+        <div class="discussion-message-bubble-title">
+          <%= @discussion.initiator.name %>
+        </div>
+      </div>
+      <div class="discussion-message-bubble-content">
+        <div class="container-fluid">
+          <div class="row">
+            <div class="discussion-new-message-content">
+              <%= f.editor :description, '', {id: 'new-discussion-message', class: 'form-control', placeholder: t(:discussion_description_placeholder)} %>
+            </div>
+          </div>
+        </div>
+      </div>
+    </div>
+    <%= f.submit t(:save), class: 'btn btn-success btn-block discussion-new-message-button' %>
+  <% end %>
+<% end %>

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

@@ -3,55 +3,25 @@
 <% end %>
 
 <div>
-  <div class="row">
-    <% if current_user %>
-      <div class="mu-inline-block-right hidden-xs discussion-user-menu">
-        <h3>
-          <% if @discussion.subscribable? %>
-            <a class="discussion-subscription" onclick="mumuki.Forum.discussionSubscription('<%= subscription_discussion_url(@discussion) %>')">
-              <%= fa_icon(:eye, class: 'fa-xs') %>
-              <%= span_toggle t(:subscribe), t(:unsubscribe), current_user.subscribed_to?(@discussion) %>
-            </a>
-          <% end %>
-          <% if @discussion.solved? %>
-            <a class="discussion-upvote" onclick="mumuki.Forum.discussionUpvote('<%= upvote_discussion_url(@discussion) %>')">
-              <%= fa_icon(:star, class: 'fa-xs') %>
-              <%= span_toggle t(:upvote), t(:undo_upvote), current_user.upvoted?(@discussion) %>
-            </a>
-          <% end %>
-        </h3>
-      </div>
-    <% end %>
-    <div class="mu-inline-block-left">
-      <div class="discussion-header">
-        <h3 class="discussion-title">
-          <%= @discussion.title %>
-        </h3>
-      </div>
-      <div class="discussion-description">
-        <%= label_for_contextualization(@discussion) %> ·
-        <span class="discussion-info">
-          <span class="discussion-initiator-name">
-            <%= @discussion.initiator.name %>
-          </span>
-          <%= discussion_info(@discussion) %>
-        </span>
-      </div>
-    </div>
-  </div>
-
   <div class="discussion-context">
     <%= render partial: 'exercises/read_only', locals: {exercise: @debatable} %>
   </div>
-
 </div>
 
 <% if @discussion.has_messages? || @discussion.commentable_by?(current_user) %>
   <hr class="message-divider">
 
-  <h3>
-    <%= t :messages %>
-  </h3>
+  <div>
+    <h3>
+      <%= t :messages %>
+      <% if @discussion.last_moderator_access_visible_for?(current_user) %>
+        <small class="pull-right">
+          <span><%= t :last_seen, name: @discussion.last_moderator_access_by.full_name %></span>
+          <span><%= t :time_since, time: time_ago_in_words(@discussion.last_moderator_access_at) %></span>
+        </small>
+      <% end %>
+    </h3>
+  </div>
 
   <% if @discussion.has_messages? %>
     <div class="discussion-messages">
@@ -71,8 +41,10 @@
 
 <% end %>
 
-<div class="discussion-actions">
-  <% @discussion.reachable_statuses_for(current_user).each do |status| %>
-    <%= discussion_update_status_button(status) %>
-  <% end if current_user %>
-</div>
+<% if current_user&.moderator_here? %>
+  <div class="discussion-actions">
+    <% @discussion.reachable_statuses_for(current_user).each do |status| %>
+      <%= discussion_update_status_button(status) %>
+    <% end %>
+  </div>
+<% end %>

data/app/views/exercise_solutions/_contextualization_results_container.html.erb

@@ -1,4 +1,4 @@
-<div class="<%= "bs-callout bs-callout-#{icon_class_for contextualization}" %>">
+<div class="<%= "bs-callout bs-callout-#{icon_class_for contextualization.submission_status}" %>">
   <%= render partial: 'exercise_solutions/results_title', locals: {contextualization: contextualization} %>
   <%= yield %>
 </div>