From 1b404150ed3091d73848a272fed24d96a2366bad Mon Sep 17 00:00:00 2001
From: =?utf8?q?Rapha=C3=ABl=20Gertz?= <git@rapsys.eu>
Date: Wed, 11 Dec 2019 05:32:01 +0100
Subject: [PATCH] Add recover form directly on login page when it failed Remove
 recover link Remove header block now moved in twig form template Add messages
 in new notice class Cleanup

---
 Resources/views/form/login.html.twig        | 43 +++++++++++++--------
 Resources/views/form/recover.html.twig      | 10 ++---
 Resources/views/form/recover_mail.html.twig | 14 +++----
 Resources/views/form/register.html.twig     | 10 ++---
 4 files changed, 37 insertions(+), 40 deletions(-)

diff --git a/Resources/views/form/login.html.twig b/Resources/views/form/login.html.twig
index d127e25..fd8ff05 100644
--- a/Resources/views/form/login.html.twig
+++ b/Resources/views/form/login.html.twig
@@ -2,31 +2,40 @@
 {% block content %}
 	<section id="form">
 		<h2><a href="{{ path('rapsys_user_login') }}">{% trans %}Login{% endtrans %}</a></h2>
-		<div>
-			{{ form_start(form) }}
-
-				<header>{{ form_errors(form) }}</header>
-
+		<section>
+			{{ form_start(login) }}
 				<section>
-					{{ form_row(form.mail) }}
-
-					{{ form_row(form.password) }}
+					{{ form_row(login.mail) }}
 
-					{% if error %}
-						<div class="error">
-							<ul><li><a href="{{ path('rapsys_user_recover') }}">{% trans %}To recover your account click here{% endtrans %}</a></li></ul>
-						</div>
-					{% endif %}
+					{{ form_row(login.password) }}
 				</section>
 
-				{{ form_row(form.submit) }}
+				{{ form_row(login.submit) }}
 
 				{# Render CSRF token etc .#}
 				<footer style="display:none">
-					{{ form_rest(form) }}
+					{{ form_rest(login) }}
 				</footer>
+			{{ form_end(login) }}
+		</section>
+		{% if recover is defined %}
+			<section>
+				<h3>Recover</h3>
+				{{ form_start(recover) }}
+
+					<section>
+						{{ form_row(recover.mail) }}
+
+						{{ form_row(recover.submit) }}
+					</section>
+
+					{# Render CSRF token etc .#}
+					<footer style="display:none">
+						{{ form_rest(recover) }}
+					</footer>
 
-			{{ form_end(form) }}
-		</div>
+				{{ form_end(recover) }}
+			</section>
+		{% endif %}
 	</section>
 {% endblock %}
diff --git a/Resources/views/form/recover.html.twig b/Resources/views/form/recover.html.twig
index 74043fb..90694be 100644
--- a/Resources/views/form/recover.html.twig
+++ b/Resources/views/form/recover.html.twig
@@ -3,13 +3,10 @@
 	<section id="form">
 		<h2><a href="{{ path('rapsys_user_recover') }}">{% trans %}Recover{% endtrans %}</a></h2>
 		{% if sent %}
-			<p>{% trans %}Your recover account message has been sent{% endtrans %}</p>
+			<p class="notice">{% trans %}Your recover account message has been sent{% endtrans %}</p>
 		{% else %}
-			<div>
+			<section>
 				{{ form_start(form) }}
-
-					<header>{{ form_errors(form) }}</header>
-
 					<section>
 						{{ form_row(form.mail) }}
 					</section>
@@ -20,9 +17,8 @@
 					<footer style="display:none">
 						{{ form_rest(form) }}
 					</footer>
-
 				{{ form_end(form) }}
-			</div>
+			</section>
 		{% endif %}
 	</section>
 {% endblock %}
diff --git a/Resources/views/form/recover_mail.html.twig b/Resources/views/form/recover_mail.html.twig
index 081376e..1ee09d7 100644
--- a/Resources/views/form/recover_mail.html.twig
+++ b/Resources/views/form/recover_mail.html.twig
@@ -3,15 +3,12 @@
 	<section id="form">
 		<h2><a href="{{ path('rapsys_user_recover') }}">{% trans %}Recover{% endtrans %}</a></h2>
 		{% if sent %}
-			<p>{% trans %}Your password is updated and an account recover message has been sent{% endtrans %}</p>
-		{% elseif notfound %}
-			<p>{% trans %}Unable to find account{% endtrans %}</p>
+			<p class="notice">{% trans %}Your password is updated and an account recover message has been sent{% endtrans %}</p>
+		{% elseif not found %}
+			<p class="error">{% trans %}Unable to find account{% endtrans %}</p>
 		{% else %}
-			<div>
+			<section>
 				{{ form_start(form) }}
-
-					<header>{{ form_errors(form) }}</header>
-
 					<section>
 						{{ form_row(form.password) }}
 					</section>
@@ -22,9 +19,8 @@
 					<footer style="display:none">
 						{{ form_rest(form) }}
 					</footer>
-
 				{{ form_end(form) }}
-			</div>
+			</section>
 		{% endif %}
 	</section>
 {% endblock %}
diff --git a/Resources/views/form/register.html.twig b/Resources/views/form/register.html.twig
index 740abb0..c4fefaf 100644
--- a/Resources/views/form/register.html.twig
+++ b/Resources/views/form/register.html.twig
@@ -3,13 +3,10 @@
 	<section id="form">
 		<h2>{{ title|trans }}</h2>
 		{% if sent %}
-			<p>{% trans %}Your account has been created{% endtrans %}</p>
+			<p class="notice">{% trans %}Your account has been created{% endtrans %}</p>
 		{% else %}
-			<div>
+			<section>
 				{{ form_start(form) }}
-
-					<header>{{ form_errors(form) }}</header>
-
 					<section>
 						{{ form_row(form.mail) }}
 
@@ -36,9 +33,8 @@
 					<footer style="display:none">
 						{{ form_rest(form) }}
 					</footer>
-
 				{{ form_end(form) }}
-			</div>
+			</section>
 		{% endif %}
 	</section>
 {% endblock %}
-- 
2.41.1