mumuki-laboratory 8.1.1 → 8.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5feda4ed95a66abdfc68c218f1d2b5752fe6fdd8d8da0a18cc7c968d90550bbd
-  data.tar.gz: '080a983c6f384a8568ba2c8e7f092fcab9afe2a82b728bdfcc1e66fb8256377f'
+  metadata.gz: d366cf0d6d349759281213746e2c6a6f1a998db2d07efa9dc45b02480487108e
+  data.tar.gz: 0c890e15fa8b8f3164372b7c8f6844b17e85ded1686bb1c4d0947d9a08b7cd6a
 SHA512:
-  metadata.gz: f95a1a2057a7946e2f26589a50076ec7e3c0e3d538a3feeb75da6a7cd1e030598a048dbb2e8918f1dcf39aa6565bc22fec237c66c88ee6842503c4d0bf94947c
-  data.tar.gz: 006504d33b8cb9ea871cff01be16fbc9f4b9f89e8cab63f11e1bfcc41cb4384cf1aff2e6e501e053d9279a1dd3a2009ae0b6a5c242012ab311b0a1e1ed9702a5
+  metadata.gz: 4ff7d88d695024cbd9feac650c31b77055291f280791b262ddf6c6477f54a2e7ef0d858bbe4668594e88b755dd5ab1934ac7b8acc045acf02360ddae9dca8d7f
+  data.tar.gz: 555cfdee07fa9e97d62507360fda991dfd6bf16668093d6af44ab6f6ee79dcf22ab57aaf08d49a2e434767bd3a7dadfb8316321b22d3efa0e0b0f19f5ad7c1e0

data/app/assets/javascripts/mumuki_laboratory/application/bridge.js

@@ -113,7 +113,7 @@ mumuki.bridge = (() => {
      * @returns {SubmissionResult}
      */
     _preRenderResult(result) {
-      result.class_for_progress_list_item = mumuki.renderers.progressListItemClassForStatus(result.status, true)
+      result.class_for_progress_list_item = mumuki.renderers.progressListItemClassForStatus(result.status, true);
       return result;
     }
   }

data/app/assets/javascripts/mumuki_laboratory/application/button.js

@@ -36,7 +36,7 @@ mumuki.Button = class {
       e.preventDefault();
       main();
     };
-    this.$button.on('click', this.main)
+    this.$button.on('click', this.main);
   }
 
   // ==============
@@ -80,7 +80,7 @@ mumuki.Button = class {
 
     this.enable();
 
-    this.$button.on('click', this.main)
+    this.$button.on('click', this.main);
   }
 
   // =============

data/app/assets/javascripts/mumuki_laboratory/application/codemirror-builder.js

@@ -38,7 +38,7 @@
             mumuki.editor.toggleFullscreen();
           },
           'Tab': function (cm) {
-            mumuki.editor.indentWithSpaces(cm)
+            mumuki.editor.indentWithSpaces(cm);
           }
         }
       });
@@ -53,7 +53,7 @@
           'Cmd-Enter': submitMessage,
           'Ctrl-Enter': submitMessage,
           'Tab': function (cm) {
-            mumuki.editor.indentWithSpaces(cm)
+            mumuki.editor.indentWithSpaces(cm);
           }
         }
       });

data/app/assets/javascripts/mumuki_laboratory/application/codemirror.js

@@ -23,14 +23,14 @@ mumuki.page.editors = [];
   function resetEditor() {
     mumuki.page.dynamicEditors.forEach(function (e) {
       setDefaultContent(e, $('#default_content').val());
-    })
+    });
   }
 
   function formatContent() {
     mumuki.page.editors.each(function (_, editor) {
-      editor.setSelection({line: 0, ch: 0}, {line: editor.lineCount()})
-      editor.indentSelection("smart")
-      editor.setSelection({line: 0})
+      editor.setSelection({line: 0, ch: 0}, {line: editor.lineCount()});
+      editor.indentSelection("smart");
+      editor.setSelection({line: 0});
     });
   }
 
@@ -56,7 +56,7 @@ mumuki.page.editors = [];
     if (language !== undefined) {
       mumuki.page.dynamicEditors.forEach(function (e) {
         setEditorLanguage(e, language);
-      })
+      });
     }
   }
 

data/app/assets/javascripts/mumuki_laboratory/application/console.js

