move themes custom authentication titles to dedicated block (#65803) #20

Merged
smihai merged 2 commits from wip/65803-misc-move-custom-authentication-titles-to-dedicated-block into main 2023-03-30 09:04:57 +02:00
19 changed files with 62 additions and 98 deletions

View File

@ -1041,9 +1041,6 @@ div#rub_service {
}
#frontend-registration-fc.a2-block {
> h2 {
display: none;
}
> div {
padding: 0;
}

View File

@ -757,19 +757,24 @@ div.ui-dialog.dlg-interests .ui-dialog-titlebar {
display: none;
}
#content .registration_frontend h3 {
font-size: 2rem;
}
#content .registration_frontend {
margin-bottom: 4rem;
.buttons {
text-align: right;
#registration-blocks {
display: flex;
flex-direction: column;
max-width: 45em;
margin: 0 auto;
&--header {
margin-top: 2em;
}
&::after {
content: "";
clear: both;
display: block;
&.methods2 > .a2-block {
width: auto;
margin: 0;
margin-bottom: 4rem;
h3 {
font-size: 2rem;
}
}
#frontend-registration-fc > div {
padding: 0;
}
}

View File

@ -23,13 +23,11 @@
{% block login-blocks %}
{% for id, login_block in blocks.items %}
<div class="block block-{% firstof login_block.authenticator.type login_block.authenticator.id %} block-{{id}}">
<div class="block block-{% firstof login_block.authenticator.type login_block.authenticator.id %} block-{{id}} {% if login_block.extra_css_class %}{{ login_block.extra_css_class }}{% endif %}">
{% if blocks|length == 1 %}
<h2>Connexion</h2>
{% endif %}
<div {% if login_block.extra_css_class %} class="{{ login_block.extra_css_class }}"{% endif %}>
{{ login_block.content|safe }}
</div>
{{ login_block.content|safe }}
</div>
{% endfor %}
{% endblock %}

View File

@ -2,12 +2,13 @@
{% load i18n %}
{% block registration %}
<div>
{% block registration-password-form-pre %}
<h2>{% trans "Registration" %}</h2>
<p>
Après validation de votre adresse électronique, il vous sera envoyé un courriel
pour ouvrir votre compte.
</p>
{% endblock %}
{{ block.super }}
</div>
{% endblock %}

View File

@ -21,10 +21,7 @@
{{ block.content|safe }}
{% else %}
<div id="frontend-registration-{{ id }}" class="a2-block">
<h2>{{ block.name }}</h2>
<div>
{{ block.content|safe }}
</div>
{% endif %}
</div>
{% endfor %}

View File

@ -1,9 +1,5 @@
{% extends "authentic2/login_password_registration_form.html" %}
{% block registration-password-form-pre %}
{% block registration-block-title %}
<h2>Je crée mon compte avec mon adresse électronique</h2>
<p>
Après validation de votre adresse électronique, il vous sera envoyé un courriel
pour ouvrir votre compte.
</p>
{% endblock %}

View File

@ -1,7 +1,6 @@
{% extends "authentic2_auth_fc/login.html" %}
{% load i18n %}
{% block login %}
{% block login-block-title %}
<h3>Je midentifie avec FranceConnect</h3>
{{ block.super }}
{% endblock %}

View File

@ -1,6 +1,5 @@
{% extends "authentic2_auth_fc/login.html" %}
{% block login %}
{% block login-block-title %}
<h2>Sidentifier avec FranceConnect</h2>
{{ block.super }}
{% endblock %}

View File

@ -1,12 +0,0 @@
{% extends "authentic2/login.html" %}
{% block login-blocks %}
{% for id, login_block in blocks.items %}
<div class="block block-{{id}}">
{% if login_block.name != "SAML" %}<h2>{% if id == "password" %}Sidentifier{% else %}{{ login_block.name }}{% endif %}</h2>{% endif %}
<div>
{{ login_block.content|safe }}
</div>
</div>
{% endfor %}
{% endblock %}

View File

@ -0,0 +1,5 @@
{% extends "authentic2/login_password_form.html" %}
{% block login-block-title %}
<h2>Sidentifier</h2>
{% endblock %}

View File

@ -0,0 +1,5 @@
{% extends "authentic2_auth_fc/login.html" %}
{% block login-block-title %}
<h2>FranceConnect</h2>
{% endblock %}

View File

@ -1,7 +1,6 @@
{% extends "authentic2_auth_fc/login.html" %}
{% load i18n %}
{% block login %}
{% block login-block-title %}
<h2>Je midentifie avec FranceConnect</h2>
{{ block.super }}
{% endblock %}

View File

@ -0,0 +1,5 @@
{% extends "authentic2_auth_fc/registration.html" %}
{% block registration-block-title %}
<h2>Je midentifie avec FranceConnect</h2>
{% endblock %}

View File

@ -1,9 +1,5 @@
{% extends "authentic2/login_password_registration_form.html" %}
{% block registration-password-form-pre %}
{% block registration-blcok-title %}
<h2>avec un courrier électronique</h2>
<p>
Après validation de votre adresse électronique, il vous sera envoyé un courriel
pour ouvrir votre compte.
</p>
{% endblock %}

View File

@ -0,0 +1,5 @@
{% extends "authentic2_auth_fc/registration.html" %}
{% block registration-block-title %}
<h2>avec FranceConnect</h2>
{% endblock %}

View File

@ -9,19 +9,3 @@
</p>
</div>
{% endblock %}
{% block registration-other-methods %}
{% for id, block in frontends.items %}
{% if id == "password" %}
<div id="frontend-registration-email" class="a2-block">
{{ block.content|safe }}
{% else %}
<div id="frontend-registration-{{ id }}" class="a2-block">
<h2>avec {{ block.name }}</h2>
<div>
{{ block.content|safe }}
</div>
{% endif %}
</div>
{% endfor %}
{% endblock %}

View File

@ -0,0 +1,8 @@
{% extends "authentic2/login_password_registration_form.html" %}
{% block registration-block-title %}
<h3>Sinscrire avec mon adresse électronique</h3>
{% endblock %}
{% block registration-password-form-pre %}
{% endblock %}

View File

@ -0,0 +1,5 @@
{% extends "authentic2_auth_fc/registration.html" %}
{% block registration-block-title %}
<h3>Sinscrire avec FranceConnect</h3>
{% endblock %}

View File

@ -1,33 +1,5 @@
{% extends "authentic2/base-page.html" %}
{% load gadjo i18n %}
{% extends "registration/registration_form.html" %}
{% block form-title %}
<h1>Créer un compte</h1>
{% block registration-pre %}
<h1 id="registration-blocks--header">Créer un compte</h1>
{% endblock %}
{% block content %}
<div class="registration_frontend">
<h3>Sinscrire avec mon adresse électronique</h3>
<form method="post" class="pk-mark-optional-fields">
{% csrf_token %}
{{ form|with_template }}
<div class="buttons">
<button class="submit-button">{% trans 'Submit' %}</button>
</div>
</form>
</div>
{% for id, block in frontends.items %}
{% if id != "password" %}
<div class="registration_frontend">
<h3>Sinscrire avec {{ block.name }}</h3>
<p>
{{ block.content|safe }}
</p>
</div>
{% endif %}
{% endfor %}
{% endblock %}