Replace body with base template

New config layout
New title layout

diff --git a/Resources/views/form/contact.html.twig b/Resources/views/form/contact.html.twig
index da53d04bd8af61e39fbe8c9c5861753aae8f2e20..dfc46be39553fa480acaac4c9bdfc293a842e2c5 100644 (file)
--- 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>
 {% block content %}
        <article>
                <header>

diff --git a/Resources/views/form/edit.html.twig b/Resources/views/form/edit.html.twig
index 390ba1faad23e61e2978de51376a74a8262d6082..608dbdbe2397e31618036ef38fdc21983a440564 100644 (file)
--- 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>
 {% 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>
                </header>
                {{ form_start(edit) }}
                        <div>

diff --git a/Resources/views/form/login.html.twig b/Resources/views/form/login.html.twig
index 8dd5efaee9f526abd57680d7423e0fea4058325e..c01e652b9c10bc5823d7c33f0ae51fcf65cf5696 100644 (file)
--- 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>
 {% block content %}
        <article id="form">
                <header>

diff --git a/Resources/views/form/recover.html.twig b/Resources/views/form/recover.html.twig
index d7df57ff41500e4a244f117b074609e103453e89..d379ffa083db62d4d7ceb61692d685dd86c5eb47 100644 (file)
--- 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>
 {% block content %}
        <article>
                <header>

diff --git a/Resources/views/form/recover_mail.html.twig b/Resources/views/form/recover_mail.html.twig
index 5ab1758655380db7af6b714ca42ce64cfcc08a4c..acbe1ef0941c3e0397c9bec9e99094b3dfc585ad 100644 (file)
--- 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>
 {% 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 417171999169628660a55b0dccef6d7d42abacd5..5b0d83e74ca443336ff325a0c89bbdedb407b82d 100644 (file)
--- 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>
 {% 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>
                </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 %}
                        <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 .#}
 
                                {# 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 %}
                {% endif %}
        </article>
 {% endblock %}