@@ -32,7 +32,7 @@
   function clearConsole() {
     $('.jquery-console-message-error').remove();
     $('.jquery-console-message-value').remove();
-    $('.jquery-console-prompt-box:not(:last)').remove()
+    $('.jquery-console-prompt-box:not(:last)').remove();
   }
 
   class QueryConsole {
@@ -134,7 +134,7 @@
         url: self._requestUrl,
         type: 'POST',
         data: self._requestData
-      })
+      });
     }
     get _requestUrl() {
       return this.console.endpoint;

data/app/assets/javascripts/mumuki_laboratory/application/discussions.js

@@ -34,33 +34,33 @@ mumuki.load(() => {
     },
     token: new mumuki.CsrfToken(),
     tokenRequest: function (data) {
-      return $.ajax(Forum.token.newRequest(data))
+      return $.ajax(Forum.token.newRequest(data));
     },
     discussionPost: function (url) {
       return Forum.tokenRequest({
         url: url,
         method: 'POST',
         xhrFields: {withCredentials: true}
-      })
+      });
     },
     discussionSubscription: function (url) {
-      Forum.discussionPostAndToggle(url, $subscriptionSpans)
+      Forum.discussionPostAndToggle(url, $subscriptionSpans);
     },
     discussionUpvote: function (url) {
-      Forum.discussionPostAndToggle(url, $upvoteSpans)
+      Forum.discussionPostAndToggle(url, $upvoteSpans);
     },
     discussionPostAndToggle: function (url, elem) {
-      Forum.discussionPost(url).done(Forum.toggleButton(elem))
+      Forum.discussionPost(url).done(Forum.toggleButton(elem));
     },
     discussionMessageToggleApprove: function (url, elem) {
       Forum.discussionPost(url).done(function () {
         elem.toggleClass("selected");
-      })
+      });
     },
     discussionMessageToggleNotActuallyAQuestion: function (url, elem) {
       Forum.discussionPost(url).done(function () {
         elem.toggleClass("selected");
-      })
+      });
     },
     discussionsToggleCheckbox: function (elem) {
       const key = elem.attr('name');

data/app/assets/javascripts/mumuki_laboratory/application/editors.js

@@ -99,6 +99,6 @@ mumuki.editors = {
    * @param {CustomEditorSource} source
    */
   addCustomSource(source) {
-    mumuki.CustomEditor.addSource(source)
+    mumuki.CustomEditor.addSource(source);
   }
 };

data/app/assets/javascripts/mumuki_laboratory/application/elipsis.js

@@ -21,7 +21,7 @@ mumuki.elipsis = (() => {
     $elipsis.each((it, e) =>  {
       let $e = $(e);
       $e.html(mumuki.elipsis($e.html()));
-    })
+    });
   };
 
   mumuki.load(() => {

data/app/assets/javascripts/mumuki_laboratory/application/events.js

@@ -34,7 +34,7 @@ mumuki.events = {
    */
   fire(eventName, value = null) {
     if (this._handlers[eventName]) {
-      this._handlers[eventName].forEach(it => it(value))
+      this._handlers[eventName].forEach(it => it(value));
     }
   },
 
@@ -48,4 +48,4 @@ mumuki.events = {
       this._handlers[eventName] = [];
     }
   }
-}
+};

data/app/assets/javascripts/mumuki_laboratory/application/exercise.js

@@ -63,6 +63,6 @@ mumuki.exercise = {
       this._current = null;
     }
   }
-}
+};
 
-mumuki.load(() => mumuki.exercise.load())
+mumuki.load(() => mumuki.exercise.load());

data/app/assets/javascripts/mumuki_laboratory/application/gamification.js

@@ -108,12 +108,22 @@ mumuki.gamification = (() => {
     }
 
     updateLevel() {
-      const $muLevelProgress = $('#mu-level-progress');
-
       $('#mu-solve-more-exercises span').text(this.exercisesToNextLevel());
       $('.mu-level-number').html(this.currentLevel());
-      $('.mu-level-tooltip').attr("title", (_, value) => `${value} ${this.currentLevel()}`);
 
+      this.updateTooltip();
+      this.animateProgressIfAny();
+    }
+
+    updateTooltip() {
+      const $muLevelTooltip = $('.mu-level-tooltip');
+
+      $muLevelTooltip.attr("data-original-title", `${$muLevelTooltip.attr("level")} ${this.currentLevel()}`);
+      $muLevelTooltip.attr("title", "");
+    }
+
+    animateProgressIfAny() {
+      const $muLevelProgress = $('#mu-level-progress');
       if (this.currentLevelProgress() === 0) {
         $muLevelProgress.attr("display", "none");
       }

data/app/assets/javascripts/mumuki_laboratory/application/inputs.js

@@ -7,7 +7,7 @@ mumuki.onInputsReady = (() => {
 			if ($(inputsSelector).length === 0) return;
 
 			callback(event);
-		})
+		});
 	}
 
 	return onInputsReady;

data/app/assets/javascripts/mumuki_laboratory/application/kids.js

@@ -61,11 +61,11 @@ mumuki.Kids = class {
   // ==================
 
   _showSuccessPopup() {
-    this._mustImplementThisMethod()
+    this._mustImplementThisMethod();
   }
 
   _showFailurePopup() {
-    this._mustImplementThisMethod()
+    this._mustImplementThisMethod();
   }
 
   // ====================
@@ -141,7 +141,7 @@ mumuki.Kids = class {
   // ============
 
   _mustImplementThisMethod() {
-    throw new Error('TODO: implement method')
+    throw new Error('TODO: implement method');
   }
 
   // ============
@@ -214,4 +214,4 @@ mumuki.Kids = class {
     $blockSvg.height($blocks.height());
   }
 
-}
+};

