+
<%= render partial: 'administration/index/my_lectures' %>
-
+
<%= render partial: 'administration/index/my_courses' %>
diff --git a/app/views/annotations/_annotation_area.html.erb b/app/views/annotations/_annotation_area.html.erb
new file mode 100644
index 000000000..ab0cfa8e8
--- /dev/null
+++ b/app/views/annotations/_annotation_area.html.erb
@@ -0,0 +1,30 @@
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/app/views/annotations/_annotation_locales.html.erb b/app/views/annotations/_annotation_locales.html.erb
new file mode 100644
index 000000000..e7661d764
--- /dev/null
+++ b/app/views/annotations/_annotation_locales.html.erb
@@ -0,0 +1,19 @@
+<% I18n.locale = current_user.locale %>
+
+
+
diff --git a/app/views/annotations/_annotation_modal.html.erb b/app/views/annotations/_annotation_modal.html.erb
new file mode 100644
index 000000000..7c5038921
--- /dev/null
+++ b/app/views/annotations/_annotation_modal.html.erb
@@ -0,0 +1,39 @@
+
diff --git a/app/views/annotations/_form.html.erb b/app/views/annotations/_form.html.erb
new file mode 100644
index 000000000..62cdf13f8
--- /dev/null
+++ b/app/views/annotations/_form.html.erb
@@ -0,0 +1,157 @@
+
+ <%= form_with model: @annotation do |f| %>
+
+ <%= t('admin.annotation.time') %>
+
+ <%= TimeStamp.new(total_seconds: @total_seconds).hms_colon_string %>
+
+
+
+ <%= f.hidden_field :medium_id, value: @medium_id %>
+ <%= f.hidden_field :total_seconds, value: @total_seconds %>
+
+
+ <%= @annotation.id %>
+
+
+
+ <%= @annotation.subcategory %>
+
+
+
+
+
<%= t('admin.annotation.comment') %>
+ <%= f.text_area :comment, class: 'form-control' %>
+
+
+
+
+ <%= t('admin.remark.preview') %>
+
+
+
+
+
+ <% colors = Annotation.colors %>
+ <% for i in 1..15 do %>
+ <%= f.radio_button :color,
+ colors[i],
+ id: "annotation_color#{i}" %>
+ <%= f.label :color,
+ "annotation_color#{i}",
+ for: "annotation_color#{i}" do %>
+
+
+
+
<%= t('admin.annotation.category') %>
+ <%= helpdesk(t('admin.annotation.category_tooltip'), false) %>
+
+
+
+
+
+
+
+ <% annotations_status = Medium.find_by(id: @medium_id).get_annotations_status %>
+ <% if annotations_status == 1 %>
+
+ <%= f.check_box :visible_for_teacher, class: "form-check-input" %>
+ <%= f.label :visible_for_teacher,
+ t('admin.annotation.visible_for_teacher'),
+ class: "form-check-label" %>
+ <%= helpdesk(t('admin.annotation.visible_for_teacher_helpdesk'), false) %>
+
+ <% else %>
+ <%= f.hidden_field :visible_for_teacher, value: false %>
+ <% end %>
+
+
+
+ <%= f.check_box :post_as_comment, class: "form-check-input" %>
+ <%= f.label :post_as_comment,
+ t('admin.annotation.post_as_comment'),
+ class: "form-check-label" %>
+ <%= helpdesk(t('admin.annotation.post_as_comment_helpdesk'), false) %>
+
+
+
+
+
+ <% end %>
+
diff --git a/app/views/annotations/_form_content.html.erb b/app/views/annotations/_form_content.html.erb
new file mode 100644
index 000000000..3ea42b6f7
--- /dev/null
+++ b/app/views/annotations/_form_content.html.erb
@@ -0,0 +1,44 @@
+
<%= t('admin.annotation.whats_the_problem') %>
+
+
+
+
+
+
diff --git a/app/views/annotations/duplicate_comment.js.erb b/app/views/annotations/duplicate_comment.js.erb
new file mode 100644
index 000000000..51a33fe4b
--- /dev/null
+++ b/app/views/annotations/duplicate_comment.js.erb
@@ -0,0 +1,4 @@
+var $warningElement = $("#annotation-comment-warning");
+var message = document.getElementById("annotation-locales").dataset.warningDoublePosted;
+$warningElement.html(message);
+$warningElement.show();
diff --git a/app/views/annotations/edit.js.erb b/app/views/annotations/edit.js.erb
new file mode 100644
index 000000000..c7b199108
--- /dev/null
+++ b/app/views/annotations/edit.js.erb
@@ -0,0 +1,286 @@
+// When the modal opens, all key listeners must be
+// deactivated until the modal gets closed again
+thymeAttributes.lockKeyListeners = true;
+$("#annotation-modal").on("hidden.bs.modal", function () {
+ thymeAttributes.lockKeyListeners = false;
+});
+
+$("#annotation-modal-content").empty()
+ .append("<%= j render partial: "annotations/form"%>");
+$("#annotation-modal").modal("show");
+
+var submitButton = document.getElementById("annotation-modal-submit-button");
+var $postAsComment = $("#annotation_post_as_comment");
+var posted = <%= @posted %>;
+var isNewAnnotation = <%= @is_new_annotation %>;
+
+$postAsComment.on("change", function () {
+ // Don't show warnings if the annotation was already posted
+ if (posted) {
+ return;
+ }
+
+ if (this.checked) {
+ const $warningElement = $("#annotation-comment-warning");
+ const message = constructWarningMessage();
+ $warningElement.html(message);
+ $warningElement.show();
+ }
+ else {
+ $("#annotation-comment-warning").hide();
+ }
+});
+
+function constructWarningMessage() {
+ let message = $("#annotation-locales").data("warningPublishing");
+
+ const mistakeRatio = $("#annotation_category_mistake");
+ if (!mistakeRatio.is(":checked")) {
+ return message;
+ }
+
+ // Mistake specific warnings
+ $.ajax(Routes.num_nearby_posted_mistake_annotations_path(), {
+ type: "GET",
+ dataType: "json",
+ async: false,
+ data: {
+ mediumId: thyme.dataset.medium,
+ timestamp: video.currentTime,
+ },
+ success: function (count) {
+ const locale = $("#annotation-locales");
+ message += "
";
+ if (!count) {
+ message += $("#annotation-locales").data("warningMistake");
+ }
+ else if (count == 1) {
+ message += locale.data("warningOneCloseAnnotation");
+ }
+ else {
+ message += locale.data("warningMultipleCloseAnnotations1")
+ + count + locale.data("warningMultipleCloseAnnotations2");
+ }
+ return message;
+ },
+ error: function (err) {
+ console.error("Error while fetching nearby annotations");
+ console.error(err);
+ return message;
+ },
+ });
+
+ return message;
+}
+
+/*
+ * CATEGORY
+ */
+
+var categoryRadios = document.getElementById("category-radios");
+
+categoryRadios.addEventListener("click", function (evt) {
+ if (evt.target && event.target.matches("input[type='radio']")) {
+ switch (evt.target.value) {
+ case Category.NOTE.name:
+ note();
+ break;
+ case Category.CONTENT.name:
+ content();
+ break;
+ case Category.MISTAKE.name:
+ mistake();
+ break;
+ case Category.PRESENTATION.name:
+ presentation();
+ break;
+ }
+ }
+});
+
+function note() {
+ $("#annotation-category-specific").empty();
+ submitButton.disabled = false;
+ visibleForTeacher(false);
+ postComment(false);
+}
+
+function content() {
+ $("#annotation-category-specific").empty()
+ .append("<%= j render partial: "annotations/form_content"%>");
+ // disable submit button until the content category is selected
+ submitButton.disabled = true;
+ visibleForTeacher(true);
+ postComment(false);
+ var contentCategoryRadios = document.getElementById("content-category-radios");
+ contentCategoryRadios.addEventListener("click", function (evt) {
+ if (evt.target && event.target.matches("input[type='radio']")) {
+ submitButton.disabled = false;
+ }
+ });
+}
+
+function mistake() {
+ $("#annotation-category-specific").empty();
+ submitButton.disabled = false;
+ visibleForTeacher(true);
+ postComment(true);
+}
+
+function presentation() {
+ $("#annotation-category-specific").empty();
+ submitButton.disabled = false;
+ visibleForTeacher(true);
+ postComment(false);
+}
+
+function updatePreview() {
+ const text = $("#annotation_comment").val();
+ $("#annotation-modal-preview").empty();
+ $("#annotation-modal-preview").append(text.replaceAll("\n", "
"));
+ renderMathInElement(document.getElementById("annotation-modal-preview"), {
+ delimiters: [
+ {
+ left: "$$",
+ right: "$$",
+ display: true,
+ }, {
+ left: "$",
+ right: "$",
+ display: false,
+ }, {
+ left: "\\(",
+ right: "\\)",
+ display: false,
+ }, {
+ left: "\\[",
+ right: "\\]",
+ display: true,
+ },
+ ],
+ throwOnError: false,
+ });
+}
+
+/*
+ * Color
+ */
+function initModalBackgroundAnnotationColor() {
+ // Init event handler
+ $("#annotation-color-picker").on("click", "input[type='radio']", function (event) {
+ setModalColor(event.target.value);
+ });
+
+ // New annotation
+ if (isNewAnnotation) {
+ const randomNumber = Math.floor(Math.random() * 15) + 1;
+ const colorRadio = $(`#annotation_color${randomNumber}`);
+ colorRadio.click();
+ return;
+ }
+
+ // Edit annotation
+ const $selectedColor = $("#annotation-color-picker input[type=radio]:checked");
+ if ($selectedColor.length) {
+ $selectedColor.click();
+ }
+}
+
+function setModalColor(hexColorString) {
+ const color = thymeUtility.lightenUp(hexColorString, 2);
+ $(".modal-header").css("background-color", color);
+}
+
+initModalBackgroundAnnotationColor();
+
+/*
+ * Auxiliary methods
+ */
+function visibleForTeacher(isVisible) {
+ $("#annotation_visible_for_teacher").prop("checked", isVisible).trigger("change");
+}
+
+function postComment(isVisible) {
+ isVisible = posted ? true : isVisible;
+ $("#annotation_post_as_comment").prop("checked", isVisible).trigger("change");
+}
+
+function previewCSS(shouldShowPreview) {
+ if (shouldShowPreview) {
+ updatePreview();
+ $("#annotation-preview-section").show();
+
+ $("#annotation-modal-dialog").removeClass("annotation-dialog-normal");
+ $("#annotation-modal-dialog").addClass("annotation-dialog-expanded");
+
+ $("#annotation-content-section").addClass("annotation-content-spacing");
+ $("#annotation-content-section").removeClass("annotation-content-normal");
+ $("#annotation-content-section").addClass("annotation-content-expanded");
+ }
+ else {
+ $("#annotation-preview-section").hide();
+
+ $("#annotation-modal-dialog").removeClass("annotation-dialog-expanded");
+ $("#annotation-modal-dialog").addClass("annotation-dialog-normal");
+
+ $("#annotation-content-section").removeClass("annotation-content-spacing");
+ $("#annotation-content-section").removeClass("annotation-content-expanded");
+ $("#annotation-content-section").addClass("annotation-content-normal");
+ }
+}
+
+// Change modal title depending on the method that opens the modal
+var editSpan = $("#modal-title-edit-annotation");
+var createSpan = $("#modal-title-create-annotation");
+
+<% if action_name == 'new' %>
+createSpan.show();
+editSpan.hide();
+<% elsif action_name == 'edit' %>
+createSpan.hide();
+editSpan.show();
+<% end %>
+
+/* If this script is rendered by the edit method of the annotation controller:
+ Select correct subcategory (this is not automatically done by the rails form
+ as the content is dynamically rendered). */
+var contentRadio = $("#annotation_category_content");
+if (contentRadio.is(":checked")) {
+ content();
+ submitButton.disabled = false;
+ var subcategory = document.getElementById("annotation_subcategory").textContent.replace(/[^a-z]/g, "");
+ switch (subcategory) {
+ case Subcategory.DEFINITION.name:
+ document.getElementById("content-category-definition").checked = true;
+ break;
+ case Subcategory.ARGUMENT.name:
+ document.getElementById("content-category-argument").checked = true;
+ break;
+ case Subcategory.STRATEGY.name:
+ document.getElementById("content-category-strategy").checked = true;
+ break;
+ }
+}
+
+// render preview
+var annotationComment = document.getElementById("annotation_comment");
+annotationComment.addEventListener("input", function () {
+ updatePreview();
+});
+previewCSS(false); // Initialize modal without preview
+
+// preview toggle listener
+var previewToggle = document.getElementById("preview-toggle");
+previewToggle.addEventListener("change", function () {
+ const shouldShowPreview = $("#preview-toggle-check").is(":checked");
+ previewCSS(shouldShowPreview);
+});
+
+// disable post comment checkbox if annotation was already posted
+if (posted) {
+ postComment(true);
+ $postAsComment.get(0).disabled = true;
+}
+
+initBootstrapPopovers();
+previewCSS(true);
diff --git a/app/views/annotations/update.js.erb b/app/views/annotations/update.js.erb
new file mode 100644
index 000000000..10e43f354
--- /dev/null
+++ b/app/views/annotations/update.js.erb
@@ -0,0 +1,11 @@
+// Update annotations after submitting the annotations form
+thymeAttributes.annotationManager.updateAnnotations(() => {
+ // After creation/update of an annotation,
+ // show the annotation in the annotation area.
+ <% if @annotation %>
+ var newAnnotationId = <%= @annotation.id %>;
+ thymeAttributes.annotationArea.showAnnotationWithId(newAnnotationId);
+ <% end %>
+});
+
+$("#annotation-modal").modal("hide");
diff --git a/app/views/answers/cancel_edit.js.erb b/app/views/answers/cancel_edit.js.erb
new file mode 100644
index 000000000..7fafd4631
--- /dev/null
+++ 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
deleted file mode 100644
index 4d1a0971f..000000000
--- a/app/views/answers/update_answer_box.coffee
+++ /dev/null
@@ -1,3 +0,0 @@
-$('#answer-box-<%= @answer_id %>').empty().append '<%= ballot_box(@value) %>'
-$('#answer-header-<%= @answer_id %>').removeClass('bg-correct')
- .removeClass('bg-incorrect').addClass '<%= bgcolor(@value) %>'
diff --git a/app/views/commontator/comments/_body.html.erb b/app/views/commontator/comments/_body.html.erb
index 6ec78b6ee..f6e3df238 100644
--- a/app/views/commontator/comments/_body.html.erb
+++ b/app/views/commontator/comments/_body.html.erb
@@ -4,3 +4,14 @@
%>
<%= commontator_simple_format comment.body %>
+
+
+<% annotation = comment.annotation %>
+<% unless annotation.nil? %>
+ <% medium = annotation.medium %>
+ <% timestamp = annotation.timestamp %>
+
+ Timestamp:
+
+ <%= timestamp.hms_colon_string %>
+<% end %>
diff --git a/app/views/commontator/comments/_form.html.erb b/app/views/commontator/comments/_form.html.erb
index cd51730c2..58ba9c579 100644
--- a/app/views/commontator/comments/_form.html.erb
+++ b/app/views/commontator/comments/_form.html.erb
@@ -38,7 +38,7 @@
<%=
- 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 %>
diff --git a/app/views/commontator/comments/_list.html.erb b/app/views/commontator/comments/_list.html.erb
index 8a080e164..5ae58a0f9 100644
--- a/app/views/commontator/comments/_list.html.erb
+++ b/app/views/commontator/comments/_list.html.erb
@@ -1,3 +1,4 @@
+<%= stylesheet_link_tag 'comments' %>
<%#
Controllers that use this partial must supply the following variables:
user
@@ -5,7 +6,7 @@
%>
<% nested_comments.each do |comment, nested_children| %>
-
<% course.editors.each do |e| %>-
diff --git a/app/views/devise/registrations/new.html.erb b/app/views/devise/registrations/new.html.erb
index 2cb17d595..2e47ea0f0 100644
--- a/app/views/devise/registrations/new.html.erb
+++ b/app/views/devise/registrations/new.html.erb
@@ -33,13 +33,13 @@
target: :_blank)), class: "d-inline", for: "dsgvo-consent" %>