Continuous Release 1.10.1

Merge pull request #604 from MaMpf-HD/dev
MaMpf-HD · Mar 23, 2024 · a0e26f8 · a0e26f8
2 parents ee2bc9a + 4e734a4
commit a0e26f8
Show file tree

Hide file tree

Showing 24 changed files with 220 additions and 110 deletions.
diff --git a/app/abilities/answer_ability.rb b/app/abilities/answer_ability.rb
@@ -4,10 +4,8 @@ class AnswerAbility
   def initialize(user)
     clear_aliased_actions
 
-    can [:new, :create, :update, :destroy], Answer do |answer|
+    can [:new, :create, :update, :destroy, :cancel_edit], Answer do |answer|
       answer.question.present? && user.can_edit?(answer.question)
     end
-
-    can :update_answer_box, Answer
   end
 end
diff --git a/app/assets/javascripts/answers.coffee b/app/assets/javascripts/answers.coffee
diff --git a/app/assets/javascripts/answers.coffee.erb b/app/assets/javascripts/answers.coffee.erb
@@ -0,0 +1,90 @@
+<% environment.context_class.instance_eval { include ApplicationHelper } %>
+
+# The "target button" is either the "discard" button or the "edit" button
+# what its purpose is is stored in this object with a mapping:
+# answerId -> boolean
+targetButtonIsDiscardButton = {}
+
+# Set of answer ids that have a discard listener registered
+# This is to avoid registering the same listener multiple times.
+window.registeredDiscardListeners = new Set(); 
+
+$(document).on 'turbolinks:load', ->
+
+  $(document).on 'shown.bs.collapse', '[id^="collapse-answer-"]', ->
+    # Answer is now shown to the user and can be edited
+    answerId = $(this).data('id');
+    registerDiscardListeners();
+    targetButtonIsDiscardButton[answerId] = true;
+    $target = $('#targets-answer-' + answerId)
+    $target.empty().append($target.data('discard'))
+      .removeClass('btn-primary').addClass('btn-secondary')
+
+  $(document).on 'hidden.bs.collapse', '[id^="collapse-answer-"]', ->
+    # Answer is now hidden from the user
+    answerId = $(this).data('id')
+    targetButtonIsDiscardButton[answerId] = false;
+    $target = $('#targets-answer-' + answerId)
+    $target.empty().append($target.data('edit'))
+      .removeClass('btn-secondary').addClass('btn-primary')
+
+  # Appearance of box
+  $(document).on 'change', '[id^="answer-value-"]', ->
+    id = $(this).data('id')
+    isCorrectAnswer = $('#answer-true-' + id).is(':checked')
+
+    # Set background color
+    if isCorrectAnswer
+      newClass = "<%= bgcolor(true) %>";
+    else
+      newClass = "<%= bgcolor(false) %>";
+    $('#answer-header-' + id)
+      .removeClass('bg-correct')
+      .removeClass('bg-incorrect')
+      .addClass(newClass)
+
+    # Set ballot box
+    answerBox = $('#answer-box-' + id)
+    answerBox.empty()
+    if isCorrectAnswer
+      answerBox.append '<%= ballot_box(true) %>'
+    else
+      answerBox.append '<%= ballot_box(false) %>'
+
+  # Cancel new answer creation
+  $(document).on 'click', '#new-answer-cancel', ->
+    $('#new-answer').show()
+    $('#new-answer-field').empty()
+
+# clean up everything before turbolinks caches
+$(document).on 'turbolinks:before-cache', ->
+  $(document).off 'shown.bs.collapse', '[id^="collapse-answer-"]'
+  $(document).off 'hidden.bs.collapse', '[id^="collapse-answer-"]'
+  $(document).off 'change', '[id^="answer-value-"]'
+  $(document).off 'click', '#new-answer-cancel'
+
+
+registerDiscardListeners = () ->
+  buttons = $('[id^=targets-answer-]');
+  $.each(buttons, (i,btn) ->
+    btn = $(btn);
+    answerId = btn.attr('id').split('-')[2];
+
+    # Don't register listeners multiple times
+    if answerId in window.registeredDiscardListeners
+      return;
+
+    window.registeredDiscardListeners.add(answerId);
+    $(this).on('click', (evt) =>
+      isDiscardButton = targetButtonIsDiscardButton[answerId];
+      if not isDiscardButton
+        return;
+
+      # On discard
+      $.ajax Routes.cancel_edit_answer_path(answerId),
+        type: 'GET'
+        dataType: 'script'
+        error: (jqXHR, textStatus, errorThrown) ->
+          console.log("AJAX Error: #{textStatus}")
+    );
+  );
diff --git a/app/assets/javascripts/lectures.coffee b/app/assets/javascripts/lectures.coffee
@@ -103,13 +103,13 @@ $(document).on 'turbolinks:load', ->
   # hide the media tab if hide media button is clicked
   $('#hide-media-button').on 'click', ->
     $('#lecture-media-card').hide()
