mumuki-laboratory 7.6.2 → 7.7.4

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/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/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>

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

@@ -1,3 +1,3 @@
-<h4 class="text-<%= icon_class_for(contextualization) %>">
-  <strong><%= fa_icon icon_type_for(contextualization) %> <%= t_contextualization_status contextualization %></strong>
+<h4 class="text-<%= icon_class_for(contextualization.submission_status) %>">
+  <strong><%= fa_icon icon_type_for(contextualization.submission_status) %> <%= t_contextualization_status contextualization %></strong>
 </h4>

data/app/views/exercises/_read_only.html.erb

@@ -9,13 +9,40 @@
 
 <details open>
   <summary class="discussion-summary">
-    <div class="mu-inline-block-right hidden-xs">
-      <h1><%= language_icon @debatable.language %></h1>
-    </div>
     <h3 class="discussion-exercise-title">
-      <span class="hidden-xs"><%= t(:exercise_number, number: exercise.number) %>:&nbsp;</span>
-      <span><%= @debatable.name %></span>
+      <span>
+        <span class="hidden-xs"><%= t(:exercise_number, number: exercise.number) %>:&nbsp;</span>
+        <span><%= exercise.name %></span>
+      </span>
+      <span class="mu-inline-block-right hidden-xs">
+        <h1 class="no-margin"><%= language_icon exercise.language %></h1>
+      </span>
     </h3>
+    <div class="discussion-description">
+      <%= label_for_contextualization(@discussion, class: 'hidden-xs') %> ·
+      <span class="discussion-info">
+          <span class="discussion-initiator-name">
+            <%= @discussion.initiator.name %>
+          </span>
+        <span class="hidden-xs"><%= discussion_info(@discussion) unless @discussion.new_record? %></span>
+      </span>
+      <% if current_user && @discussion.persisted? %>
+        <span class="mu-inline-block-right discussion-user-menu no-margin">
+          <% 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), class: 'hidden-sm hidden-xs' %>
+            </a>
+          <% end %>
+          <% if @discussion.solved? %>
+            <a class="discussion-upvote" onclick="mumuki.Forum.discussionUpvote('<%= upvote_discussion_url(@discussion) %>')">
+              <%= fa_icon('thumbs-o-up', class: 'fa-xs') %>
+              <%= span_toggle t(:upvote), t(:undo_upvote), current_user.upvoted?(@discussion), class: 'hidden-sm hidden-xs' %>
+            </a>
+          <% end %>
+        </span>
+      <% end %>
+    </div>
   </summary>
 
   <% if should_render_read_only_exercise_tabs?(@discussion) %>
@@ -64,7 +91,7 @@
 
         <div role="tabpanel" class="tab-pane" id="results">
           <div class="mu-tab-body">
-            <%= render layout: 'exercise_solutions/contextualization_results_container', locals: {contextualization: @discussion } do %>
+            <%= render layout: 'exercise_solutions/contextualization_results_container', locals: {contextualization: @discussion} do %>
               <div class="row">
                 <div class="col-md-12 submission-results">
                   <%= render partial: 'exercise_solutions/contextualization_results_body',

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

@@ -1,2 +1,2 @@
 &copy; Copyright 2015-<%= DateTime.now.year %>
-<a href="http://mumuki.org/" class="mu-org-link"><span class="da da-mumuki-circle"></span> Mumuki Project</a>
+<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

@@ -20,6 +20,14 @@
       <%= discussion_dropdown_filter :sort, Discussion.sorting_filters do |sorting_filter| %>
         <%= t sorting_filter %>
       <% end %>
+
+      <% if current_user&.moderator_here? %>
+        <div class="discussion-requires-attention pull-right">
+          <%= label_tag :requires_moderator_response, t(:requires_attention) %>
+          <%= check_box_tag :requires_moderator_response, true, discussion_filter_params[:requires_moderator_response], class: 'form-input', onclick: 'mumuki.Forum.discussionsToggleCheckbox($(this))' %>
+        </div>
+      <% end %>
+
     </div>
   </div>
   <% if @filtered_discussions.empty? %>
@@ -34,13 +42,13 @@
   <% else %>
     <div class="discussions">
       <% @filtered_discussions.each do |discussion| %>
-        <%= link_to item_discussion_path(discussion) do %>
+        <%= 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.language) %>
+                  <%= language_icon(discussion.exercise.language) %>
                 </div>
               <% end %>
               <div>
@@ -48,7 +56,17 @@
                   <span class="discussion-status-icon">
                     <%= discussion_status_fa_icon(discussion) %>
                   </span>
-                  <%= discussion.title %>
+                  <span class="hidden-sm hidden-xs"><%= discussion.exercise.guide.name %> -</span>
+                  <span><%= discussion.exercise.name %></span>
+                  <% if discussion.last_moderator_access_visible_for?(current_user) %>
+                    <div class="pull-right discussion-moderator-access" >
+                      <%= profile_picture_for(discussion.last_moderator_access_by, 32) %>
+                      <span class="moderator-initials">
+                        <%= discussion.last_moderator_access_by.name_initials %>
+                      </span>
+                    </div>
+                  <% end %>
+
                 </div>
                 <span class="discussion-description">
                   <%= discussion.description %>

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

