From ada194122d1e423ddfd130eebeeaac7b92b94dac Mon Sep 17 00:00:00 2001
From: moanos <julian-samuel@gebuehr.net>
Date: Sun, 25 May 2025 00:10:47 +0200
Subject: [PATCH] refactor(bulma): convert all account related templates

---
 src/fellchensammlung/forms.py                 | 11 ++---
 .../django_registration/activate.html         |  4 +-
 .../activation_complete.html                  |  2 +-
 .../activation_failed.html                    |  2 +-
 .../django_registration/activation_form.html  |  4 +-
 .../registration_closed.html                  |  4 +-
 .../registration_complete.html                |  4 +-
 .../registration_form.html                    |  5 ++-
 src/templates/registration/logged_out.html    |  6 +--
 src/templates/registration/login.html         | 42 ++++++++++++-------
 .../registration/password_reset_complete.html |  6 +--
 .../password_reset_confirmation.html          |  4 +-
 .../registration/password_reset_done.html     |  2 +-
 .../registration/password_reset_form.html     | 10 ++---
 14 files changed, 57 insertions(+), 49 deletions(-)

diff --git a/src/fellchensammlung/forms.py b/src/fellchensammlung/forms.py
index a922992..c226e2d 100644
--- a/src/fellchensammlung/forms.py
+++ b/src/fellchensammlung/forms.py
@@ -187,20 +187,15 @@ class ModerationActionForm(forms.ModelForm):
 
 
 class CustomRegistrationForm(RegistrationForm):
+
     class Meta(RegistrationForm.Meta):
         model = User
 
+    template_name = "fellchensammlung/forms/form_snippets.html"
+
     captcha = forms.CharField(validators=[animal_validator], label=_("Nenne eine bekannte Tierart"), help_text=_(
         "Bitte nenne hier eine bekannte Tierart (z.B. ein Tier das an der Leine geführt wird). Das Fragen wir dich um sicherzustellen, dass du kein Roboter bist."))
 
-    def __init__(self, *args, **kwargs):
-        super().__init__(*args, **kwargs)
-        self.helper = FormHelper()
-        self.helper.form_id = 'form-registration'
-        self.helper.form_class = 'card'
-
-        self.helper.add_input(Submit('submit', _('Registrieren'), css_class="btn"))
-
 
 class AdoptionNoticeSearchForm(forms.Form):
     template_name = "fellchensammlung/forms/form_snippets.html"
diff --git a/src/templates/django_registration/activate.html b/src/templates/django_registration/activate.html
index a0af8f1..f6332a7 100644
--- a/src/templates/django_registration/activate.html
+++ b/src/templates/django_registration/activate.html
@@ -1,8 +1,8 @@
-{% extends "fellchensammlung/base.html" %}
+{% extends "fellchensammlung/base_bulma.html" %}
 {% load i18n %}
 
 {% block content %}
 
-<p>{% translate "Account aktivierung fehlgeschlagen" %}</p>
+<p class="is-warning">{% translate "Account aktivierung fehlgeschlagen" %}</p>
 
 {% endblock %}
\ No newline at end of file
diff --git a/src/templates/django_registration/activation_complete.html b/src/templates/django_registration/activation_complete.html
index 5f7e026..f8e19cd 100644
--- a/src/templates/django_registration/activation_complete.html
+++ b/src/templates/django_registration/activation_complete.html
@@ -1,4 +1,4 @@
-{% extends "fellchensammlung/base_generic.html" %}
+{% extends "fellchensammlung/base_bulma.html" %}
 {% load i18n %}
 
 {% block content %}
diff --git a/src/templates/django_registration/activation_failed.html b/src/templates/django_registration/activation_failed.html
index fdbc95a..cd7f85a 100644
--- a/src/templates/django_registration/activation_failed.html
+++ b/src/templates/django_registration/activation_failed.html
@@ -2,5 +2,5 @@
 {% load i18n %}
 
 {% block content %}
-<p>{% translate "Aktivierung fehlgeschlagen. Sende eine E-Mail an info@notfellchen.org für einen Account." %}</p>
+<p class="is-warning">{% translate "Aktivierung fehlgeschlagen. Sende eine E-Mail an info@notfellchen.org für einen Account." %}</p>
 {% endblock %}
\ No newline at end of file
diff --git a/src/templates/django_registration/activation_form.html b/src/templates/django_registration/activation_form.html
index dc99097..d5d797c 100644
--- a/src/templates/django_registration/activation_form.html
+++ b/src/templates/django_registration/activation_form.html
@@ -3,12 +3,12 @@
 {% load crispy_forms_tags %}
 
 {% block content %}
-    <div class="card">
+    <div class="block">
     {% if not user.is_authenticated %}
         <form action="" method="post">
             {% csrf_token %}
             {{ form.as_p }}
