diff --git a/templates/authentic2/accounts.html b/templates/authentic2/accounts.html index 8d243b1..4dc352f 100644 --- a/templates/authentic2/accounts.html +++ b/templates/authentic2/accounts.html @@ -1,4 +1,4 @@ -{% extends "authentic2/base.html" %} +{% extends "authentic2/base-page.html" %} {% load i18n staticfiles %} {% block extra_styles %} @@ -80,4 +80,3 @@ Gestion du compte
{% endblock %} - diff --git a/templates/authentic2/accounts_delete.html b/templates/authentic2/accounts_delete.html deleted file mode 100644 index 5bfe31d..0000000 --- a/templates/authentic2/accounts_delete.html +++ /dev/null @@ -1,30 +0,0 @@ -{% extends "authentic2/base-page.html" %} -{% load i18n %} - -{% block extra-body-class %}narrow-page{% endblock %} - -{% block content %} -

Gestion du compte

-
-

Suppression du compte

- -
-
- {% csrf_token %} - -

- Si vous cliquez sur le bouton "confirmer" toutes vos données concernant les - eservices seront effacées et vous ne pourrez plus les récupérer. -

- - {{ form.as_p }} - - - -
- -
-
-
- -{% endblock %} diff --git a/templates/authentic2/base-page.html b/templates/authentic2/base-page.html new file mode 100644 index 0000000..67c6c67 --- /dev/null +++ b/templates/authentic2/base-page.html @@ -0,0 +1,21 @@ +{% extends "authentic2/base.html" %} + +{% block extra-body-class %}authentic-page{% endblock %} + +{% block placeholder-content %} + +
+

Compte usager de
+ Montpellier Méditerranée Métropole
+ et de ses 31 communes

+
+ +
+ {% block content %} + {% endblock %} +
+
+

+ Contacter le support pour l'aide +

+{% endblock %} diff --git a/templates/authentic2/form.html b/templates/authentic2/form.html deleted file mode 100644 index 03269e1..0000000 --- a/templates/authentic2/form.html +++ /dev/null @@ -1,11 +0,0 @@ -{% load i18n %} -
- {% csrf_token %} - {% include "authentic2/form_fields.html" with form=form %} - - - {% if not no_cancel_button %} - - {% endif %} -
diff --git a/templates/authentic2/form_fields.html b/templates/authentic2/form_fields.html deleted file mode 100644 index f585c58..0000000 --- a/templates/authentic2/form_fields.html +++ /dev/null @@ -1,14 +0,0 @@ - {{ form.non_field_errors }} - {% for field in form.visible_fields %} -
- {{ field.errors }} - - {{ field }} - {% if field.help_text %} -

{{ field.help_text }}

- {% endif %} -
- {% endfor %} - {% for hidden in form.hidden_fields %} - {{ hidden }} - {% endfor %} diff --git a/templates/authentic2/login.html b/templates/authentic2/login.html index 62aff18..85ac2a6 100644 --- a/templates/authentic2/login.html +++ b/templates/authentic2/login.html @@ -1,25 +1,11 @@ {% extends "authentic2/base-page.html" %} -{% load i18n %} -{% load staticfiles %} - -{% block extra-body-class %}narrow-page{% endblock %} {% block content %} -

Compte citoyen

-
-

Connexion

-
- -
+
{% for name, content in methods %} - {% if not forloop.first %} -
OU
- {% endif %} - {{ content|safe }} +
{{ content|safe }}
{% endfor %}
-
- {% endblock %} diff --git a/templates/authentic2/login_password_form.html b/templates/authentic2/login_password_form.html deleted file mode 100644 index 3185d5a..0000000 --- a/templates/authentic2/login_password_form.html +++ /dev/null @@ -1,18 +0,0 @@ -{% load i18n %} -
-
-{% csrf_token %} -{% include "authentic2/form_fields.html" with form=form %} - -
-
- -
-{% if can_reset_password %} -

