New css layout

Cleanup

diff --git a/Resources/views/form/_application.html.twig b/Resources/views/form/_application.html.twig
index b165790a2c54a07d4cf0dbad15ade17012536792..127ca8cbc237734b78f774dee21c453a4d0ac2ee 100644 (file)
--- a/Resources/views/form/_application.html.twig
+++ b/Resources/views/form/_application.html.twig
@@ -1,20 +1,21 @@
-{{ form_start(application) }}
-       <section>
-               {% if application.user is defined %}
-                       {{ form_row(application.user) }}
-               {% endif %}
+<section>
+       <h2>{% trans %}Application{% endtrans %}</h2>
+       {{ form_start(application) }}
+               <div>
+                       {% 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) }}
-       </section>
+                       {{ form_row(application.slot) }}

 
 

-       {{ form_row(application.submit) }}
+                       {{ form_row(application.submit) }}
+               </div>

 
 

-       {# Render CSRF token etc .#}
-       <footer style="display:none">
-               {{ form_rest(application) }}
-       </footer>
-{{ form_end(application) }}
+               {# render csrf token etc .#}
+               <footer style="display:none">{{ form_rest(application) }}</footer>
+       {{ form_end(application) }}
+</section>

diff --git a/Resources/views/form/_login.html.twig b/Resources/views/form/_login.html.twig
index 61d55dee9ec5e54eeaf4dfff63dad7b94c3b1a47..86d32d6bd00a51442f34df620a4b3a16b9f1f0fd 100644 (file)
--- a/Resources/views/form/_login.html.twig
+++ b/Resources/views/form/_login.html.twig
@@ -1,16 +1,15 @@
-{{ form_start(login) }}
+<section>
+       <h2><a href="{{ path('rapsys_user_login') }}">{% trans %}Login{% endtrans %}</a></h2>
+       {{ form_start(login) }}
+               <div>
+                       {{ form_row(login.mail) }}

 
 

-       <section>
-               {{ form_row(login.mail) }}
+                       {{ form_row(login.password) }}

 
 

-               {{ form_row(login.password) }}
-       </section>
+                       {{ form_row(login.submit) }}
+               </div>

 
 

-       {{ form_row(login.submit) }}
-
-       {# Render CSRF token etc .#}
-       <footer style="display:none">
-               {{ form_rest(login) }}
-       </footer>
-
-{{ form_end(login) }}
+               {# Render CSRF token etc .#}
+               <footer style="display:none">{{ form_rest(login) }}</footer>
+       {{ form_end(login) }}
+</section>

diff --git a/Resources/views/form/contact.html.twig b/Resources/views/form/contact.html.twig
index 957eb1a6048f588c257015b62a4b660119bb4a5c..fb41195d029a2c868b3a259e883ba96a52678256 100644 (file)
--- a/Resources/views/form/contact.html.twig
+++ b/Resources/views/form/contact.html.twig
@@ -5,30 +5,22 @@
                {% if sent %}
                        <p class="message notice">{% trans %}Your message has been sent{% endtrans %}</p>
                {% else %}
                {% if sent %}
                        <p class="message notice">{% trans %}Your message has been sent{% endtrans %}</p>
                {% else %}

-                       <div>
-                               {{ form_start(form) }}
+                       {{ form_start(form) }}
+                               <div>
+                                       {{ form_row(form.subject) }}

 
 

-                                       <header>{{ form_errors(form) }}</header>
+                                       {{ form_row(form.name) }}

 
 

-                                       <section>
-                                               {{ form_row(form.subject) }}
+                                       {{ form_row(form.mail) }}

 
 

-                                               {{ form_row(form.name) }}
-
-                                               {{ form_row(form.mail) }}
-
-                                               {{ form_row(form.message) }}
-                                       </section>
+                                       {{ form_row(form.message) }}

 
                                        {{ form_row(form.submit) }}
 
                                        {{ form_row(form.submit) }}

+                               </div>

 
 

-                                       {# Render CSRF token etc .#}
-                                       <footer style="display:none">
-                                               {{ form_rest(form) }}
-                                       </footer>
-
-                               {{ form_end(form) }}
-                       </div>
+                               {# 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/form_div_layout.html.twig b/Resources/views/form/form_div_layout.html.twig
index 29ec4014e053b9add2d277cb9702cd10e352450d..34af91ef39b57b7196fa67bd340de17c6f7ad527 100644 (file)
--- 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 -%}
 {%- endblock repeated_row -%}
 
 {%- block form_row -%}

-    <div>
+    <div class="row">

         {{- form_label(form) -}}
         {{- form_label(form) -}}

-        <section>
+        <div>

             {{- form_widget(form) -}}
             {%- if errors|length > 0 -%}
                 <div class="message error">
                     {{- form_errors(form) -}}
                 </div>
             {%- endif -%}
             {{- form_widget(form) -}}
             {%- if errors|length > 0 -%}
                 <div class="message error">
                     {{- form_errors(form) -}}
                 </div>
             {%- endif -%}

-        </section>
+        </div>

     </div>
 {%- endblock form_row -%}
 
     </div>
 {%- endblock form_row -%}
 


@@ -338,10 +338,8 @@
         <input type="hidden" name="_method" value="{{ method }}" />
     {%- endif -%}
     {%- if errors|length > 0 -%}
         <input type="hidden" name="_method" value="{{ method }}" />
     {%- endif -%}
     {%- if errors|length > 0 -%}

-        <header>
-            <div class="message error">
-                {{- form_errors(form) -}}
-            </div>
+        <header class="message error">
+                       {{- form_errors(form) -}}

         </header>
     {%- endif -%}
 {%- endblock form_start -%}
         </header>
     {%- endif -%}
 {%- endblock form_start -%}

diff --git a/Resources/views/form/login.html.twig b/Resources/views/form/login.html.twig
index 20058778ca67e64d71f270797a9d8f3ca05ba6c0..cdfeca540d16d834b0411f712dfc692feb05eddb 100644 (file)
--- a/Resources/views/form/login.html.twig
+++ b/Resources/views/form/login.html.twig
@@ -2,40 +2,33 @@
 {% 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>

-               <section>
-                       {{ form_start(login) }}
-                               <section>
-                                       {{ form_row(login.mail) }}
+               {{ form_start(login) }}
+                       <section>
+                               {{ form_row(login.mail) }}

 
 

-                                       {{ form_row(login.password) }}
-                               </section>
+                               {{ form_row(login.password) }}

 
                                {{ form_row(login.submit) }}
 
                                {{ form_row(login.submit) }}

+                       </section>

 
 

-                               {# Render CSRF token etc .#}
-                               <footer style="display:none">
-                                       {{ form_rest(login) }}
-                               </footer>
-                       {{ form_end(login) }}
-               </section>
-               {% if recover is defined %}
-                       <section class="recover">
-                               <h3>Recover</h3>
-                               {{ form_start(recover) }}
+                       {# Render CSRF token etc .#}
+                       <footer style="display:none">{{ form_rest(login) }}</footer>
+               {{ form_end(login) }}
+       </section>
+       {% if recover is defined %}
+               <section id="recover">
+                       <h2><a href="{{ path('rapsys_user_recover') }}">{% trans %}Recover{% endtrans %}</a></h2>
+                       {{ form_start(recover) }}

 
 

-                                       <section>
-                                               {{ form_row(recover.mail) }}
-                                       </section>
+                               <div>
+                                       {{ form_row(recover.mail) }}

 
                                        {{ form_row(recover.submit) }}
 
                                        {{ form_row(recover.submit) }}

+                               </div>

 
 

-                                       {# Render CSRF token etc .#}
-                                       <footer style="display:none">
-                                               {{ form_rest(recover) }}
-                                       </footer>
-
-                               {{ form_end(recover) }}
-                       </section>
-               {% endif %}
-       </section>
+                               {# Render CSRF token etc .#}
+                               <footer style="display:none">{{ form_rest(recover) }}</footer>
+                       {{ form_end(recover) }}
+               </section>
+       {% endif %}

 {% endblock %}
 {% endblock %}

diff --git a/Resources/views/form/recover.html.twig b/Resources/views/form/recover.html.twig
index c685361c3476d2a5f8d3448d3788100727cbe093..68399a03b46de024e7fea175eaaf510ae97b79bc 100644 (file)
--- a/Resources/views/form/recover.html.twig
+++ b/Resources/views/form/recover.html.twig
@@ -5,20 +5,16 @@
                {% if sent %}
                        <p class="message notice">{% trans %}Your recover account message has been sent{% endtrans %}</p>
                {% else %}
                {% if sent %}
                        <p class="message notice">{% trans %}Your recover account message has been sent{% endtrans %}</p>
                {% else %}

-                       <section>
-                               {{ form_start(form) }}
-                                       <section>
-                                               {{ form_row(form.mail) }}
-                                       </section>
+                       {{ form_start(form) }}
+                               <div>
+                                       {{ form_row(form.mail) }}

 
                                        {{ 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 2275ea9bbe8e57f6db65f75a79906ce17037ce8b..7f1e1e031365675fa182d18325daf870731d96aa 100644 (file)
--- 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 %}
        <section id="form">
 {% extends '@RapsysAir/body.html.twig' %}
 {% block content %}
        <section id="form">

-               <h2>{{ title|trans }}</h2>
+               <h2><a href="{{ path('rapsys_user_register') }}">{% trans %}Register{% endtrans %}</a></h2>

                {% if sent %}
                        <p class="message notice">{% trans %}Your account has been created{% endtrans %}</p>
                {% else %}
                {% if sent %}
                        <p class="message notice">{% trans %}Your account has been created{% endtrans %}</p>
                {% else %}

-                       <section>
-                               {{ form_start(form) }}
-                                       <section>
-                                               {{ form_row(form.mail) }}
+                       {{ form_start(form) }}
+                               <div>
+                                       {{ 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) }}
-                                       </section>
+                                       {{ form_row(form.phone) }}

 
                                        {{ 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 %}