From: Raphaƫl Gertz Date: Wed, 9 Dec 2020 20:50:23 +0000 (+0100) Subject: New css layout X-Git-Tag: 0.1.6~1 X-Git-Url: https://git.rapsys.eu/airbundle/commitdiff_plain/b8024b225dacfeb78cdc7bb6277db8d568a608e1?ds=sidebyside New css layout Cleanup --- diff --git a/Resources/views/form/_application.html.twig b/Resources/views/form/_application.html.twig index b165790..127ca8c 100644 --- a/Resources/views/form/_application.html.twig +++ b/Resources/views/form/_application.html.twig @@ -1,20 +1,21 @@ -{{ form_start(application) }} -
- {% if application.user is defined %} - {{ form_row(application.user) }} - {% endif %} +
+

{% trans %}Application{% endtrans %}

+ {{ form_start(application) }} +
+ {% if application.user is defined %} + {{ form_row(application.user) }} + {% endif %} - {{ form_row(application.location) }} + {{ form_row(application.location) }} - {{ form_row(application.date) }} + {{ form_row(application.date) }} - {{ form_row(application.slot) }} -
+ {{ form_row(application.slot) }} - {{ form_row(application.submit) }} + {{ form_row(application.submit) }} + - {# Render CSRF token etc .#} -
- {{ form_rest(application) }} -
-{{ form_end(application) }} + {# render csrf token etc .#} +
{{ form_rest(application) }}
+ {{ form_end(application) }} +
diff --git a/Resources/views/form/_login.html.twig b/Resources/views/form/_login.html.twig index 61d55de..86d32d6 100644 --- a/Resources/views/form/_login.html.twig +++ b/Resources/views/form/_login.html.twig @@ -1,16 +1,15 @@ -{{ form_start(login) }} +
+

{% trans %}Login{% endtrans %}

+ {{ form_start(login) }} +
+ {{ form_row(login.mail) }} -
- {{ form_row(login.mail) }} + {{ form_row(login.password) }} - {{ form_row(login.password) }} -
+ {{ form_row(login.submit) }} +
- {{ form_row(login.submit) }} - - {# Render CSRF token etc .#} -
- {{ form_rest(login) }} -
- -{{ form_end(login) }} + {# Render CSRF token etc .#} +
{{ form_rest(login) }}
+ {{ form_end(login) }} +
diff --git a/Resources/views/form/contact.html.twig b/Resources/views/form/contact.html.twig index 957eb1a..fb41195 100644 --- a/Resources/views/form/contact.html.twig +++ b/Resources/views/form/contact.html.twig @@ -5,30 +5,22 @@ {% if sent %}

{% trans %}Your message has been sent{% endtrans %}

{% else %} -
- {{ form_start(form) }} + {{ form_start(form) }} +
+ {{ form_row(form.subject) }} -
{{ form_errors(form) }}
+ {{ form_row(form.name) }} -
- {{ form_row(form.subject) }} + {{ form_row(form.mail) }} - {{ form_row(form.name) }} - - {{ form_row(form.mail) }} - - {{ form_row(form.message) }} -
+ {{ form_row(form.message) }} {{ form_row(form.submit) }} +
- {# Render CSRF token etc .#} -
- {{ form_rest(form) }} -
- - {{ form_end(form) }} -
+ {# Render CSRF token etc .#} + + {{ form_end(form) }} {% endif %} {% endblock %} diff --git a/Resources/views/form/form_div_layout.html.twig b/Resources/views/form/form_div_layout.html.twig index 29ec401..34af91e 100644 --- a/Resources/views/form/form_div_layout.html.twig +++ b/Resources/views/form/form_div_layout.html.twig @@ -294,16 +294,16 @@ {%- endblock repeated_row -%} {%- block form_row -%} -
+
{{- form_label(form) -}} -
+
{{- form_widget(form) -}} {%- if errors|length > 0 -%}
{{- form_errors(form) -}}
{%- endif -%} -
+
{%- endblock form_row -%} @@ -338,10 +338,8 @@ {%- endif -%} {%- if errors|length > 0 -%} -
-
- {{- form_errors(form) -}} -
+
+ {{- form_errors(form) -}}
{%- endif -%} {%- endblock form_start -%} diff --git a/Resources/views/form/login.html.twig b/Resources/views/form/login.html.twig index 2005877..cdfeca5 100644 --- a/Resources/views/form/login.html.twig +++ b/Resources/views/form/login.html.twig @@ -2,40 +2,33 @@ {% block content %}

{% trans %}Login{% endtrans %}

-
- {{ form_start(login) }} -
- {{ form_row(login.mail) }} + {{ form_start(login) }} +
+ {{ form_row(login.mail) }} - {{ form_row(login.password) }} -
+ {{ form_row(login.password) }} {{ form_row(login.submit) }} +
- {# Render CSRF token etc .#} -
- {{ form_rest(login) }} -
- {{ form_end(login) }} -
- {% if recover is defined %} -
-

Recover

- {{ form_start(recover) }} + {# Render CSRF token etc .#} +
{{ form_rest(login) }}
+ {{ form_end(login) }} +
+ {% if recover is defined %} +
+

{% trans %}Recover{% endtrans %}

+ {{ form_start(recover) }} -
- {{ form_row(recover.mail) }} -
+
+ {{ form_row(recover.mail) }} {{ form_row(recover.submit) }} +
- {# Render CSRF token etc .#} -
- {{ form_rest(recover) }} -
- - {{ form_end(recover) }} -
- {% endif %} -
+ {# Render CSRF token etc .#} +
{{ form_rest(recover) }}
+ {{ form_end(recover) }} + + {% endif %} {% endblock %} diff --git a/Resources/views/form/recover.html.twig b/Resources/views/form/recover.html.twig index c685361..68399a0 100644 --- a/Resources/views/form/recover.html.twig +++ b/Resources/views/form/recover.html.twig @@ -5,20 +5,16 @@ {% if sent %}

{% trans %}Your recover account message has been sent{% endtrans %}

{% else %} -
- {{ form_start(form) }} -
- {{ form_row(form.mail) }} -
+ {{ form_start(form) }} +
+ {{ form_row(form.mail) }} {{ 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 2275ea9..7f1e1e0 100644 --- a/Resources/views/form/register.html.twig +++ b/Resources/views/form/register.html.twig @@ -1,38 +1,34 @@ {% extends '@RapsysAir/body.html.twig' %} {% block content %}
-

{{ title|trans }}

+

{% trans %}Register{% endtrans %}

{% if sent %}

{% trans %}Your account has been created{% endtrans %}

{% else %} -
- {{ form_start(form) }} -
- {{ form_row(form.mail) }} + {{ form_start(form) }} +
+ {{ form_row(form.mail) }} - {{ form_row(form.password.first) }} + {{ form_row(form.password.first) }} - {{ form_row(form.password.second) }} + {{ form_row(form.password.second) }} - {{ form_row(form.title) }} + {{ form_row(form.title) }} - {{ form_row(form.forename) }} + {{ form_row(form.forename) }} - {{ form_row(form.surname) }} + {{ form_row(form.surname) }} - {{ form_row(form.pseudonym) }} + {{ form_row(form.pseudonym) }} - {{ form_row(form.phone) }} -
+ {{ form_row(form.phone) }} {{ form_row(form.submit) }} + - {# Render CSRF token etc .#} -
- {{ form_rest(form) }} -
- {{ form_end(form) }} -
+ {# Render CSRF token etc .#} + + {{ form_end(form) }} {% endif %}
{% endblock %}