From 9345a4c5926641dd9932b0217c19beb472f3837d Mon Sep 17 00:00:00 2001
From: styrix560 <github@jakubzick.dev>
Date: Mon, 2 Feb 2026 20:31:28 +0100
Subject: [PATCH 01/22] wip

---
 evap/evaluation/templates/base.html          |   8 --
 evap/evaluation/templates/contact_modal.html | 101 +++++++++++++------
 evap/evaluation/templates/footer.html        |   7 +-
 evap/static/ts/src/contact_modal.ts          |  69 -------------
 4 files changed, 72 insertions(+), 113 deletions(-)
 delete mode 100644 evap/static/ts/src/contact_modal.ts

diff --git a/evap/evaluation/templates/base.html b/evap/evaluation/templates/base.html
index c3f18eb0f1..fec611c7e1 100644
--- a/evap/evaluation/templates/base.html
+++ b/evap/evaluation/templates/base.html
@@ -30,14 +30,6 @@
 
         {% include "custom_elements.html" %}
 
-        {% block modals %}
-            {% if user.is_authenticated %}
-                {% translate 'Feedback' as title %}
-                {% translate 'You are welcome to submit feedback regarding the evaluation platform or specific evaluations. Please let us know how we can improve your experience on EvaP.' as teaser %}
-                {% include 'contact_modal.html' with modal_id='feedbackModal' user=request.user title=title teaser=teaser %}
-            {% endif %}
-        {% endblock %}
-
         <div class="sticky-top d-print-none z-over-fixed">
             {% include_navbar user LANGUAGE_CODE %}
 