-            <input type="submit" class="btn" value={% translate 'Absenden' %}>
+            <input type="submit" class="button is-primary" value={% translate 'Absenden' %}>
         </form>
     {% else %}
         <p>{% translate "Du bist bereits eingeloggt." %}</p>
diff --git a/src/templates/django_registration/registration_closed.html b/src/templates/django_registration/registration_closed.html
index 9884838..84ef0fd 100644
--- a/src/templates/django_registration/registration_closed.html
+++ b/src/templates/django_registration/registration_closed.html
@@ -1,6 +1,6 @@
-{% extends "fellchensammlung/base_generic.html" %}
+{% extends "fellchensammlung/base_bulma.html" %}
 {% load i18n %}
 
 {% block content %}
-	<p>{% translate "Registrierung ist fehlgeschlagen." %}</p>
+	<p class="is-danger">{% translate "Registrierung ist fehlgeschlagen." %}</p>
 {% endblock %}
\ No newline at end of file
diff --git a/src/templates/django_registration/registration_complete.html b/src/templates/django_registration/registration_complete.html
index d6adc6b..2f9eb87 100644
--- a/src/templates/django_registration/registration_complete.html
+++ b/src/templates/django_registration/registration_complete.html
@@ -1,8 +1,8 @@
-{% extends "fellchensammlung/base_generic.html" %}
+{% extends "fellchensammlung/base_bulma.html" %}
 {% load i18n %}
 
 {% block content %}
-    <p class="card">
+    <p class="block">
         {% blocktranslate %}
             Du bist nun registriert und hast eine E-Mail mit einem Link zur Aktivierung deines Kontos bekommen. Solltest
             du die E-Mail nicht erhalten haben oder andere Fragen haben, schreib uns an info@notfellchen.org
diff --git a/src/templates/django_registration/registration_form.html b/src/templates/django_registration/registration_form.html
index 0052ac7..729aece 100644
--- a/src/templates/django_registration/registration_form.html
+++ b/src/templates/django_registration/registration_form.html
@@ -1,10 +1,11 @@
-{% extends "fellchensammlung/base_generic.html" %}
+{% extends "fellchensammlung/base_bulma.html" %}
 {% load i18n %}
 {% load crispy_forms_tags %}
 
 {% block content %}
     {% if not user.is_authenticated %}
-        {% crispy form %}
+        {{ form }}
+        <input class="button is-primary" type="submit" value="{% translate "Jetzt registrieren!" %}">
     {% else %}
         <p>{% translate "Du bist bereits eingeloggt." %}</p>
     {% endif %}
diff --git a/src/templates/registration/logged_out.html b/src/templates/registration/logged_out.html
index a18556c..5a05da2 100644
--- a/src/templates/registration/logged_out.html
+++ b/src/templates/registration/logged_out.html
@@ -1,7 +1,7 @@
-{% extends "fellchensammlung/base_generic.html" %}
+{% extends "fellchensammlung/base_bulma.html" %}
 {% load i18n %}
 
 {% block content %}
-  <p>{% translate "Ausloggen" %}!</p>
-  <a href="{% url 'login'%}">{% translate "Hier klicken um die wieder einzuloggen." %}</a>
+  <h1 class="title is-1">{% translate "Ausgeloggt" %}!</h1>
+  <a class="button is-primary" href="{% url 'login'%}">{% translate "Hier klicken um die wieder einzuloggen." %}</a>
 {% endblock %}
diff --git a/src/templates/registration/login.html b/src/templates/registration/login.html
index f578209..cd6f8f4 100644
--- a/src/templates/registration/login.html
+++ b/src/templates/registration/login.html
@@ -1,33 +1,45 @@
-{% extends "fellchensammlung/base_generic.html" %}
+{% extends "fellchensammlung/base_bulma.html" %}
 {% load i18n %}
 
 {% block content %}
 
     {% if form.errors %}
-        <p>{% translate "Dein Username oder Passwort ist falsch." %}</p>
+        <div class="notification is-warning">
+            <button class="delete"></button>
+            <p>
+                {% translate "Der eingegebene Username oder das Passwort ist falsch." %}
+            </p>
+        </div>
     {% endif %}
 
     {% if user.is_authenticated %}
-        <p>{% translate "Du bist bereits eingeloggt." %}</p>
+        <p class="is-warning">{% translate "Du bist bereits eingeloggt." %}</p>
     {% else %} {% if next %}
-        <p class="card">{% translate "Bitte log dich ein um diese Seite sehen zu können." %}</p>
+
+        <div class="notification is-warning">
+            <button class="delete"></button>
+            <p>
+                {% translate "Bitte log dich ein um diese Seite sehen zu können." %}
+            </p>
+        </div>
     {% endif %}
     {% endif %}
 
     {% if not user.is_authenticated %}
