Improve form templates

forms/models.py

@@ -39,7 +39,7 @@ class Meta:
 
 class SitesFacilesBaseForm(BaseForm):
     """
-    A base form that adds the necessary class on relevant fields
+    A base form that adds the necessary DSFR class on relevant fields
     """
 
     def __init__(self, *args, **kwargs):
@@ -49,7 +49,7 @@ def __init__(self, *args, **kwargs):
 
     @property
     def default_renderer(self):
-        return DsfrDjangoTemplates  # Settings wasn't modified
+        return DsfrDjangoTemplates
 
 
 class SitesFacilesFormBuilder(FormBuilder):

forms/templates/forms/form_page.html

@@ -6,17 +6,20 @@
 {% endblock title %}
 
 {% block content %}
-  <div class="fr-container fr-my-6w">
-    <div class="fr-grid-row fr-grid-row--center">
-      <div class="fr-col-md-8">
-        <h1>{{ page.title }}</h1>
-        {{ page.intro|richtext }}
-        <form action="{% pageurl page %}" method="post">
-          {% csrf_token %}
-          {% dsfr_form %}
-          <input class="fr-btn" type="submit">
-        </form>
-      </div>
-    </div>
+  <div class="fr-container fr-pt-4w">
+    {% include "content_manager/blocks/breadcrumbs.html" %}
+    <h1>{{ page.title }}</h1>
+
+  </div>
+
+  {% include "content_manager/blocks/messages.html" %}
+
+  <div class="fr-container fr-pb-6w">
+    {{ page.intro|richtext }}
+    <form action="{% pageurl page %}" method="post">
+      {% csrf_token %}
+      {% dsfr_form %}
+      <input class="fr-btn" type="submit">
+    </form>
   </div>
 {% endblock content %}

forms/templates/forms/form_page_landing.html

@@ -2,9 +2,20 @@
 
 {% load i18n wagtailcore_tags %}
 
+{% block title %}
+  <title>{{ page.seo_title|default:page.title }} — {{ settings.content_manager.CmsDsfrConfig.site_title }}</title>
+{% endblock title %}
+
 {% block content %}
-  <div class="fr-container fr-mt-6w">
+  <div class="fr-container fr-pt-4w">
+    {% include "content_manager/blocks/breadcrumbs.html" %}
     <h1>{{ page.title }}</h1>
+
+  </div>
+
+  {% include "content_manager/blocks/messages.html" %}
+
+  <div class="fr-container fr-mb-6w">
     {% if page.thank_you_text %}
       {{ page.thank_you_text|richtext }}
     {% else %}