Prefix title with site title

Cleanup
Add donation and site form row

diff --git a/Resources/views/form/login.html.twig b/Resources/views/form/login.html.twig
index cdfeca540d16d834b0411f712dfc692feb05eddb..927c24370000e09b3eb3896f7b1807a6f45ac0b0 100644 (file)
--- a/Resources/views/form/login.html.twig
+++ b/Resources/views/form/login.html.twig
@@ -1,15 +1,16 @@
 {% extends '@RapsysAir/body.html.twig' %}
 {% 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) }}
 {% 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) }}
                                {{ 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>
 
                        {# 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 68399a03b46de024e7fea175eaaf510ae97b79bc..310b4853c5e42f0c75708a6c00d2f14ac7356b4e 100644 (file)
--- a/Resources/views/form/recover.html.twig
+++ b/Resources/views/form/recover.html.twig
@@ -1,4 +1,5 @@
 {% extends '@RapsysAir/body.html.twig' %}
 {% 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>
 {% 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 9389be94c22baae8b93693b8eb1409781cc197fa..5ab1758655380db7af6b714ca42ce64cfcc08a4c 100644 (file)
--- 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' %}
 {% 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>
 {% 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 %}
                {% 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) }}
 
                                        {{ 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 %}
                {% endif %}
        </section>
 {% endblock %}

diff --git a/Resources/views/form/register.html.twig b/Resources/views/form/register.html.twig
index 7f1e1e031365675fa182d18325daf870731d96aa..d50c5d0142b20c3904e6b75c6806c06919d1e755 100644 (file)
--- a/Resources/views/form/register.html.twig
+++ b/Resources/views/form/register.html.twig
@@ -1,4 +1,5 @@
 {% extends '@RapsysAir/body.html.twig' %}
 {% 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>
 {% 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.phone) }}
 

+                                       {{ form_row(form.donation) }}
+
+                                       {{ form_row(form.site) }}
+

                                        {{ form_row(form.submit) }}
                                </div>
 
                                        {{ form_row(form.submit) }}
                                </div>