diff --git a/evap/evaluation/templates/contact_modal.html b/evap/evaluation/templates/contact_modal.html
index b0d77ab18c..f4c54e97cc 100644
--- a/evap/evaluation/templates/contact_modal.html
+++ b/evap/evaluation/templates/contact_modal.html
@@ -13,43 +13,78 @@ <h5 class="modal-title" id="successMessageModalLabel_{{ modal_id }}">{% translat
     </div>
 </div>
 
-<div class="modal fade" id="{{ modal_id }}" tabindex="-1" role="dialog" aria-labelledby="{{ modal_id }}Label" aria-hidden="true">
-    <div class="modal-dialog modal-lg" role="document">
-        <div class="modal-content">
-            <div class="modal-header">
-                <h5 class="modal-title" id="{{ modal_id }}Label">{{ title }}</h5>
-                <button type="button" class="btn-close" data-bs-dismiss="modal" aria-label="Close"></button>
-            </div>
-            <form id="{{ modal_id }}Form">
-                <div class="modal-body">
-                    {{ teaser }}
-                    <div class="modal-grid">
-                        <label for="{{ modal_id }}SenderName" class="control-label my-auto pe-4">{% translate 'Sender' %}</label>
-                        {% if modal_id == "feedbackModal" and allow_anonymous_feedback_messages %}
-                            <div class="btn-group text-wrap" role="group" aria-label="{{ modal_id }} Radio Group">
-                                <input type="radio" class="btn-check" name="{{ modal_id }}RadioGroup" id="{{ modal_id }}SenderName" checked>
-                                <label class="btn btn-sm btn-outline-primary text-break" for="{{ modal_id }}SenderName">{{ user.full_name }}</label>
-                                <input type="radio" class="btn-check" name="{{ modal_id }}RadioGroup" id="{{ modal_id }}AnonymousName">
-                                <label class="btn btn-sm btn-outline-primary text-break" for="{{ modal_id }}AnonymousName">{% translate 'Anonymous' %}</label>
-                            </div>
-                        {% else %}
-                            <input type="text" class="form-control mx-auto text-break" id="{{ modal_id }}SenderName" disabled value="{{ user.full_name }}"/>
-                        {% endif %}
-                        <label for="{{ modal_id }}Subject" class="control-label my-auto pe-4 text-break">{% translate 'Subject' %}</label>
-                        <input type="text" class="form-control mx-auto" id="{{ modal_id }}Subject" disabled value="{{ title }}"/>
-                    </div>
-                    <textarea autofocus class="form-control modal-textfield my-4" id="{{ modal_id }}MessageText"></textarea>
-                    <div class="modal-submit-group">
-                        <button type="button" class="btn btn-light me-1" data-bs-dismiss="modal">{% translate 'Cancel' %}</button>
-                        <button type="submit" id="{{ modal_id }}ActionButton" class="btn btn-primary ms-1">{% translate 'Send Message' %}</button>
+<form>
+    <confirmation-modal>
+        <span slot="title">{{ title }}</span>
+        <span slot="question">{{ teaser }}</span>
+        <span slot="action-text">{% translate 'Send Message' %}</span>
+
+        <div slot="extra-inputs">
+            <div class="modal-grid">
+                <label for="{{ modal_id }}SenderName" class="control-label my-auto pe-4">{% translate 'Sender' %}</label>
+                {% if modal_id == "feedbackModal" and allow_anonymous_feedback_messages %}
+                    <div class="btn-group text-wrap" role="group" aria-label="{{ modal_id }} Radio Group">
+                        <input type="radio" class="btn-check" name="{{ modal_id }}RadioGroup" id="{{ modal_id }}SenderName" checked>
+                        <label class="btn btn-sm btn-outline-primary text-break" for="{{ modal_id }}SenderName">{{ user.full_name }}</label>
+                        <input type="radio" class="btn-check" name="{{ modal_id }}RadioGroup" id="{{ modal_id }}AnonymousName">
+                        <label class="btn btn-sm btn-outline-primary text-break" for="{{ modal_id }}AnonymousName">{% translate 'Anonymous' %}</label>
                     </div>
-                </div>
-            </form>
+                {% else %}
+                    <input type="text" class="form-control mx-auto text-break" id="{{ modal_id }}SenderName" disabled value="{{ user.full_name }}"/>
+                {% endif %}
+                <label for="{{ modal_id }}Subject" class="control-label my-auto pe-4 text-break">{% translate 'Subject' %}</label>
+                <input type="text" class="form-control mx-auto" id="{{ modal_id }}Subject" disabled value="{{ title }}"/>
+            </div>
+            <textarea autofocus class="form-control modal-textfield my-4" id="{{ modal_id }}MessageText"></textarea>
         </div>
-    </div>
-</div>
+
+        <button type="button" class="btn btn-dark" slot="show-button">{{ show_button_text }}</button>
+    </confirmation-modal>
+</form>
 <script type="module">
     import { ContactModalLogic } from "{% static 'js/contact_modal.js' %}";
 
     new ContactModalLogic("{{ modal_id }}", "{{ title|escapejs }}").attach();
 </script>
+
+
+{#<div class="modal fade" id="{{ modal_id }}" tabindex="-1" role="dialog" aria-labelledby="{{ modal_id }}Label" aria-hidden="true">#}
+{#    <div class="modal-dialog modal-lg" role="document">#}
+{#        <div class="modal-content">#}
+{#            <div class="modal-header">#}
+{#                <h5 class="modal-title" id="{{ modal_id }}Label">{{ title }}</h5>#}
+{#                <button type="button" class="btn-close" data-bs-dismiss="modal" aria-label="Close"></button>#}
+{#            </div>#}
+{#            <form id="{{ modal_id }}Form">#}
+{#                <div class="modal-body">#}
+{#                    {{ teaser }}#}
+{#                    <div class="modal-grid">#}
+{#                        <label for="{{ modal_id }}SenderName" class="control-label my-auto pe-4">{% translate 'Sender' %}</label>#}
+{#                        {% if modal_id == "feedbackModal" and allow_anonymous_feedback_messages %}#}
+{#                            <div class="btn-group text-wrap" role="group" aria-label="{{ modal_id }} Radio Group">#}
+{#                                <input type="radio" class="btn-check" name="{{ modal_id }}RadioGroup" id="{{ modal_id }}SenderName" checked>#}
+{#                                <label class="btn btn-sm btn-outline-primary text-break" for="{{ modal_id }}SenderName">{{ user.full_name }}</label>#}
+{#                                <input type="radio" class="btn-check" name="{{ modal_id }}RadioGroup" id="{{ modal_id }}AnonymousName">#}
+{#                                <label class="btn btn-sm btn-outline-primary text-break" for="{{ modal_id }}AnonymousName">{% translate 'Anonymous' %}</label>#}
+{#                            </div>#}
+{#                        {% else %}#}
+{#                            <input type="text" class="form-control mx-auto text-break" id="{{ modal_id }}SenderName" disabled value="{{ user.full_name }}"/>#}
+{#                        {% endif %}#}
+{#                        <label for="{{ modal_id }}Subject" class="control-label my-auto pe-4 text-break">{% translate 'Subject' %}</label>#}
+{#                        <input type="text" class="form-control mx-auto" id="{{ modal_id }}Subject" disabled value="{{ title }}"/>#}
+{#                    </div>#}
+{#                    <textarea autofocus class="form-control modal-textfield my-4" id="{{ modal_id }}MessageText"></textarea>#}
+{#                    <div class="modal-submit-group">#}
+{#                        <button type="button" class="btn btn-light me-1" data-bs-dismiss="modal">{% translate 'Cancel' %}</button>#}
+{#                        <button type="submit" id="{{ modal_id }}ActionButton" class="btn btn-primary ms-1">{% translate 'Send Message' %}</button>#}
+{#                    </div>#}
+{#                </div>#}
+{#            </form>#}
+{#        </div>#}
+{#    </div>#}
+{#</div>#}
+{#<script type="module">#}
+    {#import { ContactModalLogic } from "{% static 'js/contact_modal.js' %}";#}
+    {##}
+    {#new ContactModalLogic("{{ modal_id }}", "{{ title|escapejs }}").attach();#}
+{#</script>#}
diff --git a/evap/evaluation/templates/footer.html b/evap/evaluation/templates/footer.html
index 647f6b0862..73ca1f7ffd 100644
--- a/evap/evaluation/templates/footer.html
+++ b/evap/evaluation/templates/footer.html
@@ -22,9 +22,10 @@
             <div class="navbar-nav justify-content-end feedback-button-placeholder">
                 {% if user.is_authenticated %}
                     <span class="feedback-button">
-                        <button id="feedbackModalShowButton" type="button" class="btn btn-dark">
-                            {% translate 'Problems/Feedback' %}
-                        </button>
+                        {% translate 'Feedback' as title %}
+                        {% translate 'You are welcome to submit feedback regarding the evaluation platform or specific evaluations. Please let us know how we can improve your experience on EvaP.' as teaser %}
+                        {% translate "Problems/Feedback" as show_button_text %}
+                        {% include 'contact_modal.html' with modal_id='feedbackModal' user=request.user title=title teaser=teaser show_button_text=show_button_text%}
                     </span>
                 {% endif %}
             </div>
diff --git a/evap/static/ts/src/contact_modal.ts b/evap/static/ts/src/contact_modal.ts
deleted file mode 100644
index 287d372459..0000000000
--- a/evap/static/ts/src/contact_modal.ts
+++ /dev/null
@@ -1,69 +0,0 @@
-declare const bootstrap: typeof import("bootstrap");
-
-import { selectOrError, sleep, assert } from "./utils.js";
-import { CSRF_HEADERS } from "./csrf-utils.js";
-
-const SUCCESS_MESSAGE_TIMEOUT = 3000;
-
-export class ContactModalLogic {
-    private readonly modal: bootstrap.Modal;
-    private readonly successMessageModal: bootstrap.Modal;
-    private readonly actionButtonElement: HTMLButtonElement;
-    private readonly messageTextElement: HTMLInputElement;
-    private readonly showButtonElements: HTMLElement[];
-    private readonly title: string;
-
-    // may be null if anonymous feedback is not enabled
-    private readonly anonymousRadioElement: HTMLInputElement | null;
-
-    constructor(modalId: string, title: string) {
-        this.title = title;
-        this.modal = new bootstrap.Modal(selectOrError("#" + modalId));
-        this.successMessageModal = new bootstrap.Modal(selectOrError("#successMessageModal_" + modalId));
-        this.actionButtonElement = selectOrError("#" + modalId + "ActionButton");
-        this.messageTextElement = selectOrError("#" + modalId + "MessageText");
-        this.anonymousRadioElement = document.querySelector<HTMLInputElement>("#" + modalId + "AnonymousName");
-        this.showButtonElements = Array.from(document.querySelectorAll(`#${modalId}ShowButton, .${modalId}ShowButton`));
-    }
-
-    public attach = (): void => {
-        this.actionButtonElement.addEventListener("click", async event => {
-            this.actionButtonElement.disabled = true;
-            event.preventDefault();
-            const message = this.messageTextElement.value;
-            if (message.trim() === "") {
-                this.modal.hide();
-                this.actionButtonElement.disabled = false;
-                return;
-            }
-            try {
-                const response = await fetch("/contact", {
-                    body: new URLSearchParams({
-                        anonymous: String(this.anonymousRadioElement?.checked),
-                        message,
-                        title: this.title,
-                    }),
-                    headers: CSRF_HEADERS,
-                    method: "POST",
-                });
-                assert(response.ok);
-            } catch (_) {
-                window.alert("Sending failed, sorry!");
-                return;
-            }
-            this.modal.hide();
-            this.successMessageModal.show();
-            this.messageTextElement.value = "";
-
-            await sleep(SUCCESS_MESSAGE_TIMEOUT);
-            this.successMessageModal.hide();
-            this.actionButtonElement.disabled = false;
-        });
-
-        this.showButtonElements.forEach(button =>
-            button.addEventListener("click", () => {
-                this.modal.show();
-            }),
-        );
-    };
-}

From 56b7fcd972925071c1d9c22a2feadece13463409 Mon Sep 17 00:00:00 2001
From: styrix560 <github@jakubzick.dev>
Date: Mon, 16 Feb 2026 21:21:08 +0100
Subject: [PATCH 02/22] wip

---
 evap/evaluation/templates/contact_modal.html | 31 +++++++++++++++-----
 evap/evaluation/views.py                     |  1 +
 evap/static/ts/src/confirmation-modal.ts     |  2 ++
 3 files changed, 26 insertions(+), 8 deletions(-)

diff --git a/evap/evaluation/templates/contact_modal.html b/evap/evaluation/templates/contact_modal.html
index f4c54e97cc..ba4839d366 100644
--- a/evap/evaluation/templates/contact_modal.html
+++ b/evap/evaluation/templates/contact_modal.html
@@ -13,8 +13,12 @@ <h5 class="modal-title" id="successMessageModalLabel_{{ modal_id }}">{% translat
     </div>
 </div>
 
-<form>
-    <confirmation-modal>
+{# custom_success_form #}
+<form custom-success id="contact-modal-form" method="POST" action="{% url 'evaluation:contact' %}">
+    {% csrf_token %}
+    <input hidden name="title" value="{{ title }}"/>
+
+    <confirmation-modal type="submit">
         <span slot="title">{{ title }}</span>
         <span slot="question">{{ teaser }}</span>
         <span slot="action-text">{% translate 'Send Message' %}</span>
@@ -24,9 +28,9 @@ <h5 class="modal-title" id="successMessageModalLabel_{{ modal_id }}">{% translat
                 <label for="{{ modal_id }}SenderName" class="control-label my-auto pe-4">{% translate 'Sender' %}</label>
                 {% if modal_id == "feedbackModal" and allow_anonymous_feedback_messages %}
                     <div class="btn-group text-wrap" role="group" aria-label="{{ modal_id }} Radio Group">
-                        <input type="radio" class="btn-check" name="{{ modal_id }}RadioGroup" id="{{ modal_id }}SenderName" checked>
+                        <input type="radio" class="btn-check" name="anonymous" value="false" id="{{ modal_id }}SenderName" checked>
                         <label class="btn btn-sm btn-outline-primary text-break" for="{{ modal_id }}SenderName">{{ user.full_name }}</label>
-                        <input type="radio" class="btn-check" name="{{ modal_id }}RadioGroup" id="{{ modal_id }}AnonymousName">
+                        <input type="radio" class="btn-check" name="anonymous" value="true" id="{{ modal_id }}AnonymousName">
                         <label class="btn btn-sm btn-outline-primary text-break" for="{{ modal_id }}AnonymousName">{% translate 'Anonymous' %}</label>
                     </div>
                 {% else %}
@@ -35,16 +39,27 @@ <h5 class="modal-title" id="successMessageModalLabel_{{ modal_id }}">{% translat
                 <label for="{{ modal_id }}Subject" class="control-label my-auto pe-4 text-break">{% translate 'Subject' %}</label>
                 <input type="text" class="form-control mx-auto" id="{{ modal_id }}Subject" disabled value="{{ title }}"/>
             </div>
-            <textarea autofocus class="form-control modal-textfield my-4" id="{{ modal_id }}MessageText"></textarea>
+            <textarea autofocus class="form-control modal-textfield my-4" id="{{ modal_id }}MessageText" name="message"></textarea>
         </div>
 
         <button type="button" class="btn btn-dark" slot="show-button">{{ show_button_text }}</button>
     </confirmation-modal>
 </form>
-<script type="module">
-    import { ContactModalLogic } from "{% static 'js/contact_modal.js' %}";
+<script>
+    const SUCCESS_MESSAGE_TIMEOUT = 100000;
+
+    const actionButtonElement = () => document.querySelector("button[data-event-type=confirm]");
+    const successMessageModal = new bootstrap.Modal(document.querySelector("#successMessageModal_{{ modal_id }}"));
+    const messageTextElement = document.querySelector("#{{ modal_id }}MessageText");
+
+    function onSuccess() {
+        successMessageModal.show();
+        messageTextElement.value = "";
 
-    new ContactModalLogic("{{ modal_id }}", "{{ title|escapejs }}").attach();
+        setInterval(() => successMessageModal.hide(), SUCCESS_MESSAGE_TIMEOUT);
+    }
+    const contactModal = document.querySelector("#contact-modal-form");
+    contactModal.addEventListener("submit-success", onSuccess);
 </script>
 
 
diff --git a/evap/evaluation/views.py b/evap/evaluation/views.py
index d94eddea23..93ec597210 100644
--- a/evap/evaluation/views.py
+++ b/evap/evaluation/views.py
@@ -194,6 +194,7 @@ def contact(request):
             logger.exception("An exception occurred when sending the following contact email:\n%s\n", mail.message())
             raise
 
+    # 204 or helper method no_content
     return HttpResponseBadRequest()
 
 
diff --git a/evap/static/ts/src/confirmation-modal.ts b/evap/static/ts/src/confirmation-modal.ts
index 9f5eb1af29..8004a975b1 100644
--- a/evap/static/ts/src/confirmation-modal.ts
+++ b/evap/static/ts/src/confirmation-modal.ts
@@ -52,6 +52,7 @@ export class ConfirmationModal extends HTMLElement {
             return;
         }
 
+        console.log("here");
         this.closeDialogSlowly();
 
         if (isConfirm) {
@@ -76,6 +77,7 @@ export class ConfirmationModal extends HTMLElement {
         this.dialog.addEventListener(
             "animationend",
             () => {
+                console.log("final close");
                 this.dialog.removeAttribute("closing");
                 this.dialog.close();
             },

From 316d9df620965267732624d0d0443ba9195a5d43 Mon Sep 17 00:00:00 2001
From: styrix560 <github@jakubzick.dev>
Date: Mon, 23 Feb 2026 20:32:33 +0100
Subject: [PATCH 03/22] wip

---
 evap/evaluation/templates/base.html          |  2 +-
 evap/evaluation/templates/contact_modal.html | 13 +++++++------
 evap/evaluation/templates/footer.html        | 12 ++++++------
 evap/evaluation/templates/profile.html       | 14 ++++----------
 4 files changed, 18 insertions(+), 23 deletions(-)

diff --git a/evap/evaluation/templates/base.html b/evap/evaluation/templates/base.html
index fec611c7e1..3ff308a2b0 100644
--- a/evap/evaluation/templates/base.html
+++ b/evap/evaluation/templates/base.html
@@ -34,7 +34,7 @@
             {% include_navbar user LANGUAGE_CODE %}
 
             {% block breadcrumb_bar %}
-            {% endblock %}
+            {% endblock %}z
         </div>
 
         <img class="print-brand-image d-none d-print-block" src="{% static 'images/evap.png' %}" alt="{% translate 'Evaluation Platform' %}" />
diff --git a/evap/evaluation/templates/contact_modal.html b/evap/evaluation/templates/contact_modal.html
index ba4839d366..bfa388cf7f 100644
--- a/evap/evaluation/templates/contact_modal.html
+++ b/evap/evaluation/templates/contact_modal.html
@@ -1,6 +1,8 @@
 {% load static %}
 
-<div class="modal fade" id="successMessageModal_{{ modal_id }}" tabindex="-1" role="dialog" aria-labelledby="successMessageModalLabel_{{ modal_id }}" aria-hidden="true">
+{# Is this actually needed #}
+
+<div class="modal fade" style="z-index: 1" id="successMessageModal_{{ modal_id }}" tabindex="-1" role="dialog" aria-labelledby="successMessageModalLabel_{{ modal_id }}" aria-hidden="true">
     <div class="modal-dialog" role="document">
         <div class="modal-content">
             <div class="modal-header">
@@ -13,7 +15,6 @@ <h5 class="modal-title" id="successMessageModalLabel_{{ modal_id }}">{% translat
     </div>
 </div>
 
-{# custom_success_form #}
 <form custom-success id="contact-modal-form" method="POST" action="{% url 'evaluation:contact' %}">
     {% csrf_token %}
     <input hidden name="title" value="{{ title }}"/>
@@ -28,9 +29,9 @@ <h5 class="modal-title" id="successMessageModalLabel_{{ modal_id }}">{% translat
                 <label for="{{ modal_id }}SenderName" class="control-label my-auto pe-4">{% translate 'Sender' %}</label>
                 {% if modal_id == "feedbackModal" and allow_anonymous_feedback_messages %}
                     <div class="btn-group text-wrap" role="group" aria-label="{{ modal_id }} Radio Group">
-                        <input type="radio" class="btn-check" name="anonymous" value="false" id="{{ modal_id }}SenderName" checked>
+                        <input type="radio" class="btn-check" name="anonymous" value="false" id="{{ modal_id }}SenderName" checked />
                         <label class="btn btn-sm btn-outline-primary text-break" for="{{ modal_id }}SenderName">{{ user.full_name }}</label>
-                        <input type="radio" class="btn-check" name="anonymous" value="true" id="{{ modal_id }}AnonymousName">
+                        <input type="radio" class="btn-check" name="anonymous" value="true" id="{{ modal_id }}AnonymousName"/>
                         <label class="btn btn-sm btn-outline-primary text-break" for="{{ modal_id }}AnonymousName">{% translate 'Anonymous' %}</label>
                     </div>
                 {% else %}
@@ -42,10 +43,10 @@ <h5 class="modal-title" id="successMessageModalLabel_{{ modal_id }}">{% translat
             <textarea autofocus class="form-control modal-textfield my-4" id="{{ modal_id }}MessageText" name="message"></textarea>
         </div>
 
-        <button type="button" class="btn btn-dark" slot="show-button">{{ show_button_text }}</button>
+        <button type="button" class="{{ show_button_class }}" slot="show-button">{{ show_button_text }}</button>
     </confirmation-modal>
 </form>
-<script>
+<script type="module">
     const SUCCESS_MESSAGE_TIMEOUT = 100000;
 
     const actionButtonElement = () => document.querySelector("button[data-event-type=confirm]");
diff --git a/evap/evaluation/templates/footer.html b/evap/evaluation/templates/footer.html
index 73ca1f7ffd..c2ee3fef19 100644
--- a/evap/evaluation/templates/footer.html
+++ b/evap/evaluation/templates/footer.html
@@ -20,14 +20,14 @@
                 <span class="fst-italic">{{ slogan }}</span>
             </div>
             <div class="navbar-nav justify-content-end feedback-button-placeholder">
+            {% block modals %}
                 {% if user.is_authenticated %}
-                    <span class="feedback-button">
-                        {% translate 'Feedback' as title %}
-                        {% translate 'You are welcome to submit feedback regarding the evaluation platform or specific evaluations. Please let us know how we can improve your experience on EvaP.' as teaser %}
-                        {% translate "Problems/Feedback" as show_button_text %}
-                        {% include 'contact_modal.html' with modal_id='feedbackModal' user=request.user title=title teaser=teaser show_button_text=show_button_text%}
-                    </span>
+                    {% translate 'Feedback' as title %}
+                    {% translate 'You are welcome to submit feedback regarding the evaluation platform or specific evaluations. Please let us know how we can improve your experience on EvaP.' as teaser %}
+                    {% translate "Problems/Feedback" as show_button_text %}
+                    {% include 'contact_modal.html' with modal_id='feedbackModal' user=request.user title=title teaser=teaser show_button_text=show_button_text%}
                 {% endif %}
+            {% endblock %}
             </div>
         </div>
     </nav>
diff --git a/evap/evaluation/templates/profile.html b/evap/evaluation/templates/profile.html
index 36841bcf66..dda2fb54b7 100644
--- a/evap/evaluation/templates/profile.html
+++ b/evap/evaluation/templates/profile.html
@@ -77,19 +77,13 @@ <h4 class="card-title mb-4">{% translate 'Delegates and emails' %}</h4>
                         <button type="submit" class="btn btn-primary">
                             {% translate 'Save' %}
                         </button>
-                        <button type="button" class="btn btn-light" id="changeRequestModalShowButton">
-                            {% translate 'Request changes' %}
-                        </button>
+                        {% translate 'Request changes' as title %}
+                        {% translate 'You are welcome to submit feedback regarding the evaluation platform or specific evaluations. Please let us know how we can improve your experience on EvaP.' as teaser %}
+                        {% translate "Request changes" as show_button_text %}
+                        {% include 'contact_modal.html' with modal_id='feedbackModal' user=request.user title=title teaser=teaser show_button_class="btn btn-light" show_button_text=show_button_text%}
                     </div>
                 </div>
             </div>
         </div>
     </form>
 {% endblock %}
-
-{% block modals %}
-    {{ block.super }}
-    {% translate 'Request user setting changes' as title %}
-    {% translate 'Please tell us which of your settings we should change.' as teaser %}
-    {% include 'contact_modal.html' with modal_id='changeRequestModal' user=request.user title=title teaser=teaser %}
-{% endblock %}

From 4ea8c78e68c4865d664b9277b9530441b585c57d Mon Sep 17 00:00:00 2001
From: styrix560 <github@jakubzick.dev>
Date: Mon, 2 Mar 2026 18:20:53 +0100
Subject: [PATCH 04/22] wip

---
 evap/evaluation/templates/profile.html | 44 ++++++++++++--------------
 1 file changed, 21 insertions(+), 23 deletions(-)

diff --git a/evap/evaluation/templates/profile.html b/evap/evaluation/templates/profile.html
index dda2fb54b7..d49d166a62 100644
--- a/evap/evaluation/templates/profile.html
+++ b/evap/evaluation/templates/profile.html
@@ -5,22 +5,21 @@
 {% block content %}
     {{ block.super }}
     <h3>{% translate 'Profile' %}</h3>
-
-    <form id="profile-form" method="POST" class="form-horizontal multiselect-form">
-        {% csrf_token %}
-        <div class="row row-cols-1 row-cols-md-2 g-4 mb-3">
-            <div class="col">
-                <div class="card h-100">
-                    <div class="card-body">
-                        <h4 class="card-title mb-4">{% translate 'Personal information' %}</h4>
-                        {% for field in profile_form %}
-                            {% if field != profile_form.delegates %}
-                                {% include 'bootstrap_form_field.html' with field=field %}
-                            {% endif %}
-                        {% endfor %}
-                    </div>
+    <div class="row row-cols-1 row-cols-md-2 g-4 mb-3">
+        <div class="col">
+            <div class="card h-100">
+                <div class="card-body">
+                    <h4 class="card-title mb-4">{% translate 'Personal information' %}</h4>
+                    {% for field in profile_form %}
+                        {% if field != profile_form.delegates %}
+                            {% include 'bootstrap_form_field.html' with field=field %}
+                        {% endif %}
+                    {% endfor %}
                 </div>
             </div>
+        </div>
+        <form id="profile-form" method="POST" class="form-horizontal multiselect-form">
+            {% csrf_token %}
             {% if user.is_editor %}
                 <div class="col">
                     <div class="card h-100">
@@ -68,15 +67,14 @@ <h4 class="card-title mb-4">{% translate 'Delegates and emails' %}</h4>
                     </div>
                 </div>
             {% endif %}
-        </div>
-
+        </form>
         <div class="row row-cols-1 {% if user.is_editor %}row-cols-md-1{% else %}row-cols-md-2{% endif %} g-4">
-            <div class="col">
-                <div class="card card-submit-area card-submit-area-2 text-center">
-                    <div class="card-body tab-row">
-                        <button type="submit" class="btn btn-primary">
-                            {% translate 'Save' %}
-                        </button>
+            <div class="card card-submit-area card-submit-area-2 text-center w-100">
+                <div class="card-body tab-row row">
+                    <button type="submit" class="btn btn-primary">
+                        {% translate 'Save' %}
+                    </button>
+                    <div>
                         {% translate 'Request changes' as title %}
                         {% translate 'You are welcome to submit feedback regarding the evaluation platform or specific evaluations. Please let us know how we can improve your experience on EvaP.' as teaser %}
                         {% translate "Request changes" as show_button_text %}
@@ -85,5 +83,5 @@ <h4 class="card-title mb-4">{% translate 'Delegates and emails' %}</h4>
                 </div>
             </div>
         </div>
-    </form>
+    </div>
 {% endblock %}

From 7853fa851e48b4ac4818b044b0e109072aee7b87 Mon Sep 17 00:00:00 2001
From: styrix560 <github@jakubzick.dev>
Date: Mon, 2 Mar 2026 19:17:53 +0100
Subject: [PATCH 05/22] wip

---
 evap/evaluation/templates/base.html          |  2 +-
 evap/evaluation/templates/contact_modal.html | 19 +------
 evap/evaluation/templates/footer.html        |  5 +-
 evap/evaluation/templates/profile.html       | 58 +++++++++++---------
 4 files changed, 39 insertions(+), 45 deletions(-)

diff --git a/evap/evaluation/templates/base.html b/evap/evaluation/templates/base.html
index 3ff308a2b0..fec611c7e1 100644
--- a/evap/evaluation/templates/base.html
+++ b/evap/evaluation/templates/base.html
@@ -34,7 +34,7 @@
             {% include_navbar user LANGUAGE_CODE %}
 
             {% block breadcrumb_bar %}
-            {% endblock %}z
+            {% endblock %}
         </div>
 
         <img class="print-brand-image d-none d-print-block" src="{% static 'images/evap.png' %}" alt="{% translate 'Evaluation Platform' %}" />
diff --git a/evap/evaluation/templates/contact_modal.html b/evap/evaluation/templates/contact_modal.html
index bfa388cf7f..0556278e57 100644
--- a/evap/evaluation/templates/contact_modal.html
+++ b/evap/evaluation/templates/contact_modal.html
@@ -1,20 +1,5 @@
 {% load static %}
 
-{# Is this actually needed #}
-
-<div class="modal fade" style="z-index: 1" id="successMessageModal_{{ modal_id }}" tabindex="-1" role="dialog" aria-labelledby="successMessageModalLabel_{{ modal_id }}" aria-hidden="true">
-    <div class="modal-dialog" role="document">
-        <div class="modal-content">
-            <div class="modal-header">
-                <h5 class="modal-title" id="successMessageModalLabel_{{ modal_id }}">{% translate 'Message sent' %}</h5>
-            </div>
-            <div class="modal-body">
-                {% translate 'Your message was successfully sent.' %}
-            </div>
-        </div>
-    </div>
-</div>
-
 <form custom-success id="contact-modal-form" method="POST" action="{% url 'evaluation:contact' %}">
     {% csrf_token %}
     <input hidden name="title" value="{{ title }}"/>
@@ -43,7 +28,9 @@ <h5 class="modal-title" id="successMessageModalLabel_{{ modal_id }}">{% translat
             <textarea autofocus class="form-control modal-textfield my-4" id="{{ modal_id }}MessageText" name="message"></textarea>
         </div>
 
-        <button type="button" class="{{ show_button_class }}" slot="show-button">{{ show_button_text }}</button>
+        <div class="feedback-button" slot="show-button">
+            <button type="button" class="{{ show_button_class }}">{{ show_button_text }}</button>
+        </div>
     </confirmation-modal>
 </form>
 <script type="module">
diff --git a/evap/evaluation/templates/footer.html b/evap/evaluation/templates/footer.html
index c2ee3fef19..7715e67091 100644
--- a/evap/evaluation/templates/footer.html
+++ b/evap/evaluation/templates/footer.html
@@ -20,15 +20,14 @@
                 <span class="fst-italic">{{ slogan }}</span>
             </div>
             <div class="navbar-nav justify-content-end feedback-button-placeholder">
-            {% block modals %}
                 {% if user.is_authenticated %}
                     {% translate 'Feedback' as title %}
                     {% translate 'You are welcome to submit feedback regarding the evaluation platform or specific evaluations. Please let us know how we can improve your experience on EvaP.' as teaser %}
                     {% translate "Problems/Feedback" as show_button_text %}
-                    {% include 'contact_modal.html' with modal_id='feedbackModal' user=request.user title=title teaser=teaser show_button_text=show_button_text%}
+                    {% include 'contact_modal.html' with modal_id='feedbackModal' user=request.user title=title teaser=teaser show_button_text=show_button_text show_button_class="btn btn-dark"%}
                 {% endif %}
-            {% endblock %}
             </div>
         </div>
     </nav>
 </div>
+1
\ No newline at end of file
diff --git a/evap/evaluation/templates/profile.html b/evap/evaluation/templates/profile.html
index d49d166a62..1c5dbf6a70 100644
--- a/evap/evaluation/templates/profile.html
+++ b/evap/evaluation/templates/profile.html
@@ -5,21 +5,22 @@
 {% block content %}
     {{ block.super }}
     <h3>{% translate 'Profile' %}</h3>
-    <div class="row row-cols-1 row-cols-md-2 g-4 mb-3">
-        <div class="col">
-            <div class="card h-100">
-                <div class="card-body">
-                    <h4 class="card-title mb-4">{% translate 'Personal information' %}</h4>
-                    {% for field in profile_form %}
-                        {% if field != profile_form.delegates %}
-                            {% include 'bootstrap_form_field.html' with field=field %}
-                        {% endif %}
-                    {% endfor %}
+
+    <form id="profile-form" method="POST" class="form-horizontal multiselect-form">
+        {% csrf_token %}
+        <div class="row row-cols-1 row-cols-md-2 g-4 mb-3">
+            <div class="col">
+                <div class="card h-100">
+                    <div class="card-body">
+                        <h4 class="card-title mb-4">{% translate 'Personal information' %}</h4>
+                        {% for field in profile_form %}
+                            {% if field != profile_form.delegates %}
+                                {% include 'bootstrap_form_field.html' with field=field %}
+                            {% endif %}
+                        {% endfor %}
+                    </div>
                 </div>
             </div>
-        </div>
-        <form id="profile-form" method="POST" class="form-horizontal multiselect-form">
-            {% csrf_token %}
             {% if user.is_editor %}
                 <div class="col">
                     <div class="card h-100">
@@ -67,21 +68,28 @@ <h4 class="card-title mb-4">{% translate 'Delegates and emails' %}</h4>
                     </div>
                 </div>
             {% endif %}
-        </form>
+        </div>
+
         <div class="row row-cols-1 {% if user.is_editor %}row-cols-md-1{% else %}row-cols-md-2{% endif %} g-4">
-            <div class="card card-submit-area card-submit-area-2 text-center w-100">
-                <div class="card-body tab-row row">
-                    <button type="submit" class="btn btn-primary">
-                        {% translate 'Save' %}
-                    </button>
-                    <div>
-                        {% translate 'Request changes' as title %}
-                        {% translate 'You are welcome to submit feedback regarding the evaluation platform or specific evaluations. Please let us know how we can improve your experience on EvaP.' as teaser %}
-                        {% translate "Request changes" as show_button_text %}
-                        {% include 'contact_modal.html' with modal_id='feedbackModal' user=request.user title=title teaser=teaser show_button_class="btn btn-light" show_button_text=show_button_text%}
+            <div class="col">
+                <div class="card card-submit-area card-submit-area-2 text-center">
+                    <div class="card-body tab-row">
+                        <button type="submit" class="btn btn-primary">
+                            {% translate 'Save' %}
+                        </button>
+                        <button type="button" class="btn btn-light" id="changeRequestModalShowButton">
+                            {% translate 'Request changes' %}
+                        </button>
                     </div>
                 </div>
             </div>
         </div>
-    </div>
+    </form>
 {% endblock %}
+
+{% block modals %}
+    {{ block.super }}
+    {% translate 'Request user setting changes' as title %}
+    {% translate 'Please tell us which of your settings we should change.' as teaser %}
+    {% include 'contact_modal.html' with modal_id='changeRequestModal' user=request.user title=title teaser=teaser %}
+{% endblock %}
\ No newline at end of file

From e04c54e061c0876fab9a40e7e08bffafc598be74 Mon Sep 17 00:00:00 2001
From: styrix560 <github@jakubzick.dev>
Date: Mon, 2 Mar 2026 20:48:56 +0100
Subject: [PATCH 06/22] Change contact modals to new variant

---
 .../contributor_evaluation_form.html          | 26 +++++----------
 evap/evaluation/templates/contact_modal.html  |  4 +--
 .../templates/contribution_formset.html       |  7 ++--
 evap/evaluation/templates/profile.html        | 32 +++++++------------
 evap/static/scss/components/_buttons.scss     |  3 --
 5 files changed, 26 insertions(+), 46 deletions(-)

diff --git a/evap/contributor/templates/contributor_evaluation_form.html b/evap/contributor/templates/contributor_evaluation_form.html
index cd7714f428..aed0631c43 100644
--- a/evap/contributor/templates/contributor_evaluation_form.html
+++ b/evap/contributor/templates/contributor_evaluation_form.html
@@ -66,15 +66,17 @@ <h5 class="card-title">{% translate 'Course data' %}</h5>
                     <h5 class="card-title me-auto">{% translate 'Evaluation data' %}</h5>
                     {% if evaluation.allow_editors_to_edit %}
                         <div>
-                            <button type="button" class="btn btn-sm btn-light mb-3 createAccountRequestModalShowButton">
-                                {% translate 'Request creation of new account' %}
-                            </button>
+                            {% blocktranslate asvar title with evaluation_name=evaluation.full_name %}Request account creation for {{ evaluation_name }}{% endblocktranslate %}
+                            {% translate 'Please tell us which new account we should create. We need the name and email for all new accounts.' as teaser %}
+                            {% translate 'Request creation of new account' as show_button_text %}
+                            {% include 'contact_modal.html' with modal_id='createParticipantAccountRequestModal' user=request.user title=title teaser=teaser show_button_text=show_button_text show_button_class="btn btn-sm btn-light mb-3"%}
                         </div>
                     {% else %}
                         <div>
-                            <button type="button" class="btn btn-sm btn-light changeEvaluationRequestModalShowButton">
-                                {% translate 'Request changes' %}
-                            </button>
+                            {% blocktranslate asvar title with evaluation_name=evaluation.full_name %}Request evaluation changes for {{ evaluation_name }}{% endblocktranslate %}
+                            {% translate 'Please tell us what changes to the evaluation we should make.' as teaser %}
+                            {% translate 'Request changes' as show_button_text %}
+                            {% include 'contact_modal.html' with modal_id='changeEvaluationRequestModal' user=request.user title=title teaser=teaser show_button_text=show_button_text show_button_class="btn btn-sm btn-light"%}
                         </div>
                     {% endif %}
                 </div>
@@ -130,18 +132,6 @@ <h5 class="modal-title" id="previewModalLabel">{% translate 'Preview' %}</h5>
     {% endif %}
 {% endblock %}
 
-{% block modals %}
-    {{ block.super }}
-
-    {% blocktranslate asvar title with evaluation_name=evaluation.full_name %}Request account creation for {{ evaluation_name }}{% endblocktranslate %}
-    {% translate 'Please tell us which new account we should create. We need the name and email for all new accounts.' as teaser %}
-    {% include 'contact_modal.html' with modal_id='createAccountRequestModal' user=request.user title=title teaser=teaser %}
-
-    {% blocktranslate asvar title with evaluation_name=evaluation.full_name %}Request evaluation changes for {{ evaluation_name }}{% endblocktranslate %}
-    {% translate 'Please tell us what changes to the evaluation we should make.' as teaser %}
-    {% include 'contact_modal.html' with modal_id='changeEvaluationRequestModal' user=request.user title=title teaser=teaser %}
-{% endblock %}
-
 {% block additional_javascript %}
     {% include 'evap_evaluation_edit_js.html' %}
 
diff --git a/evap/evaluation/templates/contact_modal.html b/evap/evaluation/templates/contact_modal.html
index 0556278e57..c6d62357ba 100644
--- a/evap/evaluation/templates/contact_modal.html
+++ b/evap/evaluation/templates/contact_modal.html
@@ -28,9 +28,9 @@
             <textarea autofocus class="form-control modal-textfield my-4" id="{{ modal_id }}MessageText" name="message"></textarea>
         </div>
 
-        <div class="feedback-button" slot="show-button">
+        <span class="feedback-button" slot="show-button">
             <button type="button" class="{{ show_button_class }}">{{ show_button_text }}</button>
-        </div>
+        </span>
     </confirmation-modal>
 </form>
 <script type="module">
diff --git a/evap/evaluation/templates/contribution_formset.html b/evap/evaluation/templates/contribution_formset.html
index 3b1e2a9e81..43209db10b 100644
--- a/evap/evaluation/templates/contribution_formset.html
+++ b/evap/evaluation/templates/contribution_formset.html
@@ -5,9 +5,10 @@
         <h5 class="card-title me-auto">{% translate 'Contributors' %}</h5>
         {% if not manager %}
             <div>
-                <button type="button" class="btn btn-sm btn-light" id="createAccountRequestModalShowButton">
-                    {% translate 'Request creation of new account' %}
-                </button>
+                {% blocktranslate asvar title with evaluation_name=evaluation.full_name %}Request account creation for {{ evaluation_name }}{% endblocktranslate %}
+                {% translate 'Please tell us which new account we should create. We need the name and email for all new accounts.' as teaser %}
+                {% translate 'Request creation of new account' as show_button_text %}
+                {% include 'contact_modal.html' with modal_id='createContributorAccountRequestModal' user=request.user title=title teaser=teaser show_button_text=show_button_text show_button_class="btn btn-sm btn-light mb-3"%}
             </div>
         {% endif %}
     </div>
diff --git a/evap/evaluation/templates/profile.html b/evap/evaluation/templates/profile.html
index 1c5dbf6a70..4fb7722df5 100644
--- a/evap/evaluation/templates/profile.html
+++ b/evap/evaluation/templates/profile.html
@@ -69,27 +69,19 @@ <h4 class="card-title mb-4">{% translate 'Delegates and emails' %}</h4>
                 </div>
             {% endif %}
         </div>
+    </form>
 
-        <div class="row row-cols-1 {% if user.is_editor %}row-cols-md-1{% else %}row-cols-md-2{% endif %} g-4">
-            <div class="col">
-                <div class="card card-submit-area card-submit-area-2 text-center">
-                    <div class="card-body tab-row">
-                        <button type="submit" class="btn btn-primary">
-                            {% translate 'Save' %}
-                        </button>
-                        <button type="button" class="btn btn-light" id="changeRequestModalShowButton">
-                            {% translate 'Request changes' %}
-                        </button>
-                    </div>
-                </div>
+    <div class="row row-cols-1 {% if user.is_editor %}row-cols-md-1{% else %}row-cols-md-2{% endif %} g-4">
+        <div class="card card-submit-area card-submit-area-2">
+            <div class="card-body tab-row d-flex justify-content-center">
+                <button type="submit" class="btn btn-primary">
+                    {% translate 'Save' %}
+                </button>
+                {% translate 'Feedback' as title %}
+                {% translate 'You are welcome to submit feedback regarding the evaluation platform or specific evaluations. Please let us know how we can improve your experience on EvaP.' as teaser %}
+                {% translate "Problems/Feedback" as show_button_text %}
+                {% include 'contact_modal.html' with modal_id='feedbackModal' user=request.user title=title teaser=teaser show_button_text=show_button_text show_button_class="btn btn-light"%}
             </div>
         </div>
-    </form>
+    </div>
 {% endblock %}
-
-{% block modals %}
-    {{ block.super }}
-    {% translate 'Request user setting changes' as title %}
-    {% translate 'Please tell us which of your settings we should change.' as teaser %}
-    {% include 'contact_modal.html' with modal_id='changeRequestModal' user=request.user title=title teaser=teaser %}
-{% endblock %}
\ No newline at end of file
diff --git a/evap/static/scss/components/_buttons.scss b/evap/static/scss/components/_buttons.scss
index 7016d8e245..8e392fd3b3 100644
--- a/evap/static/scss/components/_buttons.scss
+++ b/evap/static/scss/components/_buttons.scss
@@ -145,9 +145,6 @@ a:not([href]):not(.disabled) {
 
 .feedback-button {
     @include media-breakpoint-up(md) {
-        position: fixed;
-        right: 10px;
-        bottom: 8px;
         z-index: $zindex-fixed;
     }
 

From 2ec8bd91a7564cb8ba168244488da74ea0acea97 Mon Sep 17 00:00:00 2001
From: styrix560 <github@jakubzick.dev>
Date: Mon, 2 Mar 2026 21:00:12 +0100
Subject: [PATCH 07/22] Remove console.log

---
 evap/static/ts/src/confirmation-modal.ts | 2 --
 1 file changed, 2 deletions(-)

diff --git a/evap/static/ts/src/confirmation-modal.ts b/evap/static/ts/src/confirmation-modal.ts
index 8004a975b1..9f5eb1af29 100644
--- a/evap/static/ts/src/confirmation-modal.ts
+++ b/evap/static/ts/src/confirmation-modal.ts
@@ -52,7 +52,6 @@ export class ConfirmationModal extends HTMLElement {
             return;
         }
 
-        console.log("here");
         this.closeDialogSlowly();
 
         if (isConfirm) {
@@ -77,7 +76,6 @@ export class ConfirmationModal extends HTMLElement {
         this.dialog.addEventListener(
             "animationend",
             () => {
-                console.log("final close");
                 this.dialog.removeAttribute("closing");
                 this.dialog.close();
             },

From 481cec554f1ccec5e6e17c3bf8a99299627d1b61 Mon Sep 17 00:00:00 2001
From: styrix560 <github@jakubzick.dev>
Date: Mon, 2 Mar 2026 21:03:47 +0100
Subject: [PATCH 08/22] Remove unused code

---
 evap/evaluation/templates/contact_modal.html | 42 --------------------
 1 file changed, 42 deletions(-)

diff --git a/evap/evaluation/templates/contact_modal.html b/evap/evaluation/templates/contact_modal.html
index c6d62357ba..ecfbe4d794 100644
--- a/evap/evaluation/templates/contact_modal.html
+++ b/evap/evaluation/templates/contact_modal.html
@@ -49,45 +49,3 @@
     const contactModal = document.querySelector("#contact-modal-form");
     contactModal.addEventListener("submit-success", onSuccess);
 </script>
-
-
-{#<div class="modal fade" id="{{ modal_id }}" tabindex="-1" role="dialog" aria-labelledby="{{ modal_id }}Label" aria-hidden="true">#}
-{#    <div class="modal-dialog modal-lg" role="document">#}
-{#        <div class="modal-content">#}
-{#            <div class="modal-header">#}
-{#                <h5 class="modal-title" id="{{ modal_id }}Label">{{ title }}</h5>#}
-{#                <button type="button" class="btn-close" data-bs-dismiss="modal" aria-label="Close"></button>#}
-{#            </div>#}
-{#            <form id="{{ modal_id }}Form">#}
-{#                <div class="modal-body">#}
-{#                    {{ teaser }}#}
-{#                    <div class="modal-grid">#}
-{#                        <label for="{{ modal_id }}SenderName" class="control-label my-auto pe-4">{% translate 'Sender' %}</label>#}
-{#                        {% if modal_id == "feedbackModal" and allow_anonymous_feedback_messages %}#}
-{#                            <div class="btn-group text-wrap" role="group" aria-label="{{ modal_id }} Radio Group">#}
-{#                                <input type="radio" class="btn-check" name="{{ modal_id }}RadioGroup" id="{{ modal_id }}SenderName" checked>#}
-{#                                <label class="btn btn-sm btn-outline-primary text-break" for="{{ modal_id }}SenderName">{{ user.full_name }}</label>#}
-{#                                <input type="radio" class="btn-check" name="{{ modal_id }}RadioGroup" id="{{ modal_id }}AnonymousName">#}
-{#                                <label class="btn btn-sm btn-outline-primary text-break" for="{{ modal_id }}AnonymousName">{% translate 'Anonymous' %}</label>#}
-{#                            </div>#}
-{#                        {% else %}#}
-{#                            <input type="text" class="form-control mx-auto text-break" id="{{ modal_id }}SenderName" disabled value="{{ user.full_name }}"/>#}
-{#                        {% endif %}#}
-{#                        <label for="{{ modal_id }}Subject" class="control-label my-auto pe-4 text-break">{% translate 'Subject' %}</label>#}
-{#                        <input type="text" class="form-control mx-auto" id="{{ modal_id }}Subject" disabled value="{{ title }}"/>#}
-{#                    </div>#}
-{#                    <textarea autofocus class="form-control modal-textfield my-4" id="{{ modal_id }}MessageText"></textarea>#}
-{#                    <div class="modal-submit-group">#}
-{#                        <button type="button" class="btn btn-light me-1" data-bs-dismiss="modal">{% translate 'Cancel' %}</button>#}
-{#                        <button type="submit" id="{{ modal_id }}ActionButton" class="btn btn-primary ms-1">{% translate 'Send Message' %}</button>#}
-{#                    </div>#}
-{#                </div>#}
-{#            </form>#}
-{#        </div>#}
-{#    </div>#}
-{#</div>#}
-{#<script type="module">#}
-    {#import { ContactModalLogic } from "{% static 'js/contact_modal.js' %}";#}
-    {##}
-    {#new ContactModalLogic("{{ modal_id }}", "{{ title|escapejs }}").attach();#}
-{#</script>#}

From 76e3aac8cee10a1e43ff0f6e0ad911d281a1048b Mon Sep 17 00:00:00 2001
From: styrix560 <github@jakubzick.dev>
Date: Mon, 16 Mar 2026 18:17:54 +0100
Subject: [PATCH 09/22] Add success message

---
 evap/evaluation/templates/contact_modal.html | 19 +++++++------------
 evap/evaluation/templates/footer.html        |  5 ++---
 evap/evaluation/templates/profile.html       |  6 +++---
 evap/evaluation/views.py                     |  2 +-
 4 files changed, 13 insertions(+), 19 deletions(-)

diff --git a/evap/evaluation/templates/contact_modal.html b/evap/evaluation/templates/contact_modal.html
index ecfbe4d794..5a0096b8cf 100644
--- a/evap/evaluation/templates/contact_modal.html
+++ b/evap/evaluation/templates/contact_modal.html
@@ -1,6 +1,6 @@
 {% load static %}
 
-<form custom-success id="contact-modal-form" method="POST" action="{% url 'evaluation:contact' %}">
+<form custom-success id="contact-modal-form-{{ modal_id }}" method="POST" action="{% url 'evaluation:contact' %}">
     {% csrf_token %}
     <input hidden name="title" value="{{ title }}"/>
 
@@ -28,24 +28,19 @@
             <textarea autofocus class="form-control modal-textfield my-4" id="{{ modal_id }}MessageText" name="message"></textarea>
         </div>
 
-        <span class="feedback-button" slot="show-button">
+        <div class="feedback-button" slot="show-button">
             <button type="button" class="{{ show_button_class }}">{{ show_button_text }}</button>
-        </span>
+        </div>
     </confirmation-modal>
 </form>
 <script type="module">
-    const SUCCESS_MESSAGE_TIMEOUT = 100000;
-
-    const actionButtonElement = () => document.querySelector("button[data-event-type=confirm]");
-    const successMessageModal = new bootstrap.Modal(document.querySelector("#successMessageModal_{{ modal_id }}"));
-    const messageTextElement = document.querySelector("#{{ modal_id }}MessageText");
+   const messageTextElement = document.querySelector("#{{ modal_id }}MessageText");
 
     function onSuccess() {
-        successMessageModal.show();
         messageTextElement.value = "";
-
-        setInterval(() => successMessageModal.hide(), SUCCESS_MESSAGE_TIMEOUT);
+        window.location.reload();
+        console.log("here");
     }
-    const contactModal = document.querySelector("#contact-modal-form");
+    const contactModal = document.querySelector("#contact-modal-form-{{ modal_id }}");
     contactModal.addEventListener("submit-success", onSuccess);
 </script>
diff --git a/evap/evaluation/templates/footer.html b/evap/evaluation/templates/footer.html
index 7715e67091..0fb42161a5 100644
--- a/evap/evaluation/templates/footer.html
+++ b/evap/evaluation/templates/footer.html
@@ -24,10 +24,9 @@
                     {% translate 'Feedback' as title %}
                     {% translate 'You are welcome to submit feedback regarding the evaluation platform or specific evaluations. Please let us know how we can improve your experience on EvaP.' as teaser %}
                     {% translate "Problems/Feedback" as show_button_text %}
-                    {% include 'contact_modal.html' with modal_id='feedbackModal' user=request.user title=title teaser=teaser show_button_text=show_button_text show_button_class="btn btn-dark"%}
+                    {% include 'contact_modal.html' with modal_id='feedbackModal' user=request.user title=title teaser=teaser show_button_text=show_button_text show_button_class="btn btn-dark" %}
                 {% endif %}
             </div>
         </div>
     </nav>
-</div>
-1
\ No newline at end of file
+</div>
\ No newline at end of file
diff --git a/evap/evaluation/templates/profile.html b/evap/evaluation/templates/profile.html
index 4fb7722df5..5aeb118d42 100644
--- a/evap/evaluation/templates/profile.html
+++ b/evap/evaluation/templates/profile.html
@@ -77,10 +77,10 @@ <h4 class="card-title mb-4">{% translate 'Delegates and emails' %}</h4>
                 <button type="submit" class="btn btn-primary">
                     {% translate 'Save' %}
                 </button>
-                {% translate 'Feedback' as title %}
+                {% translate 'Request user setting changes' as title %}
                 {% translate 'You are welcome to submit feedback regarding the evaluation platform or specific evaluations. Please let us know how we can improve your experience on EvaP.' as teaser %}
-                {% translate "Problems/Feedback" as show_button_text %}
-                {% include 'contact_modal.html' with modal_id='feedbackModal' user=request.user title=title teaser=teaser show_button_text=show_button_text show_button_class="btn btn-light"%}
+                {% translate "Request changes" as show_button_text %}
+                {% include 'contact_modal.html' with modal_id='requestChangesModal' user=request.user title=title teaser=teaser show_button_text=show_button_text show_button_class="btn btn-light"%}
             </div>
         </div>
     </div>
diff --git a/evap/evaluation/views.py b/evap/evaluation/views.py
index 93ec597210..fa47af4612 100644
--- a/evap/evaluation/views.py
+++ b/evap/evaluation/views.py
@@ -189,12 +189,12 @@ def contact(request):
         try:
             mail.send()
             logger.info("Sent contact email: \n%s\n", mail.message())
+            messages.success(request, _("Message was successfully sent."))
             return HttpResponse()
         except Exception:
             logger.exception("An exception occurred when sending the following contact email:\n%s\n", mail.message())
             raise
 
-    # 204 or helper method no_content
     return HttpResponseBadRequest()
 
 

From 5c267b2b68e4b2606fdf88f746b82f45258747d1 Mon Sep 17 00:00:00 2001
From: styrix560 <github@jakubzick.dev>
Date: Mon, 16 Mar 2026 18:34:12 +0100
Subject: [PATCH 10/22] Add whitespace

---
 evap/evaluation/templates/footer.html | 2 +-
 evap/student/tests/test_live.py       | 1 -
 2 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/evap/evaluation/templates/footer.html b/evap/evaluation/templates/footer.html
index 0fb42161a5..8bac4537d0 100644
--- a/evap/evaluation/templates/footer.html
+++ b/evap/evaluation/templates/footer.html
@@ -29,4 +29,4 @@
             </div>
         </div>
     </nav>
-</div>
\ No newline at end of file
+</div>
diff --git a/evap/student/tests/test_live.py b/evap/student/tests/test_live.py
index fb58f0b0dc..3c6e84b96d 100644
--- a/evap/student/tests/test_live.py
+++ b/evap/student/tests/test_live.py
@@ -28,7 +28,6 @@ def setUp(self) -> None:
         voting_user2 = baker.make(UserProfile, email="voting_user2@institution.example.com")
         contributor1 = baker.make(UserProfile, email="contributor1@institution.example.com")
         contributor2 = baker.make(UserProfile, email="contributor2@institution.example.com")
-
         evaluation = baker.make(
             Evaluation,
             participants=[voting_user1, voting_user2, contributor1],

From 93d7c3c0f0623e5c41e66d0c097a31e8b3b46b2b Mon Sep 17 00:00:00 2001
From: styrix560 <github@jakubzick.dev>
Date: Mon, 16 Mar 2026 20:11:57 +0100
Subject: [PATCH 11/22] Fix tests

---
 evap/contributor/tests/test_views.py         | 2 +-
 evap/evaluation/templates/contact_modal.html | 8 ++++----
 evap/evaluation/tests/test_live.py           | 4 ++--
 evap/evaluation/views.py                     | 2 +-
 4 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/evap/contributor/tests/test_views.py b/evap/contributor/tests/test_views.py
index 4db2451b10..56069a4033 100644
--- a/evap/contributor/tests/test_views.py
+++ b/evap/contributor/tests/test_views.py
@@ -246,7 +246,7 @@ def test_contact_modal_escape(self):
         self.evaluation.save()
         page = self.app.get(self.url, user=self.responsible, status=200)
 
-        self.assertIn("changeEvaluationRequestModalLabel", page)
+        self.assertIn("createContributorAccountRequestModalTitle", page)
 
         self.assertNotIn("Adam &amp;amp; Eve", page)
         self.assertIn("Adam &amp; Eve", page)
diff --git a/evap/evaluation/templates/contact_modal.html b/evap/evaluation/templates/contact_modal.html
index 5a0096b8cf..3fb16a1223 100644
--- a/evap/evaluation/templates/contact_modal.html
+++ b/evap/evaluation/templates/contact_modal.html
@@ -5,9 +5,9 @@
     <input hidden name="title" value="{{ title }}"/>
 
     <confirmation-modal type="submit">
-        <span slot="title">{{ title }}</span>
-        <span slot="question">{{ teaser }}</span>
-        <span slot="action-text">{% translate 'Send Message' %}</span>
+        <span slot="title" id="{{ modal_id }}Title">{{ title }}</span>
+        <span slot="question" id="{{ modal_id }}Teaser">{{ teaser }}</span>
+        <span slot="action-text" id="{{ modal_id }}Teaser">{% translate 'Send Message' %}</span>
 
         <div slot="extra-inputs">
             <div class="modal-grid">
@@ -29,7 +29,7 @@
         </div>
 
         <div class="feedback-button" slot="show-button">
-            <button type="button" class="{{ show_button_class }}">{{ show_button_text }}</button>
+            <button type="button" class="{{ show_button_class }}" id="{{ modal_id }}ShowButton">{{ show_button_text }}</button>
         </div>
     </confirmation-modal>
 </form>
diff --git a/evap/evaluation/tests/test_live.py b/evap/evaluation/tests/test_live.py
index e789091268..48751f804a 100644
--- a/evap/evaluation/tests/test_live.py
+++ b/evap/evaluation/tests/test_live.py
@@ -11,11 +11,11 @@ def test_contact_modal(self) -> None:
         self.selenium.find_element(By.ID, "feedbackModalShowButton").click()
         self.wait.until(visibility_of_element_located((By.ID, "feedbackModalMessageText")))
         self.selenium.find_element(By.ID, "feedbackModalMessageText").send_keys("Test message")
-        self.selenium.find_element(By.ID, "feedbackModalActionButton").click()
+        self.selenium.find_element(By.CSS_SELECTOR, "span[slot='action-text']").click()
 
         self.wait.until(
             text_to_be_present_in_element(
-                (By.CSS_SELECTOR, "#successMessageModal_feedbackModal .modal-body"),
+                (By.CSS_SELECTOR, ".alert-success"),
                 "Your message was successfully sent.",
             )
         )
diff --git a/evap/evaluation/views.py b/evap/evaluation/views.py
index fa47af4612..70cbc71325 100644
--- a/evap/evaluation/views.py
+++ b/evap/evaluation/views.py
@@ -189,7 +189,7 @@ def contact(request):
         try:
             mail.send()
             logger.info("Sent contact email: \n%s\n", mail.message())
-            messages.success(request, _("Message was successfully sent."))
+            messages.success(request, _("Your message was successfully sent."))
             return HttpResponse()
         except Exception:
             logger.exception("An exception occurred when sending the following contact email:\n%s\n", mail.message())

From 507fa15145a6951998978d5222382e0173d1cb10 Mon Sep 17 00:00:00 2001
From: styrix560 <github@jakubzick.dev>
Date: Mon, 16 Mar 2026 20:18:10 +0100
Subject: [PATCH 12/22] Fix whitespace

---
 evap/contributor/templates/contributor_evaluation_form.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/evap/contributor/templates/contributor_evaluation_form.html b/evap/contributor/templates/contributor_evaluation_form.html
index aed0631c43..8b0d7042cd 100644
--- a/evap/contributor/templates/contributor_evaluation_form.html
+++ b/evap/contributor/templates/contributor_evaluation_form.html
@@ -76,7 +76,7 @@ <h5 class="card-title me-auto">{% translate 'Evaluation data' %}</h5>
                             {% blocktranslate asvar title with evaluation_name=evaluation.full_name %}Request evaluation changes for {{ evaluation_name }}{% endblocktranslate %}
                             {% translate 'Please tell us what changes to the evaluation we should make.' as teaser %}
                             {% translate 'Request changes' as show_button_text %}
-                            {% include 'contact_modal.html' with modal_id='changeEvaluationRequestModal' user=request.user title=title teaser=teaser show_button_text=show_button_text show_button_class="btn btn-sm btn-light"%}
+                            {% include 'contact_modal.html' with modal_id='changeEvaluationRequestModal' user=request.user title=title teaser=teaser show_button_text=show_button_text show_button_class="btn btn-sm btn-light" %}
                         </div>
                     {% endif %}
                 </div>

From 24d97fea5046deeda254b85c60dd7ecf59200731 Mon Sep 17 00:00:00 2001
From: styrix560 <github@jakubzick.dev>
Date: Mon, 16 Mar 2026 20:18:44 +0100
Subject: [PATCH 13/22] More whitespace

---
 evap/contributor/templates/contributor_evaluation_form.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/evap/contributor/templates/contributor_evaluation_form.html b/evap/contributor/templates/contributor_evaluation_form.html
index 8b0d7042cd..1c68930638 100644
--- a/evap/contributor/templates/contributor_evaluation_form.html
+++ b/evap/contributor/templates/contributor_evaluation_form.html
@@ -69,7 +69,7 @@ <h5 class="card-title me-auto">{% translate 'Evaluation data' %}</h5>
                             {% blocktranslate asvar title with evaluation_name=evaluation.full_name %}Request account creation for {{ evaluation_name }}{% endblocktranslate %}
                             {% translate 'Please tell us which new account we should create. We need the name and email for all new accounts.' as teaser %}
                             {% translate 'Request creation of new account' as show_button_text %}
-                            {% include 'contact_modal.html' with modal_id='createParticipantAccountRequestModal' user=request.user title=title teaser=teaser show_button_text=show_button_text show_button_class="btn btn-sm btn-light mb-3"%}
+                            {% include 'contact_modal.html' with modal_id='createParticipantAccountRequestModal' user=request.user title=title teaser=teaser show_button_text=show_button_text show_button_class="btn btn-sm btn-light mb-3" %}
                         </div>
                     {% else %}
                         <div>

From b4632f2832e7f26dbe9782dbbe6cdf6bdebe17b7 Mon Sep 17 00:00:00 2001
From: styrix560 <github@jakubzick.dev>
Date: Mon, 16 Mar 2026 21:19:06 +0100
Subject: [PATCH 14/22] Add label and placeholder to contact modal textarea

---
 evap/evaluation/templates/contact_modal.html | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/evap/evaluation/templates/contact_modal.html b/evap/evaluation/templates/contact_modal.html
index 3fb16a1223..bde0cf708b 100644
--- a/evap/evaluation/templates/contact_modal.html
+++ b/evap/evaluation/templates/contact_modal.html
@@ -25,7 +25,8 @@
                 <label for="{{ modal_id }}Subject" class="control-label my-auto pe-4 text-break">{% translate 'Subject' %}</label>
                 <input type="text" class="form-control mx-auto" id="{{ modal_id }}Subject" disabled value="{{ title }}"/>
             </div>
-            <textarea autofocus class="form-control modal-textfield my-4" id="{{ modal_id }}MessageText" name="message"></textarea>
+            <label for="{{ modal_id }}MessageText" class="d-none">Nachricht</label>
+            <textarea autofocus class="form-control modal-textfield my-4" id="{{ modal_id }}MessageText" name="message" placeholder="Nachricht"></textarea>
         </div>
 
         <div class="feedback-button" slot="show-button">

From 013b600ea703b7e75287e176af359f335fc9ad92 Mon Sep 17 00:00:00 2001
From: styrix560 <github@jakubzick.dev>
Date: Mon, 16 Mar 2026 21:23:47 +0100
Subject: [PATCH 15/22] Fix text in profile contact_modal

---
 evap/evaluation/templates/profile.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/evap/evaluation/templates/profile.html b/evap/evaluation/templates/profile.html
index 5aeb118d42..7f2a692d5a 100644
--- a/evap/evaluation/templates/profile.html
+++ b/evap/evaluation/templates/profile.html
@@ -78,7 +78,7 @@ <h4 class="card-title mb-4">{% translate 'Delegates and emails' %}</h4>
                     {% translate 'Save' %}
                 </button>
                 {% translate 'Request user setting changes' as title %}
-                {% translate 'You are welcome to submit feedback regarding the evaluation platform or specific evaluations. Please let us know how we can improve your experience on EvaP.' as teaser %}
+                {% translate 'Please tell us which of your settings we should change.' as teaser %}
                 {% translate "Request changes" as show_button_text %}
                 {% include 'contact_modal.html' with modal_id='requestChangesModal' user=request.user title=title teaser=teaser show_button_text=show_button_text show_button_class="btn btn-light"%}
             </div>

From 49c323522bf55161eb7a2cc3d952e8e85814b2c9 Mon Sep 17 00:00:00 2001
From: styrix560 <github@jakubzick.dev>
Date: Mon, 16 Mar 2026 21:43:09 +0100
Subject: [PATCH 16/22] stuff :)

---
 evap/evaluation/templates/contact_modal.html | 1 -
 evap/static/scss/components/_buttons.scss    | 3 +++
 evap/student/tests/test_live.py              | 1 +
 3 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/evap/evaluation/templates/contact_modal.html b/evap/evaluation/templates/contact_modal.html
index bde0cf708b..60e1fc74f5 100644
--- a/evap/evaluation/templates/contact_modal.html
+++ b/evap/evaluation/templates/contact_modal.html
@@ -40,7 +40,6 @@
     function onSuccess() {
         messageTextElement.value = "";
         window.location.reload();
-        console.log("here");
     }
     const contactModal = document.querySelector("#contact-modal-form-{{ modal_id }}");
     contactModal.addEventListener("submit-success", onSuccess);
diff --git a/evap/static/scss/components/_buttons.scss b/evap/static/scss/components/_buttons.scss
index 8e392fd3b3..7016d8e245 100644
--- a/evap/static/scss/components/_buttons.scss
+++ b/evap/static/scss/components/_buttons.scss
@@ -145,6 +145,9 @@ a:not([href]):not(.disabled) {
 
 .feedback-button {
     @include media-breakpoint-up(md) {
+        position: fixed;
+        right: 10px;
+        bottom: 8px;
         z-index: $zindex-fixed;
     }
 
diff --git a/evap/student/tests/test_live.py b/evap/student/tests/test_live.py
index 3c6e84b96d..e6e40f8a8e 100644
--- a/evap/student/tests/test_live.py
+++ b/evap/student/tests/test_live.py
@@ -28,6 +28,7 @@ def setUp(self) -> None:
         voting_user2 = baker.make(UserProfile, email="voting_user2@institution.example.com")
         contributor1 = baker.make(UserProfile, email="contributor1@institution.example.com")
         contributor2 = baker.make(UserProfile, email="contributor2@institution.example.com")
+        
         evaluation = baker.make(
             Evaluation,
             participants=[voting_user1, voting_user2, contributor1],

From 4f2171130a26e0b6f880b1af3eca99cfb4acf691 Mon Sep 17 00:00:00 2001
From: styrix560 <github@jakubzick.dev>
Date: Mon, 16 Mar 2026 21:43:30 +0100
Subject: [PATCH 17/22] whitespace

---
 evap/student/tests/test_live.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/evap/student/tests/test_live.py b/evap/student/tests/test_live.py
index e6e40f8a8e..fb58f0b0dc 100644
--- a/evap/student/tests/test_live.py
+++ b/evap/student/tests/test_live.py
@@ -28,7 +28,7 @@ def setUp(self) -> None:
         voting_user2 = baker.make(UserProfile, email="voting_user2@institution.example.com")
         contributor1 = baker.make(UserProfile, email="contributor1@institution.example.com")
         contributor2 = baker.make(UserProfile, email="contributor2@institution.example.com")
-        
+
         evaluation = baker.make(
             Evaluation,
             participants=[voting_user1, voting_user2, contributor1],

From 6ab887d662a84eff2051f44e1d9bc26be2664bff Mon Sep 17 00:00:00 2001
From: styrix560 <github@jakubzick.dev>
Date: Mon, 13 Apr 2026 17:33:41 +0200
Subject: [PATCH 18/22] Add modals block back in

---
 evap/evaluation/templates/base.html | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/evap/evaluation/templates/base.html b/evap/evaluation/templates/base.html
index fec611c7e1..7ed8493571 100644
--- a/evap/evaluation/templates/base.html
+++ b/evap/evaluation/templates/base.html
@@ -30,6 +30,9 @@
 
         {% include "custom_elements.html" %}
 
+        {% block modals %}
+        {% endblock %}
+
         <div class="sticky-top d-print-none z-over-fixed">
             {% include_navbar user LANGUAGE_CODE %}
 

From 6287dd920f67c207733e2896b368f6444b1c0af5 Mon Sep 17 00:00:00 2001
From: styrix560 <github@jakubzick.dev>
Date: Mon, 13 Apr 2026 17:37:58 +0200
Subject: [PATCH 19/22] Fix ids

---
 evap/evaluation/templates/contact_modal.html | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/evap/evaluation/templates/contact_modal.html b/evap/evaluation/templates/contact_modal.html
index 60e1fc74f5..1a94322296 100644
--- a/evap/evaluation/templates/contact_modal.html
+++ b/evap/evaluation/templates/contact_modal.html
@@ -6,8 +6,8 @@
 
     <confirmation-modal type="submit">
         <span slot="title" id="{{ modal_id }}Title">{{ title }}</span>
-        <span slot="question" id="{{ modal_id }}Teaser">{{ teaser }}</span>
-        <span slot="action-text" id="{{ modal_id }}Teaser">{% translate 'Send Message' %}</span>
+        <span slot="question" id="{{ modal_id }}Question">{{ teaser }}</span>
+        <span slot="action-text" id="{{ modal_id }}ActionText">{% translate 'Send Message' %}</span>
 
         <div slot="extra-inputs">
             <div class="modal-grid">

From 6a8d1b4a723e762097b1df0ec6a6468ea31c96bb Mon Sep 17 00:00:00 2001
From: styrix560 <github@jakubzick.dev>
Date: Mon, 13 Apr 2026 17:43:04 +0200
Subject: [PATCH 20/22] Fix ids

---
 evap/evaluation/templates/contact_modal.html | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/evap/evaluation/templates/contact_modal.html b/evap/evaluation/templates/contact_modal.html
index 1a94322296..ab3d144d4e 100644
--- a/evap/evaluation/templates/contact_modal.html
+++ b/evap/evaluation/templates/contact_modal.html
@@ -6,8 +6,8 @@
 
     <confirmation-modal type="submit">
         <span slot="title" id="{{ modal_id }}Title">{{ title }}</span>
-        <span slot="question" id="{{ modal_id }}Question">{{ teaser }}</span>
-        <span slot="action-text" id="{{ modal_id }}ActionText">{% translate 'Send Message' %}</span>
+        <span slot="question">{{ teaser }}</span>
+        <span slot="action-text">{% translate 'Send Message' %}</span>
 
         <div slot="extra-inputs">
             <div class="modal-grid">

From b945b30d96ced4dbf2b17dd184c5c37bc84ba5a5 Mon Sep 17 00:00:00 2001
From: styrix560 <github@jakubzick.dev>
Date: Mon, 13 Apr 2026 18:39:06 +0200
Subject: [PATCH 21/22] Remove custom JS from contact modal

---
 evap/evaluation/templates/contact_modal.html | 12 +-----------
 1 file changed, 1 insertion(+), 11 deletions(-)

diff --git a/evap/evaluation/templates/contact_modal.html b/evap/evaluation/templates/contact_modal.html
index ab3d144d4e..879a5de91e 100644
--- a/evap/evaluation/templates/contact_modal.html
+++ b/evap/evaluation/templates/contact_modal.html
@@ -1,6 +1,6 @@
 {% load static %}
 
-<form custom-success id="contact-modal-form-{{ modal_id }}" method="POST" action="{% url 'evaluation:contact' %}">
+<form reload-on-success id="contact-modal-form-{{ modal_id }}" method="POST" action="{% url 'evaluation:contact' %}">
     {% csrf_token %}
     <input hidden name="title" value="{{ title }}"/>
 
@@ -34,13 +34,3 @@
         </div>
     </confirmation-modal>
 </form>
-<script type="module">
-   const messageTextElement = document.querySelector("#{{ modal_id }}MessageText");
-
-    function onSuccess() {
-        messageTextElement.value = "";
-        window.location.reload();
-    }
-    const contactModal = document.querySelector("#contact-modal-form-{{ modal_id }}");
-    contactModal.addEventListener("submit-success", onSuccess);
-</script>

From 01e7afdf23a11edbea885c426bee5fd97620b3f2 Mon Sep 17 00:00:00 2001
From: styrix560 <github@jakubzick.dev>
Date: Mon, 13 Apr 2026 21:23:47 +0200
Subject: [PATCH 22/22] Fix button UI

---
 evap/evaluation/templates/contact_modal.html | 2 +-
 evap/evaluation/tests/test_live.py           | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/evap/evaluation/templates/contact_modal.html b/evap/evaluation/templates/contact_modal.html
index 879a5de91e..e58b97a1c0 100644
--- a/evap/evaluation/templates/contact_modal.html
+++ b/evap/evaluation/templates/contact_modal.html
@@ -29,7 +29,7 @@
             <textarea autofocus class="form-control modal-textfield my-4" id="{{ modal_id }}MessageText" name="message" placeholder="Nachricht"></textarea>
         </div>
 
-        <div class="feedback-button" slot="show-button">
+        <div class="{% if modal_id == "feedbackModal" %}feedback-button{% endif %}" slot="show-button">
             <button type="button" class="{{ show_button_class }}" id="{{ modal_id }}ShowButton">{{ show_button_text }}</button>
         </div>
     </confirmation-modal>
diff --git a/evap/evaluation/tests/test_live.py b/evap/evaluation/tests/test_live.py
index 48751f804a..701f16e317 100644
--- a/evap/evaluation/tests/test_live.py
+++ b/evap/evaluation/tests/test_live.py
@@ -11,7 +11,7 @@ def test_contact_modal(self) -> None:
         self.selenium.find_element(By.ID, "feedbackModalShowButton").click()
         self.wait.until(visibility_of_element_located((By.ID, "feedbackModalMessageText")))
         self.selenium.find_element(By.ID, "feedbackModalMessageText").send_keys("Test message")
-        self.selenium.find_element(By.CSS_SELECTOR, "span[slot='action-text']").click()
+        self.selenium.find_element(By.CSS_SELECTOR, "confirmation-modal > span[slot='action-text']").click()
 
         self.wait.until(
             text_to_be_present_in_element(