mumuki-laboratory 5.5.0 → 5.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a40f596693f402240e506ca625b2562809f3d77ccd5422ec322b1b8dd3a0f48c
-  data.tar.gz: 40b3b07e73b77804a1884d8ee6d6ad4d9ca80c636bdabe379411f73d159eb00f
+  metadata.gz: 725657dbab5f674de31aa11fb8636bd7f4077b015d0029ee36c264f302592eb8
+  data.tar.gz: 28e5841b4a4d81abc05a288061a18969f53c544f91c771a30d6464d598869d6d
 SHA512:
-  metadata.gz: e20ea051587798caeecbb8e774adece970c19d714b39c102505ce52847a2dcd0e5afa5081aebb9c28ad64c4686786ac4e548b4cf3c048af9d2f4e08221cee7f0
-  data.tar.gz: 38f858df0af512db29f1febad4f7fa007395cbf328a7272904585985dbf8ce2e0bde0fe674eb7335b7e983862fda7e160f1a5c5588910805385c138d4d8eaf17
+  metadata.gz: 8e55a4187adfb14ab2dd6ca45cfc9d564d8b94766af2e5dd502101f48e13073fca72afe65108536fb4f5fb879c864cdd445593fbbefe48be99f8831d5b33a75f
+  data.tar.gz: a91cdd87b7c2d852ee3d7aa54d7195b2541fca34526339e1eedf17f742246fedf15bf5500e51511415c669aa657e7029cdba360fc55bf138d687aacf4f324779

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

@@ -0,0 +1,43 @@
+var mumuki = mumuki || {};
+
+mumuki.load(function () {
+  var $newDiscussionModal = $('.new-discussion-modal');
+  var $newDiscussion = $('.discussion-create');
+
+  $newDiscussion.click(function () {
+    $newDiscussionModal.modal({
+      backdrop: 'static',
+      keyboard: false
+    });
+  });
+
+  var $subscriptionSpans = $('.discussion-subscription > span');
+  var $upvoteSpans = $('.discussion-upvote > span');
+
+  var Forum = {
+    toggleButton: function (spans) {
+      spans.toggleClass('hidden');
+    },
+    token: new mumuki.CsrfToken(),
+    discussionSubscription: function (url) {
+      Forum.discussionPostAndToggle(url, $subscriptionSpans)
+    },
+    discussionUpvote: function (url) {
+      Forum.discussionPostAndToggle(url, $upvoteSpans)
+    },
+    discussionPostAndToggle: function (url, elem) {
+      Forum.tokenRequest({
+        url: url,
+        method: 'POST',
+        success: Forum.toggleButton(elem),
+        xhrFields: {withCredentials: true}
+      })
+    },
+    tokenRequest: function (data) {
+      $.ajax(Forum.token.newRequest(data))
+    }
+  };
+
+  mumuki.Forum = Forum;
+
+});

data/app/assets/stylesheets/application/_modules.scss

@@ -19,3 +19,5 @@
 @import "modules/gs-board";
 @import "modules/kids";
 @import "modules/kids_results";
+@import "modules/discussion";
+@import "modules/pagination";

data/app/assets/stylesheets/application/modules/_checkboxes.scss

@@ -8,14 +8,27 @@
   top: 6px;
 }
 
