From 61da0683bd35663366512518661cbaeec742438e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89loi=20Rivard?= <eloi@yaal.coop>
Date: Tue, 21 May 2024 17:17:48 +0200
Subject: [PATCH] feat: more blocks for theming login and password pages

---
 canaille/core/templates/login.html    | 58 +++++++++++++++------------
 canaille/core/templates/password.html | 54 ++++++++++++++-----------
 2 files changed, 64 insertions(+), 48 deletions(-)

diff --git a/canaille/core/templates/login.html b/canaille/core/templates/login.html
index f50f43ee..ac181aba 100644
--- a/canaille/core/templates/login.html
+++ b/canaille/core/templates/login.html
@@ -7,37 +7,45 @@
     <div class="ui container" hx-boost="false">
         <div class="content">
             <div class="ui clearing segment">
-                {% if logo_url %}
-                    <a href="{{ url_for('core.account.index') }}">
-                        <img class="ui tiny centered image" src="{{ logo_url }}" alt="{{ website_name }}">
-                    </a>
-                {% else %}
-                    <i class="massive sign in icon image ui"></i>
-                {% endif %}
+                {% block header %}
+                    {% if logo_url %}
+                        <a href="{{ url_for('core.account.index') }}">
+                            <img class="ui tiny centered image" src="{{ logo_url }}" alt="{{ website_name }}">
+                        </a>
+                    {% else %}
+                        <i class="massive sign in icon image ui"></i>
+                    {% endif %}
 
-                <h2 class="ui center aligned header">
-                    <div class="content">
-                        {{ _("Sign in at %(website)s", website=website_name) }}
-                    </div>
-                    <div class="sub header">{% trans %}Manage your information and your authorizations{% endtrans %}</div>
-                </h2>
+                    <h2 class="ui center aligned header">
+                        <div class="content">
+                            {{ _("Sign in at %(website)s", website=website_name) }}
+                        </div>
+                        <div class="sub header">{% trans %}Manage your information and your authorizations{% endtrans %}</div>
+                    </h2>
+                {% endblock %}
 
-                {{ flask.messages() }}
+                {% block messages %}
+                    {{ flask.messages() }}
+                {% endblock %}
 
                 {% call fui.render_form(form) %}
-                    {% block login_field scoped %}{{ login_field.render_field(form.login, class="autofocus") }}{% endblock %}
+                    {% block fields %}
+                        {% block login_field scoped %}{{ login_field.render_field(form.login, class="autofocus") }}{% endblock %}
+                    {% endblock %}
 
-                    <div class="ui right aligned container">
-                        <div class="ui stackable buttons">
-                            {% if features.has_registration %}
-                                <a type="button" class="ui right floated button" href="{{ url_for('core.account.join') }}">{{ _("Create an account") }}</a>
-                            {% endif %}
-                            {% if features.has_smtp and features.has_password_recovery %}
-                                <a type="button" class="ui right floated button" href="{{ url_for('core.auth.forgotten') }}">{{ _("Forgotten password") }}</a>
-                            {% endif %}
-                            <button type="submit" name="answer" class="ui right floated primary button" hx-boost="false">{{ _("Continue") }}</button>
+                    {% block buttons %}
+                        <div class="ui right aligned container">
+                            <div class="ui stackable buttons">
+                                {% if features.has_registration %}
+                                    <a type="button" class="ui right floated button" href="{{ url_for('core.account.join') }}">{{ _("Create an account") }}</a>
+                                {% endif %}
+                                {% if features.has_smtp and features.has_password_recovery %}
+                                    <a type="button" class="ui right floated button" href="{{ url_for('core.auth.forgotten') }}">{{ _("Forgotten password") }}</a>
+                                {% endif %}
+                                <button type="submit" name="answer" class="ui right floated primary button" hx-boost="false">{{ _("Continue") }}</button>
+                            </div>
                         </div>
-                    </div>
+                    {% endblock %}
                 {% endcall %}
             </div>
         </div>
diff --git a/canaille/core/templates/password.html b/canaille/core/templates/password.html
index 40fc1a1d..13a027b0 100644
--- a/canaille/core/templates/password.html
+++ b/canaille/core/templates/password.html
@@ -7,35 +7,43 @@
     <div class="ui container">
         <div class="content">
             <div class="ui clearing segment">
-                {% if logo_url %}
-                    <a href="{{ url_for('core.account.index') }}">
-                        <img class="ui tiny centered image" src="{{ logo_url }}" alt="{{ website_name }}">
-                    </a>
-                {% else %}
-                    <i class="massive sign in icon image ui"></i>
-                {% endif %}
+                {% block header %}
+                    {% if logo_url %}
+                        <a href="{{ url_for('core.account.index') }}">
+                            <img class="ui tiny centered image" src="{{ logo_url }}" alt="{{ website_name }}">
+                        </a>
+                    {% else %}
+                        <i class="massive sign in icon image ui"></i>
+                    {% endif %}
 
-                <h2 class="ui center aligned header">
-                    <div class="content">
-                        {{ _("Sign in as %(username)s", username=username) }}
-                    </div>
-                    <div class="sub header">{% trans %}Please enter your password for this account.{% endtrans %}</div>
-                </h2>
+                    <h2 class="ui center aligned header">
+                        <div class="content">
+                            {{ _("Sign in as %(username)s", username=username) }}
+                        </div>
+                        <div class="sub header">{% trans %}Please enter your password for this account.{% endtrans %}</div>
+                    </h2>
+                {% endblock %}
 
-                {{ flask.messages() }}
+                {% block messages %}
+                    {{ flask.messages() }}
+                {% endblock %}
 
                 {% call fui.render_form(form, hx_boost="false") %}
-                    {{ login_field.render_field(form.password, class="autofocus") }}
+                    {% block fields %}
+                        {{ login_field.render_field(form.password, class="autofocus") }}
+                    {% endblock %}
 
-                    <div class="ui right aligned container">
-                        <div class="ui stackable buttons">
-                            <a type="button" class="ui right floated button" href="{{ url_for('core.auth.login') }}">{{ _("I am not %(username)s", username=username) }}</a>
-                            {% if features.has_smtp and features.has_password_recovery %}
-                                <a type="button" class="ui right floated button" href="{{ url_for('core.auth.forgotten') }}">{{ _("Forgotten password") }}</a>
-                            {% endif %}
-                            <button type="submit" class="ui right floated primary button">{{ _("Sign in") }}</button>
+                    {% block buttons %}
+                        <div class="ui right aligned container">
+                            <div class="ui stackable buttons">
+                                <a type="button" class="ui right floated button" href="{{ url_for('core.auth.login') }}">{{ _("I am not %(username)s", username=username) }}</a>
+                                {% if features.has_smtp and features.has_password_recovery %}
+                                    <a type="button" class="ui right floated button" href="{{ url_for('core.auth.forgotten') }}">{{ _("Forgotten password") }}</a>
+                                {% endif %}
+                                <button type="submit" class="ui right floated primary button">{{ _("Sign in") }}</button>
+                            </div>
                         </div>
-                    </div>
+                    {% endblock %}
                 {% endcall %}
             </div>
         </div>