Pass google client and default markdown to constructor

[airbundle] / Resources / views / form / login.html.twig

diff --git a/Resources/views/form/login.html.twig b/Resources/views/form/login.html.twig
index d127e2547696f92e48e45bde8224b1257b578f56..54855c327feca97a2cfabcc30f626e17113f6687 100644 (file)
--- a/Resources/views/form/login.html.twig
+++ b/Resources/views/form/login.html.twig
@@ -1,32 +1,38 @@
-{% extends '@RapsysAir/body.html.twig' %}
+{% extends '@RapsysAir/base.html.twig' %}
 {% block content %}
-       <section id="form">
-               <h2><a href="{{ path('rapsys_user_login') }}">{% trans %}Login{% endtrans %}</a></h2>
-               <div>
-                       {{ form_start(form) }}
+       <article id="form">
+               <header>
+                       <h2><a href="{{ path('rapsysuser_login') }}">{% trans %}Login{% endtrans %}</a></h2>
+               </header>
+               {{ form_start(login) }}
+                       <div>
+                               {{ form_row(login.mail) }}
 
-                               <header>{{ form_errors(form) }}</header>
+                               {{ form_row(login.password) }}
 
-                               <section>
-                                       {{ form_row(form.mail) }}
+                               {{ form_row(login.submit) }}
+                       </div>
 
-                                       {{ form_row(form.password) }}
+                       {# Render CSRF token etc .#}
+                       <footer style="display:none">{{ form_rest(login) }}</footer>
+               {{ form_end(login) }}
+       </article>
+       {% if recover is defined %}
+               <article id="recover">
+                       <header>
+                               <h2><a href="{{ path('rapsysuser_recover') }}">{% trans %}Recover{% endtrans %}</a></h2>
+                       </header>
+                       {{ form_start(recover) }}
 
-                                       {% 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 %}
-                               </section>
+                               <div>
+                                       {{ form_row(recover.mail) }}
 
-                               {{ form_row(form.submit) }}
+                                       {{ form_row(recover.submit) }}
+                               </div>
 
                                {# Render CSRF token etc .#}
-                               <footer style="display:none">
-                                       {{ form_rest(form) }}
-                               </footer>
-
-                       {{ form_end(form) }}
-               </div>
-       </section>
+                               <footer style="display:none">{{ form_rest(recover) }}</footer>
+                       {{ form_end(recover) }}
+               </article>
+       {% endif %}
 {% endblock %}