@@ -19,7 +19,7 @@
         <% else %>
           <span class="text-success mu-test-result-header">
             <%= status_icon(test_result[:status]) %>
-            <%= test_result[:title] %>
+            <%= render_test_result_header test_result %>
           </span>
         <% end %>
 

data/app/views/layouts/exercise_inputs/editors/_custom.html.erb

@@ -4,4 +4,4 @@
 
 <%= form.hidden_field :content, id: "mu-custom-editor-value", value: @current_content %>
 <%= form.hidden_field :content_extra, id: "mu-custom-editor-extra", value: @exercise.extra %>
-<%= form.hidden_field :content, id: "mu-custom-editor-test", value: @exercise.test %>
+<%= form.hidden_field :content_test, id: "mu-custom-editor-test", value: @exercise.test %>

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

@@ -3,7 +3,7 @@
              html: {role: 'form', class: 'new_solution mu-editor mu-editor-overlap'}) do |f| %>
   <%= render_exercise_input_editor f, exercise %>
 
-  <div class="actions mu-kids-submit-button">
+  <div class="actions mu-submit-button mu-kids-submit-button">
     <%= render_submit_button(@assignment) %>
   </div>
   <div class="actions mu-kids-reset-button"></div>

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

@@ -33,7 +33,7 @@
                  html: {role: 'form', class: "new_solution mu-editor mu-editor-overlap #{pending_messages_filter(@assignment)}"}) do |f| %>
       <%= render_exercise_input_editor f, exercise %>
 
-      <div class="actions">
+      <div class="actions mu-submit-button">
         <%= render_submit_button(@assignment) %>
       </div>
     <% end %>

data/app/views/layouts/exercise_inputs/layouts/_input_bottom.html.erb

@@ -4,7 +4,7 @@
   </div>
 </div>
 <div class="row">
-  <div class="col-md-12 ace-editor-col">
+  <div class="mu-exercise-content col-md-12 ace-editor-col">
     <%= yield :exercise_content %>
   </div>
 </div>

data/app/views/layouts/exercise_inputs/layouts/_input_kindergarten.html.erb

@@ -0,0 +1,40 @@
+<% content_for :no_container do %>
+
+    <div <%= turbolinks_enable_for exercise %>>
+
+      <div class="mu-kids-landscape-support container-fluid">
+        <img class="mu-kids-character-animation"/>
+        <h3><%= t :only_landscape_support %></h3>
+      </div>
+
+      <div class="mu-kids-exercise mu-kindergarten container-fluid">
+
+        <div class="mu-kids-exercise-description mu-kids-exercise-description-fixed">
+          <div class="mu-kids-character">
+            <%= render partial: 'layouts/kids', locals: {exercise: exercise} %>
+          </div>
+        </div>
+        <div class="mu-kids-exercise-workspace">
+          <div class="mu-exercise-content mu-kids-blocks">
+            <%= yield :exercise_content %>
+          </div>
+          <div class="mu-kids-states mu-kids-single-state mu-multiple-scenarios">
+            <div class="mu-scenarios">
+              <div class="mu-kids-state mu-state-initial mu-kids-gbs-board-initial mu-initial-state">
+                <div class="mu-kids-state-image"><%= exercise.initial_state&.html_safe %></div>
+              </div>
+              <div class="mu-kids-state mu-state-final mu-final-state">
+                <div class="mu-kids-state-image"><%= exercise.final_state&.html_safe %></div>
+              </div>
+            </div>
+            <ol class="indicators"></ol>
+          </div>
+        </div>
+      </div>
+
+      <%= render partial: 'layouts/modals/kids_results', locals: {exercise: exercise, assignment: @assignment} %>
+      <%= render partial: 'layouts/modals/kids_results_aborted' %>
+      <%= render partial: 'layouts/modals/kids_context', locals: {exercise: exercise, assignment: @assignment} %>
+
+    </div>
+<% end %>

data/app/views/layouts/exercise_inputs/layouts/{_input_kids.html.erb → _input_primary.html.erb}

@@ -13,7 +13,7 @@
           <div class="mu-kids-character">
             <%= render partial: 'layouts/kids', locals: {exercise: exercise} %>
           </div>
-          <div class="mu-kids-blocks">
+          <div class="mu-exercise-content mu-kids-blocks">
             <%= yield :exercise_content %>
           </div>
         </div>

data/app/views/layouts/exercise_inputs/layouts/_input_right.html.erb

@@ -2,7 +2,7 @@
   <div class="col-md-6 exercise-assignment">
     <%= yield :assignment %>
   </div>
-  <div class="col-md-6 ace-editor-col">
+  <div class="mu-exercise-content col-md-6 ace-editor-col">
     <%= yield :exercise_content %>
   </div>
 </div>