Remove recover link
Remove header block now moved in twig form template
Add messages in new notice class
Cleanup
{% block content %}
<section id="form">
<h2><a href="{{ path('rapsys_user_login') }}">{% trans %}Login{% endtrans %}</a></h2>
{% block content %}
<section id="form">
<h2><a href="{{ path('rapsys_user_login') }}">{% trans %}Login{% endtrans %}</a></h2>
- <div>
- {{ form_start(form) }}
-
- <header>{{ form_errors(form) }}</header>
-
+ <section>
+ {{ form_start(login) }}
- {{ form_row(form.mail) }}
-
- {{ form_row(form.password) }}
+ {{ form_row(login.mail) }}
- {% 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 %}
+ {{ form_row(login.password) }}
- {{ form_row(form.submit) }}
+ {{ form_row(login.submit) }}
{# Render CSRF token etc .#}
<footer style="display:none">
{# Render CSRF token etc .#}
<footer style="display:none">
+ {{ form_end(login) }}
+ </section>
+ {% if recover is defined %}
+ <section>
+ <h3>Recover</h3>
+ {{ form_start(recover) }}
+
+ <section>
+ {{ form_row(recover.mail) }}
+
+ {{ form_row(recover.submit) }}
+ </section>
+
+ {# Render CSRF token etc .#}
+ <footer style="display:none">
+ {{ form_rest(recover) }}
+ </footer>
- {{ form_end(form) }}
- </div>
+ {{ form_end(recover) }}
+ </section>
+ {% endif %}
</section>
{% endblock %}
</section>
{% endblock %}
<section id="form">
<h2><a href="{{ path('rapsys_user_recover') }}">{% trans %}Recover{% endtrans %}</a></h2>
{% if sent %}
<section id="form">
<h2><a href="{{ path('rapsys_user_recover') }}">{% trans %}Recover{% endtrans %}</a></h2>
{% if sent %}
- <p>{% trans %}Your recover account message has been sent{% endtrans %}</p>
+ <p class="notice">{% trans %}Your recover account message has been sent{% endtrans %}</p>
-
- <header>{{ form_errors(form) }}</header>
-
<section>
{{ form_row(form.mail) }}
</section>
<section>
{{ form_row(form.mail) }}
</section>
<footer style="display:none">
{{ form_rest(form) }}
</footer>
<footer style="display:none">
{{ form_rest(form) }}
</footer>
{% endif %}
</section>
{% endblock %}
{% endif %}
</section>
{% endblock %}
<section id="form">
<h2><a href="{{ path('rapsys_user_recover') }}">{% trans %}Recover{% endtrans %}</a></h2>
{% if sent %}
<section id="form">
<h2><a href="{{ path('rapsys_user_recover') }}">{% trans %}Recover{% endtrans %}</a></h2>
{% if sent %}
- <p>{% trans %}Your password is updated and an account recover message has been sent{% endtrans %}</p>
- {% elseif notfound %}
- <p>{% trans %}Unable to find account{% endtrans %}</p>
+ <p class="notice">{% trans %}Your password is updated and an account recover message has been sent{% endtrans %}</p>
+ {% elseif not found %}
+ <p class="error">{% trans %}Unable to find account{% endtrans %}</p>
-
- <header>{{ form_errors(form) }}</header>
-
<section>
{{ form_row(form.password) }}
</section>
<section>
{{ form_row(form.password) }}
</section>
<footer style="display:none">
{{ form_rest(form) }}
</footer>
<footer style="display:none">
{{ form_rest(form) }}
</footer>
{% endif %}
</section>
{% endblock %}
{% endif %}
</section>
{% endblock %}
<section id="form">
<h2>{{ title|trans }}</h2>
{% if sent %}
<section id="form">
<h2>{{ title|trans }}</h2>
{% if sent %}
- <p>{% trans %}Your account has been created{% endtrans %}</p>
+ <p class="notice">{% trans %}Your account has been created{% endtrans %}</p>
-
- <header>{{ form_errors(form) }}</header>
-
<section>
{{ form_row(form.mail) }}
<section>
{{ form_row(form.mail) }}
<footer style="display:none">
{{ form_rest(form) }}
</footer>
<footer style="display:none">
{{ form_rest(form) }}
</footer>
{% endif %}
</section>
{% endblock %}
{% endif %}
</section>
{% endblock %}