data/app/assets/javascripts/mumuki_laboratory/application/kindergarten.js

@@ -103,27 +103,27 @@ mumuki.load(() => {
           this._action('play', 'stop', true, (speech) => {
             mumuki.presenterCharacter.playAnimation('talk', mumuki.kids.$bubbleCharacterAnimation);
             speech.speak(msg);
-          })
+          });
         },
         stop() {
-          this._action('stop', 'play', false, (speech) => speech.cancel())
+          this._action('stop', 'play', false, (speech) => speech.cancel());
         },
         _action(add, remove, isPlaying, callback) {
           callback(window.speechSynthesis);
-          const $button = $('.mu-kindergarten-play-description')
+          const $button = $('.mu-kindergarten-play-description');
           $button.find(`.mu-kindergarten-${add}`).addClass('hidden');
           $button.find(`.mu-kindergarten-${remove}`).removeClass('hidden');
           this._isPlaying = isPlaying;
         },
         verifyBrowserSupport() {
           if (!window.speechSynthesis) {
-            const $button = $('.mu-kindergarten-play-description')
+            const $button = $('.mu-kindergarten-play-description');
             $button.prop('disabled', true);
             $button.css('cursor', 'not-allowed');
-            this._action('play', 'stop', false)
+            this._action('play', 'stop', false);
           }
         }
-      }
+      };
 
     }
 