-    $('#lecture-content-card').removeClass('col-xxxl-9')
+    $('#lecture-content-card').removeClass('col-xxl-9')
     $('#show-media-button').show()
     return
 
   # display the media tab if show media button is clicked
   $('#show-media-button').on 'click', ->
-    $('#lecture-content-card').addClass('col-xxxl-9')
+    $('#lecture-content-card').addClass('col-xxl-9')
     $('#lecture-media-card').show()
     $('#show-media-button').hide()
     return

diff --git a/app/assets/stylesheets/application.scss b/app/assets/stylesheets/application.scss
@@ -27,9 +27,6 @@ $grid-breakpoints: (
   lg: 992px,
   xl: 1200px,
   xxl: 1440px,
-  xxxl: 1600px,
-  xxxxl: 1920px,
-  xxxxxl: 2160px
 );
 
 $container-max-widths: (
@@ -41,9 +38,6 @@ $container-max-widths: (
   lg: 992px,
   xl: 1200px,
   xxl: 1440px,
-  xxxl: 1600px,
-  xxxxl: 1920px,
-  xxxxxl: 2160px
 );
 
 
@@ -306,4 +300,15 @@ a {
 
 .toast {
   background-color: white;
+}
+
+.small-width {
+  max-width: 900px;
+}
+
+.subtle-background {
+  flex: 1;
+  background: radial-gradient(circle at top right, transparent 10%, #fafdff 10%, #fafdff 20%, transparent 21%), radial-gradient(circle at left bottom, transparent 10%, #fafdff 10%, #fafdff 20%, transparent 21%), radial-gradient(circle at top left, transparent 10%, #fafdff 10%, #fafdff 20%, transparent 21%), radial-gradient(circle at right bottom, transparent 10%, #fafdff 10%, #fafdff 20%, transparent 21%), radial-gradient(circle at center, #fafdff 30%, transparent 31%);
+  background-size: 6em 6em;
+  background-color: #ffffff;
 }
diff --git a/app/assets/stylesheets/comments.scss b/app/assets/stylesheets/comments.scss
@@ -3,4 +3,21 @@
 
 #toggleCommentPreviewWrapper {
     padding-left: $form-check-padding-start + $form-check-input-width;
+}
+
+.form-control.commentForm {
+    border-color: #4173b4;
+    border-width: 1.5px;
+}
+
+.comment-field {
+    backdrop-filter: blur(8px);
+    background-color: rgba(255, 255, 255, 0.44);
+    padding: 6px !important;
+}
+
+.comment {
+    border: solid 1.5px #d2d2d2 !important;
+    border-radius: 4px;
+    box-shadow: rgba(0,0,0,0.025) 0px 2px 5px;
 }
diff --git a/app/controllers/answers_controller.rb b/app/controllers/answers_controller.rb
@@ -1,6 +1,6 @@
 # AnswersController
 class AnswersController < ApplicationController
-  before_action :set_answer, except: [:new, :create, :update_answer_box]
+  before_action :set_answer, except: [:new, :create]
   authorize_resource except: [:new, :create]
 
   def current_ability
@@ -34,9 +34,8 @@ def destroy
     @success = true
   end
 
-  def update_answer_box
-    @answer_id = params[:answer_id].to_i
-    @value = params[:value] == "true"
+  def cancel_edit
+    I18n.locale = @answer.question&.locale_with_inheritance
   end
 
   private

diff --git a/app/controllers/media_controller.rb b/app/controllers/media_controller.rb
@@ -441,7 +441,7 @@ def statistics
 
   def show_comments
     commontator_thread_show(@medium)
-    render layout: "application_no_sidebar"
+    render layout: "application_no_sidebar_with_background"
   end
 
   def cancel_publication

diff --git a/app/views/administration/_navbar.html.erb b/app/views/administration/_navbar.html.erb
@@ -37,7 +37,7 @@
 
       <li class="nav-item" id="adminSearch">
         <%= link_to '', administration_search_path,
-                  class: 'nav-link bi bi-binoculars-fill ' + get_class_for_path(administration_search_path()),
+                  class: 'nav-link bi bi-search ' + get_class_for_path(administration_search_path()),
                   data: { 'bs-toggle': 'tooltip' },
                   title: t('navbar.search') %>
       </li>

diff --git a/app/views/administration/index.html.erb b/app/views/administration/index.html.erb
@@ -1,10 +1,10 @@
 <div class="row mt-3 pr-2">
   <div class="col-12 col-md-8">
     <div class="row">
-      <div class="col-12 col-xxxl-8 mb-2">
+      <div class="col-12 col-xxl-8 mb-2">
         <%= render partial: 'administration/index/my_lectures' %>
       </div>
-      <div class="col-12 col-xxxl-4 mb-2">
+      <div class="col-12 col-xxl-4 mb-2">
         <%= render partial: 'administration/index/my_courses' %>
       </div>
     </div>

diff --git a/app/views/answers/cancel_edit.js.erb b/app/views/answers/cancel_edit.js.erb
@@ -0,0 +1,39 @@
+var answerId = <%= @answer.id %>;
+var answerCard = $(`#answers-accordion > #answer-card-${answerId}`);
+window.registeredDiscardListeners.delete(answerId);
+
+// eslint-disable-next-line @stylistic/quotes
+var newAnswerCardElements = $(`<%= j render partial: 'answers/card', locals: { answer: @answer } %>`).children();
+
+// re-render possible MathJax content
+// eslint-disable-next-line no-undef
+renderMathInElement(newAnswerCardElements.get(0), {
+  delimiters: [
+    {
+      left: "$$",
+      right: "$$",
+      display: true,
+    },
+    {
+      left: "$",
+      right: "$",
+      display: false,
+    },
+    {
+      left: "\\(",
+      right: "\\)",
+      display: false,
+    },
+    {
+      left: "\\[",
+      right: "\\]",
+      display: true,
+    },
+  ],
+  throwOnError: false,
+},
+);
+
+setTimeout(() => {
+  answerCard.empty().append(newAnswerCardElements);
+}, 100);
diff --git a/app/views/answers/update_answer_box.coffee b/app/views/answers/update_answer_box.coffee
diff --git a/app/views/commontator/comments/_form.html.erb b/app/views/commontator/comments/_form.html.erb
@@ -38,7 +38,7 @@
 
   <div class="field">
     <%=
-      form.text_area :body, rows: '7', class: 'form-control commentForm', id: new_record ?
+      form.text_area :body, rows: '7', class: 'form-control commentForm comment-field', id: new_record ?
         comment.parent.nil? ? "commontator-thread-#{@commontator_thread.id}-new-comment-body" :
                               "commontator-comment-#{comment.parent.id}-reply" :
         "commontator-comment-#{comment.id}-edit-body"
@@ -78,7 +78,7 @@
         comment.parent.nil? ? "commontator-thread-#{@commontator_thread.id}-new-comment-body-preview" :
                               "commontator-comment-#{comment.parent.id}-reply-preview" :
         "commontator-comment-#{comment.id}-edit-body-preview" %>'
-       class="border p-2"
+       class="border p-2 comment-field"
        style="display: none; min-height: 3em;">
     <%= commontator_simple_format comment.body %>
   </div>

diff --git a/app/views/commontator/comments/_list.html.erb b/app/views/commontator/comments/_list.html.erb
@@ -1,11 +1,12 @@
+<%= stylesheet_link_tag 'comments' %>
 <%#
   Controllers that use this partial must supply the following variables:
   user
   nested_comments
 %>
 
 <% nested_comments.each do |comment, nested_children| %>
-  <div id="commontator-comment-<%= comment.id %>" class="comment">
+  <div id="commontator-comment-<%= comment.id %>" class="comment comment-field">
     <%=
       render partial: 'commontator/comments/show', formats: [ :html ], locals: {
         user: user, comment: comment, nested_children: nested_children

diff --git a/app/views/commontator/threads/_show.html.erb b/app/views/commontator/threads/_show.html.erb
@@ -1,3 +1,4 @@
+<%= stylesheet_link_tag 'comments' %>
 <%
   # Views that use this partial must supply the following variables:
   # user
@@ -69,7 +70,7 @@
 
   <%= render partial: 'commontator/threads/reply', locals: { thread: thread, user: user } %>
 
-  <div id="commontator-thread-<%= thread.id %>-comment-list" class="comment-list">
+  <div id="commontator-thread-<%= thread.id %>-comment-field">
     <%=
       render partial: 'commontator/comments/list', locals: {
         user: user, nested_comments: nested_comments

diff --git a/app/views/commontator/threads/show.js.erb b/app/views/commontator/threads/show.js.erb
@@ -7,6 +7,6 @@
   }
 %>
 
-$("#commontator-thread-<%= @commontator_thread.id %>-comment-list").hide().fadeIn();
+$("#commontator-thread-<%= @commontator_thread.id %>-comment-field").hide().fadeIn();
 
 <%= javascript_proc %>