From b5d264e6f676fdda8f7f846309a0eb9d9faa6b76 Mon Sep 17 00:00:00 2001
From: =?utf8?q?Rapha=C3=ABl=20Gertz?= <git@rapsys.eu>
Date: Wed, 9 Dec 2020 21:50:23 +0100
Subject: [PATCH] New css layout Cleanup

---
 Resources/views/form/_application.html.twig   | 31 ++++++------
 Resources/views/form/_login.html.twig         | 25 +++++-----
 Resources/views/form/contact.html.twig        | 28 ++++-------
 .../views/form/form_div_layout.html.twig      | 12 ++---
 Resources/views/form/login.html.twig          | 49 ++++++++-----------
 Resources/views/form/recover.html.twig        | 18 +++----
 Resources/views/form/register.html.twig       | 34 ++++++-------
 7 files changed, 86 insertions(+), 111 deletions(-)

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) }}
-	<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 61d55de..86d32d6 100644
--- 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 957eb1a..fb41195 100644
--- 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 %}
-			<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) }}
+				</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 %}
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 -%}
-    <div>
+    <div class="row">
         {{- form_label(form) -}}
-        <section>
+        <div>
             {{- form_widget(form) -}}
             {%- if errors|length > 0 -%}
                 <div class="message error">
                     {{- form_errors(form) -}}
                 </div>
             {%- endif -%}
-        </section>
+        </div>
     </div>
 {%- endblock form_row -%}
 
@@ -338,10 +338,8 @@
         <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 -%}
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 %}
 	<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) }}
+			</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) }}
+				</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 %}
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 %}
 			<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) }}
+				</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 %}
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 %}
 	<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 %}
-			<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) }}
+				</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 %}
-- 
2.41.0