@@ -143,7 +143,7 @@ mumuki.load(() => {
           const $hintMedia = $('.mu-kindergarten-hint-media');
           if (!$hintMedia.get(0)) $button.addClass('hidden');
         },
-      }
+      };
     }
 
     get context() {

data/app/assets/javascripts/mumuki_laboratory/application/messages.js

@@ -1,7 +1,7 @@
 mumuki.load(() => {
   var Chat = {
     $body: function () {
-      return $('body')
+      return $('body');
     },
     $newMessageModal: function () {
       return $('.new-message-modal');
@@ -18,7 +18,7 @@ mumuki.load(() => {
       $('.notifications-box').toggleClass('notifications-box-empty', !data.has_messages);
       $('.pending-messages-filter').removeClass('pending-messages-filter');
       $('button.btn-submit').removeClass('disabled');
-      $('.pending-messages-text').remove()
+      $('.pending-messages-text').remove();
     },
     readMessages: function (url) {
       Chat.tokenRequest({
@@ -26,10 +26,10 @@ mumuki.load(() => {
         method: 'POST',
         success: Chat.setMessages,
         xhrFields: {withCredentials: true}
-      })
+      });
     },
     tokenRequest: function (data) {
-      $.ajax(Chat.token.newRequest(data))
+      $.ajax(Chat.token.newRequest(data));
     },
     getMessages: function () {
       if ($('.badge-messages').length == 0) {
@@ -74,7 +74,7 @@ mumuki.load(() => {
         success: success,
         error: error,
         xhrFields: {withCredentials: true}
-      })
+      });
     },
     openNewMessageModal: function () {
       Chat.$newMessageModal().modal({backdrop: false, keyboard: false});
@@ -89,5 +89,5 @@ mumuki.load(() => {
   Chat.setMessagesInterval();
   mumuki.Chat = Chat;
 
-})
+});
 

data/app/assets/javascripts/mumuki_laboratory/application/mu-modal-carrousel.js

@@ -41,7 +41,7 @@ mumuki.ModalCarrousel = (() => {
 
     _hidePreviousButtonIfFirstSlide() {
       const $prev = $('.mu-kids-modal-button.mu-previous');
-      this._addClassIf($prev, 'hidden', () => this._activeSlide().is(':first-child'))
+      this._addClassIf($prev, 'hidden', () => this._activeSlide().is(':first-child'));
     }
 
     _showFirstSlide() {

data/app/assets/javascripts/mumuki_laboratory/application/multiple-choice.js

@@ -1,7 +1,7 @@
 mumuki.load(() => {
 	function dumpChoices(_evt) {
 		var indexes = $('.solution-choice:checked').map(function () {
-			return $(this).data('index')
+			return $(this).data('index');
 		}).get().join(':');
 		$('#solution_content').attr('value', indexes);
 	}

data/app/assets/javascripts/mumuki_laboratory/application/multiple-files.js

@@ -103,11 +103,11 @@ mumuki.load(() => {
     }
 
     get highlightModes() {
-      return this._getDataFromHiddenInput('#highlight-modes')
+      return this._getDataFromHiddenInput('#highlight-modes');
     }
 
     get locales() {
-      return this._getDataFromHiddenInput('#multifile-locales')
+      return this._getDataFromHiddenInput('#multifile-locales');
     }
 
     setUpAddFile() {
@@ -131,7 +131,7 @@ mumuki.load(() => {
 
       this._setVisibility(this._addFileButton, filesCount < this.MAX_TABS);
       this.files.toArray().forEach(file => {
-        this._setVisibility(file.deleteButton, file.name !== this.mainFile && filesCount > 1)
+        this._setVisibility(file.deleteButton, file.name !== this.mainFile && filesCount > 1);
       });
     }
 

data/app/assets/javascripts/mumuki_laboratory/application/multiple-scenarios.js

@@ -73,7 +73,7 @@ mumuki.MultipleScenarios = (() => {
         if (this.validScenarioIndex(newScenarioIndex)) {
           this.setActiveIndex(newScenarioIndex);
         }
-      })
+      });
     }
 
     createControls () {

data/app/assets/javascripts/mumuki_laboratory/application/pin.js

@@ -11,5 +11,5 @@ mumuki.pin = (() => {
         smoothScrollToElement(scrollPin);
       }
     }
-  }
+  };
 })();

data/app/assets/javascripts/mumuki_laboratory/application/primary.js

@@ -83,7 +83,7 @@ mumuki.load(() => {
             this._$texts.hide();
             this.$characterSpeechBubbleNormal.children('.' + $tab.data('target')).show();
             this._updateSpeechParagraphs();
-          })
+          });
         }
       });
 

data/app/assets/javascripts/mumuki_laboratory/application/progress.js

@@ -17,7 +17,7 @@ mumuki.progress = (() => {
   function updateWholeProgressBar(f) {
     $('.progress-list-item').each((_, it) => {
       const $anchor = $(it);
-      $anchor.attr('class', f($anchor))
+      $anchor.attr('class', f($anchor));
     });
   }
 

data/app/assets/javascripts/mumuki_laboratory/application/results-renderer.js

@@ -49,7 +49,7 @@ mumuki.renderers.results = (() => {
     classForStatus,
     iconForStatus,
     progressListItemClassForStatus
-  }
+  };
 })();
 
 /** @deprecated use {@code mumuki.renderers.results.classForStatus} instead */

data/app/assets/javascripts/mumuki_laboratory/application/speech-bubble-renderer.js

@@ -20,7 +20,7 @@ mumuki.renderers.speechBubble = (()=> {
 
     _chooseResultItem() {
       if (this._responseStatus() !== 'passed' && this._hasTips()) {
-        this._appendFirstTip()
+        this._appendFirstTip();
       } else if (this._responseStatus() === 'failed') {
         this._appendFirstFailedTestResultSummary();
       } else if (this._responseStatus() === 'passed_with_warnings') {
@@ -29,7 +29,7 @@ mumuki.renderers.speechBubble = (()=> {
     }
 
     _appendFirstFailedTestResultSummary() {
-      const failedTestResult = this._failedTestResults()[0]
+      const failedTestResult = this._failedTestResults()[0];
       if (failedTestResult && failedTestResult.summary) {
         this._appendResultItem(mumuki.renderers.renderSpeechBubbleResultItem(failedTestResult.summary));
       }
@@ -67,7 +67,7 @@ mumuki.renderers.speechBubble = (()=> {
     }
 
     _hasTips() {
-      return this.responseData.tips && this.responseData.tips.length
+      return this.responseData.tips && this.responseData.tips.length;
     }
 
     _failedTestResults() {
@@ -97,7 +97,7 @@ mumuki.renderers.speechBubble = (()=> {
   return {
     SpeechBubbleRenderer,
     renderSpeechBubbleResultItem
-  }
+  };
 })();
 
 /** @deprecated use {@code mumuki.renderers.speechBubble.SpeechBubbleRenderer} instead */

data/app/assets/javascripts/mumuki_laboratory/application/submission.js

@@ -101,7 +101,7 @@ mumuki.submission = (() => {
         });
         mumuki.kids.showResult(data);
       });
-    }
+    };
   }
 
   /** Processor for non-kids layouts */
@@ -118,7 +118,7 @@ mumuki.submission = (() => {
         $(document).renderMuComponents();
         resultsBox.done(data, submitButton);
       });
-    }
+    };
   }
 
   /** Selects the most appropriate solution processor */

data/app/assets/javascripts/mumuki_laboratory/application/submissions-store.js

@@ -96,7 +96,7 @@ mumuki.SubmissionsStore = (() => {
     _keyFor(exerciseId) {
       return `/exercise/${exerciseId}/submission`;
     }
-  };
+  }();
 
   return SubmissionsStore;
 })();
@@ -106,5 +106,5 @@ mumuki.load(() => {
     if (e.detail[0]) {
       mumuki.SubmissionsStore.clear();
     }
-  })
-})
+  });
+});

data/app/assets/javascripts/mumuki_laboratory/application/sync-mode.js

@@ -65,11 +65,11 @@ mumuki.syncMode = (() => {
 
     /** @type {ClientSyncMode|ServerSyncMode}*/
     _current: null
-  }
+  };
 })();
 
 mumuki.load(() => {
   mumuki.syncMode._selectSyncMode();
   mumuki.syncMode._current.syncProgress();
   mumuki.syncMode._current.syncEditorContent();
-})
+});

data/app/assets/javascripts/mumuki_laboratory/application/timer.js

@@ -16,5 +16,5 @@ mumuki.startTimer = (() => {
       }
     }, intervalDuration);
   }
-  return startTimer
+  return startTimer;
 })();

