From c60db40db3fd939c293780703eb6b8f18da9f858 Mon Sep 17 00:00:00 2001
From: =?utf8?q?Rapha=C3=ABl=20Gertz?= <git@rapsys.eu>
Date: Mon, 28 Dec 2020 09:15:56 +0100
Subject: [PATCH] Prefix title with site title Cleanup Add donation and site
form row
---
Resources/views/form/login.html.twig | 5 +++--
Resources/views/form/recover.html.twig | 1 +
Resources/views/form/recover_mail.html.twig | 19 ++++++++-----------
Resources/views/form/register.html.twig | 5 +++++
4 files changed, 17 insertions(+), 13 deletions(-)
diff --git a/Resources/views/form/login.html.twig b/Resources/views/form/login.html.twig
index cdfeca5..927c243 100644
--- a/Resources/views/form/login.html.twig
+++ b/Resources/views/form/login.html.twig
@@ -1,15 +1,16 @@
{% extends '@RapsysAir/body.html.twig' %}
+{% block title %}{{ site.title }} - {{ title }}{% endblock %}
{% block content %}
<section id="form">
<h2><a href="{{ path('rapsys_user_login') }}">{% trans %}Login{% endtrans %}</a></h2>
{{ form_start(login) }}
- <section>
+ <div>
{{ form_row(login.mail) }}
{{ form_row(login.password) }}
{{ form_row(login.submit) }}
- </section>
+ </div>
{# Render CSRF token etc .#}
<footer style="display:none">{{ form_rest(login) }}</footer>
diff --git a/Resources/views/form/recover.html.twig b/Resources/views/form/recover.html.twig
index 68399a0..310b485 100644
--- a/Resources/views/form/recover.html.twig
+++ b/Resources/views/form/recover.html.twig
@@ -1,4 +1,5 @@
{% extends '@RapsysAir/body.html.twig' %}
+{% block title %}{{ site.title }} - {{ title }}{% endblock %}
{% block content %}
<section id="form">
<h2><a href="{{ path('rapsys_user_recover') }}">{% trans %}Recover{% endtrans %}</a></h2>
diff --git a/Resources/views/form/recover_mail.html.twig b/Resources/views/form/recover_mail.html.twig
index 9389be9..5ab1758 100644
--- a/Resources/views/form/recover_mail.html.twig
+++ b/Resources/views/form/recover_mail.html.twig
@@ -1,4 +1,5 @@
{% extends '@RapsysAir/body.html.twig' %}
+{% block title %}{{ site.title }} - {{ title }}{% endblock %}
{% block content %}
<section id="form">
<h2><a href="{{ path('rapsys_user_recover') }}">{% trans %}Recover{% endtrans %}</a></h2>
@@ -7,20 +8,16 @@
{% elseif not found %}
<p class="message error">{% trans %}Unable to find account{% endtrans %}</p>
{% else %}
- <section>
- {{ form_start(form) }}
- <section>
- {{ form_row(form.password) }}
- </section>
+ {{ form_start(form) }}
+ <div>
+ {{ form_row(form.password) }}
{{ form_row(form.submit) }}
+ </div>
- {# Render CSRF token etc .#}
- <footer style="display:none">
- {{ form_rest(form) }}
- </footer>
- {{ form_end(form) }}
- </section>
+ {# Render CSRF token etc .#}
+ <footer style="display:none">{{ form_rest(form) }}</footer>
+ {{ form_end(form) }}
{% endif %}
</section>
{% endblock %}
diff --git a/Resources/views/form/register.html.twig b/Resources/views/form/register.html.twig
index 7f1e1e0..d50c5d0 100644
--- a/Resources/views/form/register.html.twig
+++ b/Resources/views/form/register.html.twig
@@ -1,4 +1,5 @@
{% extends '@RapsysAir/body.html.twig' %}
+{% block title %}{{ site.title }} - {{ title }}{% endblock %}
{% block content %}
<section id="form">
<h2><a href="{{ path('rapsys_user_register') }}">{% trans %}Register{% endtrans %}</a></h2>
@@ -23,6 +24,10 @@
{{ form_row(form.phone) }}
+ {{ form_row(form.donation) }}
+
+ {{ form_row(form.site) }}
+
{{ form_row(form.submit) }}
</div>
--
2.41.3