-        <div class="card">
-        <div class="container-edit-buttons">
-            <form method="post" action="{% url 'login' %}">
-                {% csrf_token %}
-                {{ form.as_p }}
-                <input class="btn" type="submit" value="{% translate 'Einloggen' %}"/>
-                <input type="hidden" name="next" value="{{ next }}"/>
-            </form>
+        <div class="block">
+            <div class="block">
+                <form class="" method="post" action="{% url 'login' %}">
+                    {% csrf_token %}
+                    {{ form }}
+                    <input class="button is-primary" type="submit" value="{% translate 'Einloggen' %}"/>
+                    <input type="hidden" name="next" value="{{ next }}"/>
+                </form>
             </div>
 
-            <div class="container-edit-buttons">
-                <a class="btn btn-small" href="{% url 'password_reset' %}">{% translate "Passwort vergessen?" %}</a>
-                <a class="btn btn-small" href="{% url 'django_registration_register' %}">{% translate "Registrieren" %}</a>
+            <div class="block">
+                <a class="button is-warning" href="{% url 'password_reset' %}">{% translate "Passwort vergessen?" %}</a>
+                <a class="button is-link"
+                   href="{% url 'django_registration_register' %}">{% translate "Registrieren" %}</a>
             </div>
         </div>
     {% endif %}
diff --git a/src/templates/registration/password_reset_complete.html b/src/templates/registration/password_reset_complete.html
index 0d47763..7fac36f 100644
--- a/src/templates/registration/password_reset_complete.html
+++ b/src/templates/registration/password_reset_complete.html
@@ -1,7 +1,7 @@
-{% extends "fellchensammlung/base_generic.html" %}
+{% extends "fellchensammlung/base_bulma.html" %}
 {% load i18n %}
 
 {% block content %}
-  <h1>{% translate "Dein Passwort wurde erfolgreich geändert!" %}</h1>
-  <p><a href="{% url 'login' %}">{% trans "Wieder einloggen?" %}?</a></p>
+  <h1 class="title is-1">{% translate "Dein Passwort wurde erfolgreich geändert!" %}</h1>
+  <p><a class="button" href="{% url 'login' %}">{% trans "Wieder einloggen?" %}?</a></p>
 {% endblock %}
diff --git a/src/templates/registration/password_reset_confirmation.html b/src/templates/registration/password_reset_confirmation.html
index 4f627ce..e822c4e 100644
--- a/src/templates/registration/password_reset_confirmation.html
+++ b/src/templates/registration/password_reset_confirmation.html
@@ -1,4 +1,4 @@
-{% extends "fellchensammlung/base_generic.html" %}
+{% extends "fellchensammlung/base_bulma.html" %}
 {% load i18n %}
 
 {% block content %}
@@ -24,7 +24,7 @@
             </table>
         </form>
     {% else %}
-        <h1>{% translate "Zurücksetzen vom Passwort fehlgeschlagen" %}</h1>
+        <h1 class="title is-1 is-warning">{% translate "Zurücksetzen vom Passwort fehlgeschlagen" %}</h1>
         <p>{% translate "Der Link zum Zurücksetzen vom Passwort ist ungültig, vielleicht weil er bereits benutzt wurde. Bitte beantrage die Zurücksetzung erneut." %}</p>
     {% endif %}
 {% endblock %}
diff --git a/src/templates/registration/password_reset_done.html b/src/templates/registration/password_reset_done.html
index ed2d6ca..f2e0e35 100644
--- a/src/templates/registration/password_reset_done.html
+++ b/src/templates/registration/password_reset_done.html
@@ -1,4 +1,4 @@
-{% extends "fellchensammlung/base_generic.html" %}
+{% extends "fellchensammlung/base_bulma.html" %}
 {% load i18n %}
 
 {% block content %}
diff --git a/src/templates/registration/password_reset_form.html b/src/templates/registration/password_reset_form.html
index fe41b80..21f5065 100644
--- a/src/templates/registration/password_reset_form.html
+++ b/src/templates/registration/password_reset_form.html
@@ -1,15 +1,15 @@
-{% extends "fellchensammlung/base_generic.html" %}
+{% extends "fellchensammlung/base_bulma.html" %}
 {% load i18n %}
 
 {% block content %}
-    <form class=card action="" method="post">
+    <form class=block action="" method="post">
         {% csrf_token %}
         {% if form.email.errors %}
             {{ form.email.errors }}
         {% endif %}
-        <h1>{% translate "Passwort zurücksetzen" %} </h1>
+        <h1 class="title is-1">{% translate "Passwort zurücksetzen" %} </h1>
         <p>{% translate "Bitte gib die E-Mail ein die mit deinem Account verknüpft ist." %}</p>
-        <p>{{ form.email }}</p>
-        <input type="submit" class="btn btn-default btn-lg" value={% translate "Zurücksetzen" %}>
+        <p>{{ form }}</p>
+        <input type="submit" class="button is-primary" value={% translate "Zurücksetzen" %}>
     </form>
 {% endblock %}