From c60db40db3fd939c293780703eb6b8f18da9f858 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Rapha=C3=ABl=20Gertz?= Date: Mon, 28 Dec 2020 09:15:56 +0100 Subject: [PATCH 1/1] 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 %}

{% trans %}Login{% endtrans %}

{{ form_start(login) }} -
+
{{ form_row(login.mail) }} {{ form_row(login.password) }} {{ form_row(login.submit) }} -
+ {# Render CSRF token etc .#}
{{ form_rest(login) }}
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 %}

{% trans %}Recover{% endtrans %}

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 %}

{% trans %}Recover{% endtrans %}

@@ -7,20 +8,16 @@ {% elseif not found %}

{% trans %}Unable to find account{% endtrans %}

{% else %} -
- {{ form_start(form) }} -
- {{ form_row(form.password) }} -
+ {{ form_start(form) }} +
+ {{ form_row(form.password) }} {{ form_row(form.submit) }} +
- {# Render CSRF token etc .#} -
- {{ form_rest(form) }} -
- {{ form_end(form) }} -
+ {# Render CSRF token etc .#} +
{{ form_rest(form) }}
+ {{ form_end(form) }} {% endif %}
{% 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 %}

{% trans %}Register{% endtrans %}

@@ -23,6 +24,10 @@ {{ form_row(form.phone) }} + {{ form_row(form.donation) }} + + {{ form_row(form.site) }} + {{ form_row(form.submit) }} -- 2.41.1