Réinitialiser votre mot de passe

-{% endif %} -{% if registration_authorized %} -

Créer un compte

-{% endif %} -

Contacter le support pour l'aide

-
diff --git a/templates/profiles/edit_profile.html b/templates/profiles/edit_profile.html deleted file mode 100644 index cfd2a22..0000000 --- a/templates/profiles/edit_profile.html +++ /dev/null @@ -1,25 +0,0 @@ -{% extends "authentic2/base-page.html" %} -{% load i18n %} - -{% block extra-body-class %}narrow-page{% endblock %} - -{% block content %} -

Gestion du compte

-
-

Modification de votre profil

-
-
-
-{% csrf_token %} -
-{{ form.as_p }} -
-{% if form.instance and form.instance.id %} - -{% else %} - -{% endif %} -
-
-
-{% endblock %} diff --git a/templates/profiles/email_change.html b/templates/profiles/email_change.html deleted file mode 100644 index 1cef97d..0000000 --- a/templates/profiles/email_change.html +++ /dev/null @@ -1,29 +0,0 @@ -{% extends "authentic2/base-page.html" %} -{% load i18n %} - -{% block extra-body-class %}narrow-page{% endblock %} - -{% block content %} -

Gestion du compte

-
-

{% trans "Email change" %}

- - -
-
- -

-Le changement de votre adresse de courriel nécessite une validation par -courriel. Un lien va vous être envoyé par courriel. Vous devez cliquer sur ce -lien pour valider le changement d'adresse de courriel. -

- {% csrf_token %} - {% include "authentic2/form_fields.html" with form=form %} - - - -
-
-
- -{% endblock %} diff --git a/templates/registration/activation_complete.html b/templates/registration/activation_complete.html deleted file mode 100644 index 2de7490..0000000 --- a/templates/registration/activation_complete.html +++ /dev/null @@ -1,13 +0,0 @@ -{% extends "authentic2/base-page.html" %} -{% load i18n %} - -{% block extra-body-class %}narrow-page{% endblock %} - -{% block content %} -

Compte citoyen

-
-

{% trans "Your account is now activated" %}

- -

-
-{% endblock %} diff --git a/templates/registration/password_change_form.html b/templates/registration/password_change_form.html deleted file mode 100644 index 8fd0dbd..0000000 --- a/templates/registration/password_change_form.html +++ /dev/null @@ -1,32 +0,0 @@ -{% extends "authentic2/base-page.html" %} -{% load i18n %} - -{% block extra-body-class %}narrow-page{% endblock %} - -{% block content %} -

Gestion du compte

- -
-

{% trans "Change password" %}

-
- - -
-
- -

-Pour modifier votre mot de passe vous devez saisir votre mot de passe actuel -puis votre nouveau mot de passe à deux reprises. Attention de saisir votre -nouveau mot de passe à l'identique dans les deux zones texte prévues à cet -effet. -

- {% csrf_token %} - {% include "authentic2/form_fields.html" with form=form %} - - - -
-
-
- -{% endblock %} diff --git a/templates/registration/password_reset_complete.html b/templates/registration/password_reset_complete.html deleted file mode 100644 index 98f74a5..0000000 --- a/templates/registration/password_reset_complete.html +++ /dev/null @@ -1,22 +0,0 @@ -{% extends "authentic2/base-page.html" %} -{% load i18n %} - -{% block extra-body-class %}narrow-page{% endblock %} - -{% block content %} -

Compte citoyen

-
-

{% trans "Password reset successfully" %}

- -

-Votre mot de passe a été modifié avec succès. Vous pouvez à présent utiliser -votre nouveau mot de passe pour vous connecter. -

- -

{% trans "Log in" %}

- -
- -
- -{% endblock %} diff --git a/templates/registration/password_reset_confirm.html b/templates/registration/password_reset_confirm.html deleted file mode 100644 index dc949ca..0000000 --- a/templates/registration/password_reset_confirm.html +++ /dev/null @@ -1,40 +0,0 @@ -{% extends "authentic2/base-page.html" %} -{% load i18n %} - -{% block extra-body-class %}narrow-page{% endblock %} - -{% block content %} -

