From f094beda48ce5d27f29195b9c9161d9fbf9127f7 Mon Sep 17 00:00:00 2001
From: =?utf8?q?Rapha=C3=ABl=20Gertz?= <git@rapsys.eu>
Date: Thu, 29 Feb 2024 16:22:32 +0100
Subject: [PATCH] Replace body with base template New config layout New title
 layout

---
 Resources/views/form/contact.html.twig      |  2 +-
 Resources/views/form/edit.html.twig         |  5 +-
 Resources/views/form/login.html.twig        |  3 +-
 Resources/views/form/recover.html.twig      |  3 +-
 Resources/views/form/recover_mail.html.twig |  3 +-
 Resources/views/form/register.html.twig     | 65 ++++++++++-----------
 6 files changed, 36 insertions(+), 45 deletions(-)

diff --git a/Resources/views/form/contact.html.twig b/Resources/views/form/contact.html.twig
index da53d04..dfc46be 100644
--- a/Resources/views/form/contact.html.twig
+++ b/Resources/views/form/contact.html.twig
@@ -1,4 +1,4 @@
-{% extends '@RapsysAir/body.html.twig' %}
+{% extends '@RapsysAir/base.html.twig' %}
 {% block content %}
 	<article>
 		<header>
diff --git a/Resources/views/form/edit.html.twig b/Resources/views/form/edit.html.twig
index 390ba1f..608dbdb 100644
--- a/Resources/views/form/edit.html.twig
+++ b/Resources/views/form/edit.html.twig
@@ -1,9 +1,8 @@
-{% extends '@RapsysAir/body.html.twig' %}
-{% block title %}{{ site.title }} - {{ title }}{% endblock %}
+{% extends '@RapsysAir/base.html.twig' %}
 {% block content %}
 	<article>
 		<header>
-			<h2><a href="{{ app.request.requesturi }}">{{ title }}</a></h2>
+			<h2><a href="{{ app.request.requesturi }}">{{ title.page }}</a></h2>
 		</header>
 		{{ form_start(edit) }}
 			<div>
diff --git a/Resources/views/form/login.html.twig b/Resources/views/form/login.html.twig
index 8dd5efa..c01e652 100644
--- a/Resources/views/form/login.html.twig
+++ b/Resources/views/form/login.html.twig
@@ -1,5 +1,4 @@
-{% extends '@RapsysAir/body.html.twig' %}
-{% block title %}{{ site.title }} - {{ title }}{% endblock %}
+{% extends '@RapsysAir/base.html.twig' %}
 {% block content %}
 	<article id="form">
 		<header>
diff --git a/Resources/views/form/recover.html.twig b/Resources/views/form/recover.html.twig
index d7df57f..d379ffa 100644
--- a/Resources/views/form/recover.html.twig
+++ b/Resources/views/form/recover.html.twig
@@ -1,5 +1,4 @@
-{% extends '@RapsysAir/body.html.twig' %}
-{% block title %}{{ site.title }} - {{ title }}{% endblock %}
+{% extends '@RapsysAir/base.html.twig' %}
 {% block content %}
 	<article>
 		<header>
diff --git a/Resources/views/form/recover_mail.html.twig b/Resources/views/form/recover_mail.html.twig
index 5ab1758..acbe1ef 100644
--- a/Resources/views/form/recover_mail.html.twig
+++ b/Resources/views/form/recover_mail.html.twig
@@ -1,5 +1,4 @@
-{% extends '@RapsysAir/body.html.twig' %}
-{% block title %}{{ site.title }} - {{ title }}{% endblock %}
+{% extends '@RapsysAir/base.html.twig' %}
 {% block content %}
 	<section id="form">
 		<h2><a href="{{ path('rapsys_user_recover') }}">{% trans %}Recover{% endtrans %}</a></h2>
diff --git a/Resources/views/form/register.html.twig b/Resources/views/form/register.html.twig
index 4171719..5b0d83e 100644
--- a/Resources/views/form/register.html.twig
+++ b/Resources/views/form/register.html.twig
@@ -1,9 +1,8 @@
-{% extends '@RapsysAir/body.html.twig' %}
-{% block title %}{{ site.title }} - {{ title }}{% endblock %}
+{% extends '@RapsysAir/base.html.twig' %}
 {% block content %}
 	<article>
 		<header>
-			<h2><a href="{{ path('rapsys_user_register') }}">{{ title }}</a></h2>
+			<h2><a href="{{ path('rapsys_user_register') }}">{{ title.page }}</a></h2>
 		</header>
 		{% if disabled is defined and disabled %}
 			<p class="message error">{% trans %}Your account has been disabled{% endtrans %}</p>
@@ -11,48 +10,44 @@
 			<p class="message notice">{% trans %}Your verification mail has been sent, to activate your account you must follow the confirmation link inside{% endtrans %}</p>
 			<p class="message warning">{% trans %}If you did not receive a verification mail, check your Spam or Junk mail folders{% endtrans %}</p>
 		{% else %}
-			{{ form_start(form) }}
-				<div>
-					{% if form.mail is defined %}
-						{{ form_row(form.mail) }}
-					{% endif %}
+			{{ form_start(register) }}
+				{% if register.mail is defined %}
+					{{ form_row(register.mail) }}
+				{% endif %}
 
-					{% if form.password is defined %}
-						{{ form_row(form.password.first) }}
+				{% if register.password is defined %}
+					{{ form_row(register.password) }}
+				{% endif %}
 
-						{{ form_row(form.password.second) }}
-					{% endif %}
+				{% if register.civility is defined %}
+					{{ form_row(register.civility) }}
+				{% endif %}
 
-					{% if form.civility is defined %}
-						{{ form_row(form.civility) }}
-					{% endif %}
+				{% if register.forename is defined %}
+					{{ form_row(register.forename) }}
+				{% endif %}
 
-					{% if form.forename is defined %}
-						{{ form_row(form.forename) }}
-					{% endif %}
+				{% if register.surname is defined %}
+					{{ form_row(register.surname) }}
+				{% endif %}
 
-					{% if form.surname is defined %}
-						{{ form_row(form.surname) }}
-					{% endif %}
+				{% if register.pseudonym is defined %}
+					{{ form_row(register.pseudonym) }}
+				{% endif %}
 
-					{% if form.pseudonym is defined %}
-						{{ form_row(form.pseudonym) }}
-					{% endif %}
+				{% if register.slug is defined %}
+					{{ form_row(register.slug) }}
+				{% endif %}
 
-					{% if form.slug is defined %}
-						{{ form_row(form.slug) }}
-					{% endif %}
+				{% if register.phone is defined %}
+					{{ form_row(register.phone) }}
+				{% endif %}
 
-					{% if form.phone is defined %}
-						{{ form_row(form.phone) }}
-					{% endif %}
-
-					{{ form_row(form.submit) }}
-				</div>
+				{{ form_row(register.submit) }}
 
 				{# Render CSRF token etc .#}
-				<footer style="display:none">{{ form_rest(form) }}</footer>
-			{{ form_end(form) }}
+				<footer style="display:none">{{ form_rest(register) }}</footer>
+			{{ form_end(register) }}
 		{% endif %}
 	</article>
 {% endblock %}
-- 
2.41.1