data/app/assets/stylesheets/mumuki_laboratory/application/_layout.scss

@@ -25,13 +25,13 @@ body {
   margin-bottom: 110px;
 }
 
-.footer {
-  position: absolute;
-  bottom: 0;
-  width: 100%;
-  height: 110px;
-  .container {
-    margin-top: 33px;
+.mu-footer {
+  &.container {
+    margin-top: 45px;
+  }
+  .mu-footer-terms {
+    font-size: 15px;
+    text-align: center;
   }
 }
 

data/app/controllers/concerns/with_user_discussion_validation.rb

@@ -2,12 +2,18 @@ module WithUserDiscussionValidation
   extend ActiveSupport::Concern
 
   included do
+    # users are not allowed to access discussions during exams
+    before_action :validate_not_blocked_in_forum!
     # discussions are not enabled for all organizations nor all users
     before_action :validate_user_can_discuss!
   end
 
   private
 
+  def validate_not_blocked_in_forum!
+    raise Mumuki::Domain::BlockedForumError if current_user&.currently_in_exam?
+  end
+
   def validate_user_can_discuss!
     raise Mumuki::Domain::NotFoundError unless current_user&.can_discuss_here?
   end

data/app/controllers/discussions_controller.rb

@@ -1,8 +1,6 @@
 class DiscussionsController < ApplicationController
   include Mumuki::Laboratory::Controllers::Content
   include WithUserDiscussionValidation
-  # users are not allowed to access discussions during exams
-  before_action :validate_not_in_exam!
 
   before_action :set_debatable, except: [:subscription]
   before_action :authenticate!, only: [:update, :create]
@@ -74,8 +72,4 @@ class DiscussionsController < ApplicationController
   def discussion_filter_params
     @filter_params ||= params.permit(Discussion.permitted_query_params)
   end
-
-  def validate_not_in_exam!
-    raise Mumuki::Domain::BlockedForumError if current_user&.currently_in_exam?
-  end
 end

data/app/helpers/links_helper.rb

@@ -52,11 +52,11 @@ module LinksHelper
   end
 
   def link_to_profile_terms
-    link_to t(:terms_and_conditions).downcase, terms_user_path, target: '_blank'
+    link_to t(:terms_and_conditions), terms_user_path, target: '_blank'
   end
 
   def link_to_forum_terms
-    link_to t(:forum_terms).downcase, discussions_terms_path, target: '_blank'
+    link_to t(:forum_terms), discussions_terms_path, target: '_blank'
   end
 
   def turbolinks_enable_for(exercise)

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

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

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

@@ -20,7 +20,7 @@
       <div class="mu-navbar-avatar">
         <% if current_logged_user? %>
           <% if in_gamified_context? %>
-            <i class="fa fa-star fa-fw fa-2x navbar-icon mu-level-tooltip" data-toggle="tooltip" data-placement="bottom" title="<%= t(:level) %>"></i>
+            <i class="fa fa-star fa-fw fa-2x navbar-icon mu-level-tooltip" data-toggle="tooltip" data-placement="bottom" level="<%= t(:level) %>"></i>
             <span class="mu-level-number"></span>
           <% end %>
           <div class="dropdown">
@@ -52,30 +52,32 @@
 
 <% content_for :footer do %>
   <footer class="footer">
-    <div class="<%= exercise_container_type %>">
-      <hr>
-
-      <div class="row">
-        <div class="col-md-12">
+    <div class="mu-footer <%= exercise_container_type %>">
+      <div class="mu-footer-row">
+        <div class="mu-footer-authoring">
           <%= yield :authoring %>
         </div>
       </div>
 
-      <div id="footer-copyright" class="row">
-        <div class="col-md-4 text-left">
-          <p>
-            <%= render partial: 'layouts/copyright' %>
-          </p>
+      <div class="mu-footer-row">
+        <div class="mu-footer-copyright">
+          <%= render partial: 'layouts/copyright' %>
         </div>
 
-        <div class="col-md-4 text-center">
-          <%= login_form.footer_html %>
+        <div class="mu-footer-terms">
+          <div><%= link_to_profile_terms %></div>
+          <% if current_user&.can_discuss_here? %>
+            <div><%= link_to_forum_terms %></div>
+          <% end %>
         </div>
 
-        <div id="footer-social" class="col-md-4 text-right" lang="en">
+        <%= login_form.footer_html %>
+
+        <div id="footer-social" class="mu-footer-social" lang="en">
           <%= render partial: 'layouts/social_media' %>
         </div>
       </div>
+
     </div>
   </footer>
 <% end %>

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

@@ -1,22 +1,25 @@
 <% content_for :footer do %>
   <footer class="footer">
-    <div class="<%= exercise_container_type %>">
-      <hr>
-
-      <div class="row">
-        <div class="col-md-12">
+    <div class="mu-footer <%= exercise_container_type %>">
+      <div class="mu-footer-row">
+        <div class="mu-footer-authoring">
           <%= yield :authoring %>
         </div>
       </div>
 
-      <div id="footer-copyright" class="row hidden-xs hidden-sm">
-        <div class="col-sm-8 text-left">
-          <p>
-            <%= render partial: 'layouts/copyright' %>
-          </p>
+      <div class="mu-footer-row">
+        <div class="mu-footer-copyright">
+          <%= render partial: 'layouts/copyright' %>
+        </div>
+
+        <div class="mu-footer-terms">
+          <div><%= link_to_profile_terms %></div>
+          <% if current_user&.can_discuss_here? %>
+            <div><%= link_to_forum_terms %></div>
+          <% end %>
         </div>
 
-        <div id="footer-social" class="col-sm-4 text-right" lang="en">
+        <div id="footer-social" class="mu-footer-social" lang="en">
           <%= render partial: 'layouts/social_media' %>
         </div>
       </div>

data/lib/mumuki/laboratory/locales/es-CL.yml

@@ -104,7 +104,7 @@ es-CL:
   first_name: Nombre
   forbidden_explanation: ¿Puede que hayas ingresado con una cuenta incorrecta?
   format: Dar formato
-  forum_terms_link: Si tienes alguna duda, consulta las %{terms_link}
+  forum_terms_link: Si tienes alguna duda, accede a las %{terms_link}
   fullscreen: "Pantalla completa"
   gender: Género
   get_messages: "Ver mensajes"

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

@@ -112,8 +112,8 @@ es:
   first_name: Nombre
   forbidden_explanation: ¿Puede que hayas ingresado con una cuenta incorrecta?
   format: Dar formato
-  forum_terms: Reglas del foro
-  forum_terms_link: Si tenés alguna duda, consultá las %{terms_link}
+  forum_terms: Reglas del espacio de consultas
+  forum_terms_link: Si tenés alguna duda, accedé a las %{terms_link}
   fullscreen: "Pantalla completa"
   gender: Género
   get_messages: "Ver mensajes"

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

@@ -108,7 +108,7 @@ pt:
   first_name: Nome
   forbidden_explanation: Você poderia ter entrado com uma conta incorreta?
   format: Formato
-  forum_terms: Regras do fórum
+  forum_terms: Regras do espaço de consulta
   forum_terms_link: Se você tiver alguma dúvida, consulte as %{terms_link}
   fullscreen: Tela completa
   gender: Gênero

data/lib/mumuki/laboratory/version.rb

@@ -1,5 +1,5 @@
 module Mumuki
   module Laboratory
-    VERSION = '8.1.1'
+    VERSION = '8.1.2'
   end
 end

data/spec/controllers/discussions_controller_spec.rb

@@ -26,6 +26,25 @@ describe DiscussionsController, organization_workspace: :test do
     end
   end
 
+  describe 'index' do
+    context 'when user is banned from forum' do
+      before { user.update! banned_from_forum: true }
+      before { get :index, params: exercise_params }
+
+      it { expect(response.status).to eq 404 }
+    end
+
+    context 'when user has exam in progress' do
+      let!(:exam) { create(:exam) }
+      before { exam.authorize! user }
+      before { exam.start! user }
+
+      before { get :index, params: exercise_params }
+
+      it { expect(response.status).to eq 403 }
+    end
+  end
+
   describe 'post' do
     before { allow_any_instance_of(DiscussionsController).to receive(:discussion_params).and_return title: 'A title' }
     before { post :create, params: exercise_params }

data/spec/dummy/db/schema.rb

@@ -10,7 +10,7 @@
 #
 # It's strongly recommended that you check this file into your version control system.
 
-ActiveRecord::Schema.define(version: 20201027152806) do
+ActiveRecord::Schema.define(version: 20201130163114) do
 
   # These are extensions that must be enabled in order to support this database
   enable_extension "plpgsql"
@@ -433,6 +433,7 @@ ActiveRecord::Schema.define(version: 20201027152806) do
     t.datetime "privacy_terms_accepted_at"
     t.datetime "legal_terms_accepted_at"
     t.datetime "forum_terms_accepted_at"
+    t.boolean "banned_from_forum"
     t.index ["avatar_type", "avatar_id"], name: "index_users_on_avatar_type_and_avatar_id"
     t.index ["disabled_at"], name: "index_users_on_disabled_at"
     t.index ["last_organization_id"], name: "index_users_on_last_organization_id"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: mumuki-laboratory
 version: !ruby/object:Gem::Version
-  version: 8.1.1
+  version: 8.1.2
 platform: ruby
 authors:
 - Franco Bulgarelli
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-12-06 00:00:00.000000000 Z
+date: 2020-12-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -114,14 +114,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.23'
+        version: '1.24'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.23'
+        version: '1.24'
 - !ruby/object:Gem::Dependency
   name: muvment
   requirement: !ruby/object:Gem::Requirement
@@ -849,121 +849,121 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.2
+rubygems_version: 3.0.3
 signing_key: 
 specification_version: 4
 summary: Code assement web application for the Mumuki Platform.
 test_files:
-- spec/javascripts/gamification-spec.js
+- spec/controllers/guide_progress_controller_spec.rb
+- spec/controllers/discussions_controller_spec.rb
+- spec/controllers/organizations_api_controller_spec.rb
+- spec/controllers/chapters_controller_spec.rb
+- spec/controllers/invitations_controller_spec.rb
+- spec/controllers/messages_controller_spec.rb
+- spec/controllers/courses_api_controller_spec.rb
+- spec/controllers/confirmations_controller_spec.rb
+- spec/controllers/students_api_controller_spec.rb
+- spec/controllers/api_clients_controller.rb
+- spec/controllers/exercise_solutions_controller_spec.rb
+- spec/controllers/discussions_messages_controller_spec.rb
+- spec/controllers/users_api_controller_spec.rb
+- spec/controllers/users_controller_spec.rb
+- spec/spec_helper.rb
+- spec/api_helper.rb
+- spec/mailers/user_mailer_spec.rb
+- spec/mailers/previews/user_mailer_preview.rb
+- spec/javascripts/elipsis-spec.js
 - spec/javascripts/csrf-token-spec.js
-- spec/javascripts/results-renderers-spec.js
-- spec/javascripts/bridge-spec.js
+- spec/javascripts/global-spec.js
+- spec/javascripts/events-spec.js
+- spec/javascripts/gamification-spec.js
+- spec/javascripts/sync-mode-spec.js
+- spec/javascripts/exercise-spec.js
+- spec/javascripts/timer-spec.js
 - spec/javascripts/editors-spec.js
 - spec/javascripts/spec-helper.js
+- spec/javascripts/speech-bubble-renderer-spec.js
 - spec/javascripts/submissions-store-spec.js
+- spec/javascripts/results-renderers-spec.js
+- spec/javascripts/bridge-spec.js
 - spec/javascripts/timeout-spec.js
-- spec/javascripts/timer-spec.js
-- spec/javascripts/events-spec.js
-- spec/javascripts/exercise-spec.js
-- spec/javascripts/speech-bubble-renderer-spec.js
-- spec/javascripts/elipsis-spec.js
-- spec/javascripts/sync-mode-spec.js
-- spec/javascripts/global-spec.js
-- spec/spec_helper.rb
-- spec/dummy/config/locales/en.yml
-- spec/dummy/config/spring.rb
-- spec/dummy/config/database.travis.yml
-- spec/dummy/config/secrets.yml
-- spec/dummy/config/puma.rb
-- spec/dummy/config/environment.rb
-- spec/dummy/config/application.rb
-- spec/dummy/config/database.yml
-- spec/dummy/config/rabbit.yml
-- spec/dummy/config/boot.rb
-- spec/dummy/config/routes.rb
-- spec/dummy/config/cable.yml
-- spec/dummy/config/environments/test.rb
-- spec/dummy/config/environments/development.rb
-- spec/dummy/config/initializers/wrap_parameters.rb
-- spec/dummy/config/initializers/assets.rb
-- spec/dummy/config/initializers/cookies_serializer.rb
-- spec/dummy/config/initializers/filter_parameter_logging.rb
-- spec/dummy/config.ru
-- spec/dummy/public/medal/outline.svg
-- spec/dummy/public/character/animations.json
-- spec/dummy/public/error/403.svg
-- spec/dummy/public/error/410.svg
-- spec/dummy/public/error/timeout_3.svg
-- spec/dummy/public/error/401.svg
-- spec/dummy/public/error/500.svg
-- spec/dummy/public/error/404.svg
-- spec/dummy/public/error/timeout_2.svg
-- spec/dummy/public/error/timeout_1.svg
-- spec/dummy/bin/yarn
-- spec/dummy/bin/rails
-- spec/dummy/bin/setup
-- spec/dummy/bin/update
-- spec/dummy/bin/rake
-- spec/dummy/bin/bundle
-- spec/dummy/db/seeds.rb
-- spec/dummy/db/schema.rb
-- spec/dummy/package.json
-- spec/dummy/Rakefile
-- spec/evaluation_helper.rb
-- spec/helpers/page_title_helper_spec.rb
-- spec/helpers/test_results_rendering_spec.rb
-- spec/helpers/with_choices_spec.rb
-- spec/helpers/authors_helper_spec.rb
 - spec/helpers/avatar_helper_spec.rb
-- spec/helpers/icons_helper_spec.rb
-- spec/helpers/email_helper_spec.rb
-- spec/helpers/application_helper_spec.rb
-- spec/helpers/breadcrumbs_helper_spec.rb
 - spec/helpers/with_navigation_spec.rb
 - spec/helpers/exercise_input_helper_spec.rb
-- spec/login_helper.rb
-- spec/mailers/previews/user_mailer_preview.rb
-- spec/mailers/user_mailer_spec.rb
-- spec/controllers/guide_progress_controller_spec.rb
-- spec/controllers/students_api_controller_spec.rb
-- spec/controllers/messages_controller_spec.rb
-- spec/controllers/users_api_controller_spec.rb
-- spec/controllers/chapters_controller_spec.rb
-- spec/controllers/users_controller_spec.rb
-- spec/controllers/discussions_messages_controller_spec.rb
-- spec/controllers/courses_api_controller_spec.rb
-- spec/controllers/organizations_api_controller_spec.rb
-- spec/controllers/api_clients_controller.rb
-- spec/controllers/discussions_controller_spec.rb
-- spec/controllers/exercise_solutions_controller_spec.rb
-- spec/controllers/confirmations_controller_spec.rb
-- spec/controllers/invitations_controller_spec.rb
-- spec/capybara_helper.rb
-- spec/teaspoon_env.rb
+- spec/helpers/authors_helper_spec.rb
+- spec/helpers/with_choices_spec.rb
+- spec/helpers/application_helper_spec.rb
+- spec/helpers/breadcrumbs_helper_spec.rb
+- spec/helpers/email_helper_spec.rb
+- spec/helpers/page_title_helper_spec.rb
+- spec/helpers/test_results_rendering_spec.rb
+- spec/helpers/icons_helper_spec.rb
+- spec/features/complements_flow_spec.rb
+- spec/features/progressive_tips_spec.rb
+- spec/features/runner_assets_spec.rb
 - spec/features/disable_user_flow_spec.rb
-- spec/features/invitations_flow_spec.rb
-- spec/features/topic_flow_spec.rb
-- spec/features/guide_reset_spec.rb
-- spec/features/discussion_flow_spec.rb
 - spec/features/links_flow_spec.rb
-- spec/features/not_found_private_flow_spec.rb
 - spec/features/not_found_public_flow_spec.rb
-- spec/features/exercise_flow_spec.rb
 - spec/features/standard_flow_spec.rb
-- spec/features/menu_bar_spec.rb
-- spec/features/dynamic_exam_spec.rb
+- spec/features/exercise_flow_spec.rb
+- spec/features/disabled_organization_flow_spec.rb
 - spec/features/immersive_redirection_spec.rb
-- spec/features/runner_assets_spec.rb
-- spec/features/progressive_tips_spec.rb
-- spec/features/chapter_spec.rb
-- spec/features/terms_flow_spec.rb
-- spec/features/login_flow_spec.rb
-- spec/features/home_public_flow_spec.rb
+- spec/features/topic_flow_spec.rb
+- spec/features/home_private_flow_spec.rb
 - spec/features/profile_flow_spec.rb
-- spec/features/lessons_flow_spec.rb
-- spec/features/disabled_organization_flow_spec.rb
-- spec/features/complements_flow_spec.rb
+- spec/features/home_public_flow_spec.rb
+- spec/features/menu_bar_spec.rb
+- spec/features/not_found_private_flow_spec.rb
+- spec/features/chapter_spec.rb
+- spec/features/discussion_flow_spec.rb
+- spec/features/invitations_flow_spec.rb
 - spec/features/exams_flow_spec.rb
 - spec/features/guides_flow_spec.rb
-- spec/features/home_private_flow_spec.rb
-- spec/api_helper.rb
+- spec/features/dynamic_exam_spec.rb
+- spec/features/terms_flow_spec.rb
+- spec/features/lessons_flow_spec.rb
+- spec/features/login_flow_spec.rb
+- spec/features/guide_reset_spec.rb
+- spec/evaluation_helper.rb
+- spec/login_helper.rb
+- spec/dummy/db/seeds.rb
+- spec/dummy/db/schema.rb
+- spec/dummy/public/character/animations.json
+- spec/dummy/public/error/500.svg
+- spec/dummy/public/error/timeout_2.svg
+- spec/dummy/public/error/401.svg
+- spec/dummy/public/error/timeout_3.svg
+- spec/dummy/public/error/410.svg
+- spec/dummy/public/error/404.svg
+- spec/dummy/public/error/timeout_1.svg
+- spec/dummy/public/error/403.svg
+- spec/dummy/public/medal/outline.svg
+- spec/dummy/package.json
+- spec/dummy/config/initializers/filter_parameter_logging.rb
+- spec/dummy/config/initializers/wrap_parameters.rb
+- spec/dummy/config/initializers/cookies_serializer.rb
+- spec/dummy/config/initializers/assets.rb
+- spec/dummy/config/database.yml
+- spec/dummy/config/routes.rb
+- spec/dummy/config/cable.yml
+- spec/dummy/config/spring.rb
+- spec/dummy/config/boot.rb
+- spec/dummy/config/puma.rb
+- spec/dummy/config/environments/development.rb
+- spec/dummy/config/environments/test.rb
+- spec/dummy/config/database.travis.yml
+- spec/dummy/config/rabbit.yml
+- spec/dummy/config/secrets.yml
+- spec/dummy/config/locales/en.yml
+- spec/dummy/config/application.rb
+- spec/dummy/config/environment.rb
+- spec/dummy/Rakefile
+- spec/dummy/bin/setup
+- spec/dummy/bin/rake
+- spec/dummy/bin/bundle
+- spec/dummy/bin/update
+- spec/dummy/bin/yarn
+- spec/dummy/bin/rails
+- spec/dummy/config.ru
+- spec/teaspoon_env.rb
+- spec/capybara_helper.rb