Compte citoyen

- -
- -{% if validlink %} - -

{% trans "Resetting password" %}

- -
- -
- -

-Veuillez saisir votre nouveau mot de passe et le confirmer en le saisissant une -nouvelle fois à l'identique. -

- - {% csrf_token %} - {% include "authentic2/form_fields.html" with form=form %} - - - -
- -{% else %} - -

{% trans "Password reset failed" %}

- -{% endif %} - -
-
- -{% endblock %} diff --git a/templates/registration/password_reset_done.html b/templates/registration/password_reset_done.html deleted file mode 100644 index 65ad2cf..0000000 --- a/templates/registration/password_reset_done.html +++ /dev/null @@ -1,15 +0,0 @@ -{% extends "authentic2/base-page.html" %} -{% load i18n %} - -{% block extra-body-class %}narrow-page{% endblock %} - -{% block content %} -

Compte citoyen

-
-

{% trans "Resetting password" %}

-

{% trans "Email with password reset instructions has been sent." %}

-

-
-
- -{% endblock %} diff --git a/templates/registration/password_reset_form.html b/templates/registration/password_reset_form.html deleted file mode 100644 index 64fbefa..0000000 --- a/templates/registration/password_reset_form.html +++ /dev/null @@ -1,31 +0,0 @@ -{% extends "authentic2/base-page.html" %} -{% load i18n %} - -{% block extra-body-class %}narrow-page{% endblock %} - -{% block content %} -

Compte citoyen

- -
-

{% trans "Resetting password" %}

- -
-
-

-Si vous avez égaré votre mot de passe et que vous souhaitez pouvoir vous -connecter à nouveau indiquez votre adresse électronique. Vous recevrez un -courriel vous permettant de définir un nouveau mot de passe. -

- {% csrf_token %} - {% include "authentic2/form_fields.html" with form=form %} - - - -
-
- -
- -
- -{% endblock %} diff --git a/templates/registration/registration_complete.html b/templates/registration/registration_complete.html deleted file mode 100644 index b269b5f..0000000 --- a/templates/registration/registration_complete.html +++ /dev/null @@ -1,14 +0,0 @@ -{% extends "authentic2/base-page.html" %} -{% load i18n %} - -{% block extra-body-class %}narrow-page{% endblock %} - -{% block content %} -

Compte citoyen

-
-

{% trans "Successful registration" %}

-

{% trans "Thank you for registering. Activation email sent." %}

-

-
-
-{% endblock %} diff --git a/templates/registration/registration_completion_form.html b/templates/registration/registration_completion_form.html deleted file mode 100644 index afcc7c5..0000000 --- a/templates/registration/registration_completion_form.html +++ /dev/null @@ -1 +0,0 @@ -{% include "registration/registration_form.html" %} diff --git a/templates/registration/registration_form.html b/templates/registration/registration_form.html index be8e2ad..f0331ce 100644 --- a/templates/registration/registration_form.html +++ b/templates/registration/registration_form.html @@ -1,27 +1,28 @@ {% extends "authentic2/base-page.html" %} {% load i18n %} -{% block extra-body-class %}narrow-page{% endblock %} - {% block content %} -

Compte citoyen

-

Création de votre compte

-
-
-{% include 'authentic2/form.html' with form=form %} +
+
+

+ Après validation de votre adresse électronique, il vous sera envoyé un courriel + pour ouvrir votre compte. +

+
+ {% csrf_token %} + {{ form.as_p }} + +
+
+ {% for id, block in frontends.items %} +
+ {{ block.content|safe }} +
+ {% endfor %}
-{% if frontends.fc %} -
OU
-
-{{ frontends.fc.content|safe }} -
-{% endif %} -
- -
{% endblock %}