-.complementary-checkbox label::after {
-  width: 17px;
-  height: 17px;
-  line-height: 14px;
-  border-radius: 3px;
-  border: 1px solid $brand-complementary;
+.complementary-checkbox {
+  label::after {
+    width: 17px;
+    height: 17px;
+    line-height: 14px;
+    border-radius: 3px;
+    border: 1px solid $brand-complementary;
+  }
+  input[type="checkbox"]:disabled.mu-read-only + label {
+    opacity: 1;
+    cursor: unset;
+  }
 }
-.complementary-radio label::after {
-  top: 9px;
+
+.complementary-radio{
+  label::after {
+    top: 9px;
+  }
+  input[type="radio"]:disabled.mu-read-only + label {
+    opacity: 1;
+    cursor: unset;
+  }
 }
 

data/app/assets/stylesheets/application/modules/_discussion.scss

@@ -0,0 +1,339 @@
+$discussion-message-arrow-size: 10px;
+$discussion-message-border-color: #cccccc;
+$discussion-toolbar-border-color: #e1e4e8;
+$discussion-toolbar-color: #f6f6fa;
+$message-divider-color: #ecf0f1;
+$discussion-button-color: #fafafa;
+$toolbar-filter-color: #808080;
+
+.discussions-list {
+  margin: 30px 0;
+  .discussion {
+    padding: 10px 15px;
+    display: table;
+    table-layout: fixed;
+    width: 100%;
+    &:hover {
+      background-color: darken(white, 2%);
+    }
+    border: 1px solid $discussion-message-border-color;
+  }
+  a {
+    color: unset;
+    text-decoration: unset;
+    &:not(:last-child) > .discussion {
+      border-bottom: 0;
+    }
+  }
+
+  .discussions-reset-query {
+    color: #6a737d;
+    font-weight: 600;
+    &:hover {
+      color: inherit;
+    }
+  }
+
+  .discussion-pagination {
+    display: flex;
+    flex-direction: row;
+    align-items: center;
+    justify-content: center;
+  }
+
+  .discussion-language-icon {
+    float: right;
+    margin-right: 10px;
+    margin-top: 6px;
+    -ms-transform: scale(1.4, 1.4);
+    -webkit-transform: scale(1.4, 1.4);
+    transform: scale(1.4, 1.4);
+  }
+
+  .discussion-icon {
+    -ms-transform: scale(0.8, 0.8);
+    -webkit-transform: scale(0.8, 0.8);
+    transform: scale(0.8, 0.8);
+    margin-left: 5px;
+    float: right;
+    .fa-stack-1x {
+      -ms-transform: scale(0.9, 0.9);
+      -webkit-transform: scale(0.9, 0.9);
+      transform: scale(0.9, 0.9);
+    }
+  }
+}
+
+.discussions-no-filtered-results {
+  padding: 20px;
+  border: 1px solid $discussion-toolbar-border-color;
+  text-align: center;
+  div {
+    margin-bottom: 20px;
+    i {
+      font-size: 28px;
+    }
+  }
+  span {
+    font-size: 24px;
+  }
+}
+
+.discussion-status-icon {
+  padding-right: 10px;
+}
+
+.discussion-row {
+  display: table-cell;
+  vertical-align: middle;
+  .discussion-title {
+    font-size: 18px;
+    font-weight: bold;
+  }
+  .discussion-description {
+    overflow: hidden;
+    display: block;
+    text-overflow: ellipsis;
+    white-space: nowrap;
+  }
+}
+
+.discussion-body {
+  display: none;
+}
+
+.discussion-display-more {
+  display: table-cell;
+  width: 30px;
+  margin-right: 0;
+  a {
+    cursor: pointer;
+  }
+}
+
+.discussion-messages-icon {
+  margin-left: 30px;
+  margin-bottom: 5px;
+}
+
+.discussions-toolbar {
+  width: 100%;
+  padding: 10px 20px;
+  display: table;
+  margin-top: 20px;
+  background-color: $discussion-toolbar-color;
+  border: 1px solid $discussion-toolbar-border-color;
+  border-radius: 3px 3px 0 0;
+  border-bottom: none;
+  .discussions-toolbar-status {
+    float: left;
+    li {
+      text-decoration: none;
+      display: inline;
+      margin-right: 15px;
+      &:not(.selected) .status-icon, span {
+        color: $toolbar-filter-color;
+      }
+      &:hover span {
+        color: darken($toolbar-filter-color, 20%);
+      }
+      &.selected span {
+        color: darken($toolbar-filter-color, 40%);
+        font-weight: bold;
+      }
+    }
+  }
+  .discussions-toolbar-filter {
+    float: right;
+    margin-right: 20px;
+    cursor: pointer;
+    li.selected {
+      a {
+        font-weight: bold;
+        padding-left: 2px;
+        &::before {
+          content: '✓';
+        }
+      }
+    }
+  }
+}
+
+.message-divider {
+  border-top: 1px solid $message-divider-color;
+  margin-top: 20px;
+  width: 100%;
+}
+
+.discussion-user-menu {
+  a {
+    padding: 5px 10px;
+    font-size: 15px;
+    line-height: 20px;
+    border: 1px solid rgba(27, 31, 35, 0.2);
+    border-radius: 0.25em;
+    background-color: $discussion-button-color;
+    font-weight: bold;
+    color: black;
+    cursor: pointer;
+    margin-left: 10px;
+    &:hover {
+      text-decoration: none;
+      background-color: darken($discussion-button-color, 5%);
+      color: black;
+    }
+  }
+}
+
+.discussion-create {
+  cursor: pointer;
+}
+
+.discussion-context {
+  margin-top: 40px;
+}
+
+.discussion-header {
+  position: relative;
+  display: flex;
+  justify-content: flex-start;
+  align-items: center;
+  padding: 0;
+  .discussion-title {
+    font-weight: bold;
+  }
+}
+
+.discussion-description {
+  margin-top: 0;
+  .status-label {
+    margin-right: 2px;
+    font-size: 18px;
+  }
+}
+
+.discussion-tabs {
+  margin-top: 20px;
+}
+
+.discussion-info {
+  font-size: 18px;
+}
+
+.discussion-initiator-name {
+  font-weight: bold;
+}
+
+.discussion-message-content {
+  padding: 15px;
+}
+
+.discussion-new-message-content {
+  resize: none;
+  border-radius: 0;
+  border-color: transparent;
+  &:focus {
+    border-color: white;
+  }
+}
+
+summary.discussion-summary {
+  display: list-item;
+  font-size: 29px;
+  outline: 0;
+  cursor: pointer;
+  .discussion-exercise-title {
+    display: inline;
+  }
+}
+
+.discussion-new-message-button {
+  border-radius: 0;
+  margin-top: 15px;
+}
+
+.discussion-message {
+  position: relative;
+  display: flex;
+  justify-content: center;
+  align-items: start;
+  padding: 0;
+  border: none;
+  margin-top: 30px;
+  .discussion-message-user-avatar {
+    margin-right: 20px;
+  }
+}
+
+.discussion-message-bubble-container {
+  width: 100%;
+}
+
+.discussion-message-bubble {
+  background-color: white;
+  border: 1px solid $discussion-message-border-color;
+  border-radius: 3px;
+  position: relative;
+  .discussion-message-bubble-header {
+    background-color: $mu-color-highlight-background;
+    height: 40px;
+    &:before {
+      position: absolute;
+      top: calc(20px - #{$discussion-message-arrow-size + 2px} / 2);
+      left: -$discussion-message-arrow-size - 2px;
+      border-width: (1px + $discussion-message-arrow-size / 2) (2px + $discussion-message-arrow-size) (1px + $discussion-message-arrow-size / 2) 0;
+      content: '';
+      border-style: solid;
+      border-color: transparent $discussion-message-border-color;
+    }
+    .discussion-message-bubble-title {
+      padding: 5px 15px;
+      display: block;
+      .message-date {
+        font-size: 15px;
+      }
+      .actions {
+        float: right;
+        i {
+          color: #aaaaaa
+        }
+      }
+    }
+  }
+}
+
+.discussion-actions {
+  display: inline-block;
+  float: right;
+  margin-top: 35px;
+  > form {
+    display: inline;
+  }
+}
+
+$statuses: (
+  closed: ($brand-danger white $brand-danger),
+  opened: (white #333333 #eaeaea),
+  solved: ($brand-success white $brand-success),
+  pending_review: ($brand-success white $brand-success)
+);
+
+@each $status, $style in $statuses {
+  $background-color: nth($style, 1);
+  $font-color: nth($style, 2);
+  $border-color: nth($style, 3);
+
+  .btn-discussion-#{$status} {
+    background-color: $background-color;
+    color: $font-color;
+    border-color: $border-color;
+    margin-left: 5px;
+    &:hover {
+      color: $font-color;
+      border-color: darken($border-color, 3%);
+      background-color: darken($background-color, 3%);
+    }
+  }
+}
+
+

data/app/assets/stylesheets/application/modules/_pagination.scss

@@ -0,0 +1,10 @@
+.pagination li {
+  a, span {
+    background-color: lighten($brand-primary, 10%);
+  }
+  &:hover, &.active, &.active:hover {
+    a, span {
+      background-color: $brand-primary;
+    }
+  }
+}