From 58768c03cf0c9dfe549b95ed5c4d58380332b7e5 Mon Sep 17 00:00:00 2001
From: hellodeloo <hello@hellodeloo.com>
Date: Tue, 19 Sep 2023 10:38:34 +0200
Subject: [PATCH] fix: dsp form ui

---
 .../templates/event/event_calendar.html       |  2 +-
 lacommunaute/templates/event/event_form.html  |  6 +-
 lacommunaute/templates/event/event_list.html  |  2 +-
 .../templates/forum/category_forum_list.html  |  8 +--
 .../templates/forum/forum_detail.html         | 54 +++++++--------
 lacommunaute/templates/forum/forum_list.html  | 32 ++++-----
 .../forum_polls/topic_list_poll_detail.html   |  8 +--
 .../topic_list_poll_vote_form.html            | 20 +++---
 .../partials/post_certified.html              | 14 ++--
 .../partials/post_certified_actions.html      | 18 ++---
 .../partials/post_feed_form_collapsable.html  | 12 ++--
 .../forum_conversation/partials/poster.html   |  8 +--
 .../partials/posts_list.html                  |  2 +-
 .../partials/topic_detail_actions.html        | 20 +++---
 .../partials/topic_filter.html                | 14 ++--
 .../partials/topic_form.html                  |  6 +-
 .../partials/topic_likes.html                 | 12 ++--
 .../forum_conversation/topic_list.html        | 36 +++++-----
 .../topic_list_newsfeed.html                  | 36 +++++-----
 .../forum_member/forum_profile_detail.html    |  8 +--
 .../forum_member/moderator_profiles.html      |  8 +--
 .../templates/forum_member/profiles.html      |  8 +--
 .../templates/forum_search/search.html        | 16 ++---
 .../templates/forum_search/search_form.html   |  8 +--
 .../templates/forum_upvote/upvote_list.html   | 16 ++---
 lacommunaute/templates/pages/contact.html     | 14 ++--
 lacommunaute/templates/pages/home.html        | 24 +++----
 .../templates/partials/ask_a_question.html    | 18 ++---
 lacommunaute/templates/partials/banner.html   | 10 +--
 lacommunaute/templates/partials/footer.html   | 24 +++----
 .../partials/form_field_mentions.html         |  8 +--
 .../partials/header_nav_primary_items.html    | 40 ++++++------
 lacommunaute/templates/partials/upvotes.html  | 16 ++---
 .../templates/surveys/dsp_detail.html         | 38 +++++++----
 lacommunaute/templates/surveys/dsp_form.html  | 65 +++++++++++++------
 35 files changed, 334 insertions(+), 297 deletions(-)

diff --git a/lacommunaute/templates/event/event_calendar.html b/lacommunaute/templates/event/event_calendar.html
index 6dcb2d452..47672a8d2 100644
--- a/lacommunaute/templates/event/event_calendar.html
+++ b/lacommunaute/templates/event/event_calendar.html
@@ -33,7 +33,7 @@ <h1 class="s-title-01__title h1"><strong>Les évènements à venir</strong></h1>
                 <div class="s-section__col col-12">
                     {% if user.is_authenticated %}
                         <a href="{% url 'event:create' %}"
-                           role="button" class="btn btn-primary">
+                            role="button" class="btn btn-primary">
                             {% trans "Post a new Public Event" %}
                         </a>
                     {% else %}
diff --git a/lacommunaute/templates/event/event_form.html b/lacommunaute/templates/event/event_form.html
index 9ae224ea2..5862b937a 100644
--- a/lacommunaute/templates/event/event_form.html
+++ b/lacommunaute/templates/event/event_form.html
@@ -52,9 +52,9 @@ <h1 class="s-title-01__title h1"><strong>{% trans "Post a new Public Event" %}</
                             <div class="form-actions form-row">
                                 <div class="form-group col-auto">
                                     <input type="submit" class="btn btn-primary matomo-event" value="{% trans "Submit" %}"
-                                           data-matomo-category="engagement"
-                                           data-matomo-action="contribute"
-                                           data-matomo-option="event">
+                                        data-matomo-category="engagement"
+                                        data-matomo-action="contribute"
+                                        data-matomo-option="event">
                                     {% if event %}
                                         <a href="{% url 'event:delete' pk=event.pk %}" role="button" class="btn btn-outline-danger" value="{% trans "Delete" %}">{% trans "Delete" %}</a>
                                     {% endif %}
diff --git a/lacommunaute/templates/event/event_list.html b/lacommunaute/templates/event/event_list.html
index 34fa0e112..09e9d0875 100644
--- a/lacommunaute/templates/event/event_list.html
+++ b/lacommunaute/templates/event/event_list.html
@@ -14,7 +14,7 @@ <h1 class="s-title-01__title h1"><strong>{% trans "Manage My Events" %}</strong>
             <div class="s-title-01__row row">
                 <div class="col-12 col-md-auto">
                     <a href="{% url 'event:create' %}"
-                       role="button" class="btn btn-primary">
+                        role="button" class="btn btn-primary">
                         {% trans "Post a new Public Event" %}
                     </a>
                 </div>
diff --git a/lacommunaute/templates/forum/category_forum_list.html b/lacommunaute/templates/forum/category_forum_list.html
index 1f005b535..bd4011d40 100644
--- a/lacommunaute/templates/forum/category_forum_list.html
+++ b/lacommunaute/templates/forum/category_forum_list.html
@@ -38,10 +38,10 @@ <h2 class="mt-3">Retrouver les ressources nécessaires pour améliorer ses diagn
                             </div>
                             <div class="card-footer text-right">
                                 <a href="{% url 'forum_extension:forum' forum.slug forum.id %}"
-                                   class="btn btn-ico btn-link stretched-link matomo-event"
-                                   data-matomo-category="engagement"
-                                   data-matomo-action="show"
-                                   data-matomo-option="fichestechniques">
+                                    class="btn btn-ico btn-link stretched-link matomo-event"
+                                    data-matomo-category="engagement"
+                                    data-matomo-action="show"
+                                    data-matomo-option="fichestechniques">
                                     <span>Consulter les fiches du thème</span>
                                     <i class="ri-arrow-right-up-line ri-lg"></i>
                                 </a>
diff --git a/lacommunaute/templates/forum/forum_detail.html b/lacommunaute/templates/forum/forum_detail.html
index 23781813c..d583ae594 100644
--- a/lacommunaute/templates/forum/forum_detail.html
+++ b/lacommunaute/templates/forum/forum_detail.html
@@ -48,10 +48,10 @@ <h2 class="mt-3">
                     </div>
                     <div class="col-12 col-lg-3">
                         <a href="{% url 'forum_extension:forum' parent_forum.slug parent_forum.id %}"
-                           class="matomo-event h3 text-decoration-none d-inline-block"
-                           data-matomo-category="engagement"
-                           data-matomo-action="view"
-                           data-matomo-option="forum">
+                            class="matomo-event h3 text-decoration-none d-inline-block"
+                            data-matomo-category="engagement"
+                            data-matomo-action="view"
+                            data-matomo-option="forum">
                             Les autres fiches du thème
                         </a>
                         <ul class="nav nav-tabs flex-column">
@@ -97,11 +97,11 @@ <h2 class="mt-3">
                         <div class="col-12 col-sm-auto forum-actions-block">
                             {% if user_can_add_topic %}
                                 <a href="{% url 'forum_conversation:topic_create' forum.slug forum.pk %}"
-                                   rel="nofollow"
-                                   class="btn btn-primary btn-ico matomo-event"
-                                   data-matomo-category="engagement"
-                                   data-matomo-action="contribute"
-                                   data-matomo-option="new_topic">
+                                    rel="nofollow"
+                                    class="btn btn-primary btn-ico matomo-event"
+                                    data-matomo-category="engagement"
+                                    data-matomo-action="contribute"
+                                    data-matomo-option="new_topic">
                                     <i class="ri-chat-new-line ri-lg"></i>
                                     <span>{% if forum.kind == 'NEWS' %}{% trans "New news" %}{% else %}{% trans "New topic" %}{% endif %}</span>
                                 </a>
@@ -112,10 +112,10 @@ <h2 class="mt-3">
                                 </button>
                                 <div class="dropdown-menu" aria-labelledby="id_dropdown_moderators_stats_button">
                                     <a href="{% url 'members:forum_profiles' forum.slug forum.pk %}"
-                                       class="dropdown-item matomo-event"
-                                       data-matomo-category="engagement"
-                                       data-matomo-action="view"
-                                       data-matomo-option="directory">
+                                        class="dropdown-item matomo-event"
+                                        data-matomo-category="engagement"
+                                        data-matomo-action="view"
+                                        data-matomo-option="directory">
                                         {% trans "Members" %}
                                     </a>
                                 </div>
@@ -135,22 +135,22 @@ <h2 class="mt-3">
                         <ul class="s-tabs-01__nav nav nav-tabs" role="tablist">
                             <li class="nav-item" role="presentation">
                                 <a class="nav-link active" id="topics-tab"
-                                   data-toggle="tab"
-                                   href="#topics"
-                                   role="tab"
-                                   aria-controls="topics"
-                                   aria-selected="true">
+                                    data-toggle="tab"
+                                    href="#topics"
+                                    role="tab"
+                                    aria-controls="topics"
+                                    aria-selected="true">
                                     Sujets
                                 </a>
                             </li>
                             {% if announces %}
                                 <li class="nav-item" role="presentation">
                                     <a class="nav-link" id="announces-tab"
-                                       data-toggle="tab"
-                                       href="#announces"
-                                       role="tab"
-                                       aria-controls="announces"
-                                       aria-selected="false">
+                                        data-toggle="tab"
+                                        href="#announces"
+                                        role="tab"
+                                        aria-controls="announces"
+                                        aria-selected="false">
                                         Annonces
                                     </a>
                                 </li>
@@ -163,16 +163,16 @@ <h2 class="mt-3">
                         </ul>
                         <div class="tab-content topiclist">
                             <div class="tab-pane fade show active" id="topics"
-                                 role="tabpanel"
-                                 aria-labelledby="topics-tab">
+                                role="tabpanel"
+                                aria-labelledby="topics-tab">
                                 {% with unread_topics=unread_topics  %}
                                     {% include "forum_conversation/topic_list.html" %} <!-- note vincentporte : to be optimized -->
                                 {% endwith %}
                             </div>
                             {% if announces %}
                                 <div class="tab-pane fade" id="announces"
-                                     role="tabpanel"
-                                     aria-labelledby="announces-tab">
+                                    role="tabpanel"
+                                    aria-labelledby="announces-tab">
                                     {% with topics=announces hide_if_empty=True unread_topics=unread_topics loadmoretopic_url=None %}
                                         {% include "forum_conversation/topic_list.html" %} <!-- note vincentporte : to be optimized -->
                                     {% endwith %}
diff --git a/lacommunaute/templates/forum/forum_list.html b/lacommunaute/templates/forum/forum_list.html
index d8e60e51d..d6796b5f3 100644
--- a/lacommunaute/templates/forum/forum_list.html
+++ b/lacommunaute/templates/forum/forum_list.html
@@ -20,10 +20,10 @@
                     <div class="flex-grow-1">
                         <h3 class="h3 mb-0">
                             <a href="{% url 'forum_extension:forum' node.obj.slug node.obj.id %}"
-                               class="matomo-event"
-                               data-matomo-category="engagement"
-                               data-matomo-action="view"
-                               data-matomo-option="forum">
+                                class="matomo-event"
+                                data-matomo-category="engagement"
+                                data-matomo-action="view"
+                                data-matomo-option="forum">
                                 {{ node.obj.name }}
                             </a>
                         </h3>
@@ -50,10 +50,10 @@ <h3 class="h3 mb-0">
                                     <li class="list-group-item list-group-item-action d-flex flex-column flex-md-row justify-content-md-between">
                                         <div class="flex-grow-1">
                                             <a href="{% url 'forum_extension:forum' child.obj.slug child.obj.id %}"
-                                               class="h5 d-block mb-0 matomo-event"
-                                               data-matomo-category="engagement"
-                                               data-matomo-action="view"
-                                               data-matomo-option="forum">
+                                                class="h5 d-block mb-0 matomo-event"
+                                                data-matomo-category="engagement"
+                                                data-matomo-action="view"
+                                                data-matomo-option="forum">
                                                 {{ child.obj.name }}
                                             </a>
                                             <small class="text-muted">
@@ -83,10 +83,10 @@ <h3 class="h3 mb-0">
                         </div>
                         <div class="card-footer text-right">
                             <a href="{% url 'forum_extension:forum' node.obj.slug node.obj.id %}"
-                               class="btn btn-ico btn-link stretched-link matomo-event"
-                               data-matomo-category="engagement"
-                               data-matomo-action="view"
-                               data-matomo-option="fiches_techniques">
+                                class="btn btn-ico btn-link stretched-link matomo-event"
+                                data-matomo-category="engagement"
+                                data-matomo-action="view"
+                                data-matomo-option="fiches_techniques">
                                 <span>Consulter la fiche</span>
                                 <i class="ri-arrow-right-up-line ri-lg"></i>
                             </a>
@@ -101,10 +101,10 @@ <h3 class="h3 mb-0">
                 <li class="list-group-item list-group-item-action d-flex flex-column flex-md-row justify-content-md-between">
                     <div class="flex-grow-1">
                         <a href="{% url 'forum_extension:forum' node.obj.slug node.obj.id %}"
-                           class="matomo-event h4 d-block mb-0"
-                           data-matomo-category="engagement"
-                           data-matomo-action="view"
-                           data-matomo-option="forum">
+                            class="matomo-event h4 d-block mb-0"
+                            data-matomo-category="engagement"
+                            data-matomo-action="view"
+                            data-matomo-option="forum">
                             {{ node.obj.name }}
                         </a>
                         <small class="text-muted">
diff --git a/lacommunaute/templates/forum_conversation/forum_polls/topic_list_poll_detail.html b/lacommunaute/templates/forum_conversation/forum_polls/topic_list_poll_detail.html
index 9b84a5cfc..f3fdd1a76 100644
--- a/lacommunaute/templates/forum_conversation/forum_polls/topic_list_poll_detail.html
+++ b/lacommunaute/templates/forum_conversation/forum_polls/topic_list_poll_detail.html
@@ -40,10 +40,10 @@
         {% elif can_be_completed and has_been_completed and not change_vote_action %}
             <div class="form-actions">
                 <a href="{% url 'forum_conversation:topic' poll.topic.forum.slug poll.topic.forum.pk poll.topic.slug poll.topic.pk %}?change_vote=true"
-                   class="btn btn-sm btn-link pl-0 matomo-event"
-                   data-matomo-category="engagement"
-                   data-matomo-action="view"
-                   data-matomo-option="topic">
+                    class="btn btn-sm btn-link pl-0 matomo-event"
+                    data-matomo-category="engagement"
+                    data-matomo-action="view"
+                    data-matomo-option="topic">
                     {% trans "Change your vote" %}
                 </a>
             </div>
diff --git a/lacommunaute/templates/forum_conversation/forum_polls/topic_list_poll_vote_form.html b/lacommunaute/templates/forum_conversation/forum_polls/topic_list_poll_vote_form.html
index a916d810f..86167611c 100644
--- a/lacommunaute/templates/forum_conversation/forum_polls/topic_list_poll_vote_form.html
+++ b/lacommunaute/templates/forum_conversation/forum_polls/topic_list_poll_vote_form.html
@@ -1,12 +1,12 @@
 {% load i18n %}
 
 <form method="post"
-      action=""
-      hx-post="{% url 'forum_polls_extension:topic_poll_vote' poll.topic.forum.slug poll.topic.forum.pk poll.pk %}"
-      id="poll-form{{poll.pk}}"
-      hx-target="#pollarea{{poll.pk}}"
-      hx-swap="outerHTML"
-      novalidate>
+    action=""
+    hx-post="{% url 'forum_polls_extension:topic_poll_vote' poll.topic.forum.slug poll.topic.forum.pk poll.pk %}"
+    id="poll-form{{poll.pk}}"
+    hx-target="#pollarea{{poll.pk}}"
+    hx-swap="outerHTML"
+    novalidate>
     {% csrf_token %}
 
     <ul class="list-unstyled mb-3">
@@ -28,9 +28,9 @@
     </ul>
     <div class="form-actions">
         <input type="submit" class="btn btn-sm btn-secondary matomo-event"
-               value="{% trans "Submit" %}"
-               data-matomo-category="engagement"
-               data-matomo-action="vote"
-               data-matomo-option="poll"/>
+            value="{% trans "Submit" %}"
+            data-matomo-category="engagement"
+            data-matomo-action="vote"
+            data-matomo-option="poll"/>
     </div>
 </form>
diff --git a/lacommunaute/templates/forum_conversation/partials/post_certified.html b/lacommunaute/templates/forum_conversation/partials/post_certified.html
index df9bfe3ac..52cc3cc16 100644
--- a/lacommunaute/templates/forum_conversation/partials/post_certified.html
+++ b/lacommunaute/templates/forum_conversation/partials/post_certified.html
@@ -22,13 +22,13 @@
                         {{ post.content.rendered|urlizetrunc_target_blank:30|img_fluid|truncatechars_html:200 }}
                         {% if post.content.rendered|length > 200 %}
                             <a hx-get="{% url 'forum_conversation_extension:showmore_certified' topic.forum.slug topic.forum.pk topic.slug topic.pk %}"
-                               id="showmorecertified-button{{topic.pk}}"
-                               hx-target="#showmorecertifiedpostsarea{{topic.pk}}"
-                               hx-swap="outerHTML"
-                               class="btn btn-link p-0 mh-auto matomo-event"
-                               data-matomo-category="engagement"
-                               data-matomo-action="showmore"
-                               data-matomo-option="certified"
+                                id="showmorecertified-button{{topic.pk}}"
+                                hx-target="#showmorecertifiedpostsarea{{topic.pk}}"
+                                hx-swap="outerHTML"
+                                class="btn btn-link p-0 mh-auto matomo-event"
+                                data-matomo-category="engagement"
+                                data-matomo-action="showmore"
+                                data-matomo-option="certified"
                             >
                                 {% trans "+ show more" %}
                             </a>
diff --git a/lacommunaute/templates/forum_conversation/partials/post_certified_actions.html b/lacommunaute/templates/forum_conversation/partials/post_certified_actions.html
index eae5989ff..25d6d1eda 100644
--- a/lacommunaute/templates/forum_conversation/partials/post_certified_actions.html
+++ b/lacommunaute/templates/forum_conversation/partials/post_certified_actions.html
@@ -2,17 +2,17 @@
     {% if not topic.is_certified or post.is_certified %}
         - <i class="ri-award-line small" aria-hidden="true"></i>
         <form hx-post="{%  url 'forum_conversation_extension:certify' topic.forum.slug topic.forum.pk topic.slug topic.pk %}"
-              id="certifiedpost-button{{post.pk}}"
-              class="d-inline-block"
-              hx-target="#showmorepostsarea{{topic.pk}}"
-              hx-confirm="Êtes-vous sûr de vouloir {% if post.is_certified %}retirer la certification de{% else %}certifier{% endif %} cette réponse ?"
-              hx-swap="outerHTML">
+            id="certifiedpost-button{{post.pk}}"
+            class="d-inline-block"
+            hx-target="#showmorepostsarea{{topic.pk}}"
+            hx-confirm="Êtes-vous sûr de vouloir {% if post.is_certified %}retirer la certification de{% else %}certifier{% endif %} cette réponse ?"
+            hx-swap="outerHTML">
             <input type='hidden' name='post_pk' value="{{post.pk}}"/>
             <button type="submit"
-                    class="btn-poster small text-muted text-nowrap text-decoration-underline matomo-event"
-                    data-matomo-category="engagement"
-                    data-matomo-action="certify"
-                    data-matomo-option="post"
+                class="btn-poster small text-muted text-nowrap text-decoration-underline matomo-event"
+                data-matomo-category="engagement"
+                data-matomo-action="certify"
+                data-matomo-option="post"
             >
                 {% if post.is_certified %}
                     Retirer la certification
diff --git a/lacommunaute/templates/forum_conversation/partials/post_feed_form_collapsable.html b/lacommunaute/templates/forum_conversation/partials/post_feed_form_collapsable.html
index 10d7f4c68..65b229e66 100644
--- a/lacommunaute/templates/forum_conversation/partials/post_feed_form_collapsable.html
+++ b/lacommunaute/templates/forum_conversation/partials/post_feed_form_collapsable.html
@@ -10,12 +10,12 @@
                 <div class="row">
                     <div class="col-12 post-content-wrapper">
                         <form hx-post="{% url 'forum_conversation_extension:post_create' topic.forum.slug topic.forum.pk topic.slug topic.pk %}"
-                              hx-target="#postinfeedarea{{topic.pk}}"
-                              hx-swap="outerHTML"
-                              class="majorpoints matomo-event"
-                              data-matomo-category="engagement"
-                              data-matomo-action="contribute"
-                              data-matomo-option="post">
+                            hx-target="#postinfeedarea{{topic.pk}}"
+                            hx-swap="outerHTML"
+                            class="majorpoints matomo-event"
+                            data-matomo-category="engagement"
+                            data-matomo-action="contribute"
+                            data-matomo-option="post">
                             {% csrf_token %}
 
                             {% if post_form.non_field_errors %}
diff --git a/lacommunaute/templates/forum_conversation/partials/poster.html b/lacommunaute/templates/forum_conversation/partials/poster.html
index e15439cf2..93de925e1 100644
--- a/lacommunaute/templates/forum_conversation/partials/poster.html
+++ b/lacommunaute/templates/forum_conversation/partials/poster.html
@@ -14,10 +14,10 @@
             {% blocktrans trimmed with poster_url=poster_url poster=post.poster_display_name creation_date=post.created %}
                 By:
                 <a href="{{ poster_url }}"
-                   class="matomo-event"
-                   data-matomo-category="engagement"
-                   data-matomo-action="view"
-                   data-matomo-option="member">
+                    class="matomo-event"
+                    data-matomo-category="engagement"
+                    data-matomo-action="view"
+                    data-matomo-option="member">
                     {{ poster }}
                 </a>,
             {% endblocktrans %}
diff --git a/lacommunaute/templates/forum_conversation/partials/posts_list.html b/lacommunaute/templates/forum_conversation/partials/posts_list.html
index bb1082ab9..d7aec4108 100644
--- a/lacommunaute/templates/forum_conversation/partials/posts_list.html
+++ b/lacommunaute/templates/forum_conversation/partials/posts_list.html
@@ -9,7 +9,7 @@
 <div id="showmorepostsarea{{topic.pk}}">
     {% for post in posts %}
         <div class="card post mb-3 {% if post.is_certified %}bg-communaute-lighter border-communaute {% else %}bg-light {% endif %} has-links-inside ml-3"
-             id="certifiedpostsarea{{post.pk}}">
+            id="certifiedpostsarea{{post.pk}}">
             <div class="card-body">
                 <div class="row">
                     <div class="col-12 post-content-wrapper">
diff --git a/lacommunaute/templates/forum_conversation/partials/topic_detail_actions.html b/lacommunaute/templates/forum_conversation/partials/topic_detail_actions.html
index ae587d1bc..405bc70e0 100644
--- a/lacommunaute/templates/forum_conversation/partials/topic_detail_actions.html
+++ b/lacommunaute/templates/forum_conversation/partials/topic_detail_actions.html
@@ -19,16 +19,16 @@
 
 {% if posts_count > 1 %}
     <a hx-get="{% url 'forum_conversation_extension:showmore_posts' topic.forum.slug topic.forum.pk topic.slug topic.pk %}"
-       id="showmoreposts-button{{topic.pk}}"
-       hx-target="#showmorepostsarea{{topic.pk}}"
-       hx-swap="outerHTML"
-       class="btn btn-secondary btn-sm btn-ico matomo-event justify-content-center w-100 w-sm-auto mr-sm-1 mb-2 mb-sm-0"
-       data-matomo-category="engagement"
-       data-matomo-action="showmore"
-       data-matomo-option="post"
-       onclick=DisabledMe("showmoreposts-button{{topic.pk}}")
-       aria-label="{% trans "Show me the comment" %}"
-       role="button"
+        id="showmoreposts-button{{topic.pk}}"
+        hx-target="#showmorepostsarea{{topic.pk}}"
+        hx-swap="outerHTML"
+        class="btn btn-secondary btn-sm btn-ico matomo-event justify-content-center w-100 w-sm-auto mr-sm-1 mb-2 mb-sm-0"
+        data-matomo-category="engagement"
+        data-matomo-action="showmore"
+        data-matomo-option="post"
+        onclick=DisabledMe("showmoreposts-button{{topic.pk}}")
+        aria-label="{% trans "Show me the comment" %}"
+        role="button"
     >
         <i class="ri-eye-line font-weight-normal" aria-hidden="true"></i>
         <span>
diff --git a/lacommunaute/templates/forum_conversation/partials/topic_filter.html b/lacommunaute/templates/forum_conversation/partials/topic_filter.html
index d6635a12e..d9961a7a5 100644
--- a/lacommunaute/templates/forum_conversation/partials/topic_filter.html
+++ b/lacommunaute/templates/forum_conversation/partials/topic_filter.html
@@ -18,13 +18,13 @@
                             {% for filter in filters %}
                                 <li>
                                     <button id="filtertopics-button"
-                                            hx-target="#topicsarea"
-                                            hx-swap="outerHTML"
-                                            hx-get="{% url 'forum_conversation_extension:topics' %}?filter={{ filter.0 }}"
-                                            class="dropdown-item matomo-event"
-                                            data-matomo-category="engagement"
-                                            data-matomo-action="filter"
-                                            data-matomo-option="topics">
+                                        hx-target="#topicsarea"
+                                        hx-swap="outerHTML"
+                                        hx-get="{% url 'forum_conversation_extension:topics' %}?filter={{ filter.0 }}"
+                                        class="dropdown-item matomo-event"
+                                        data-matomo-category="engagement"
+                                        data-matomo-action="filter"
+                                        data-matomo-option="topics">
                                         {{ filter.1 }}
                                     </button>
                                 </li>
diff --git a/lacommunaute/templates/forum_conversation/partials/topic_form.html b/lacommunaute/templates/forum_conversation/partials/topic_form.html
index 199ca2b3c..8652b0231 100644
--- a/lacommunaute/templates/forum_conversation/partials/topic_form.html
+++ b/lacommunaute/templates/forum_conversation/partials/topic_form.html
@@ -94,9 +94,9 @@
     <div class="form-actions form-row">
         <div class="form-group col-auto">
             <input type="submit" class="btn btn-primary matomo-event" value="{% trans "Submit" %}"
-                   data-matomo-category="engagement"
-                   data-matomo-action="contribute"
-                   data-matomo-option="submit_topic" />
+                data-matomo-category="engagement"
+                data-matomo-action="contribute"
+                data-matomo-option="submit_topic" />
         </div>
         {% if post %}
             {% get_permission 'can_delete_post' post request.user as user_can_delete_post %}
diff --git a/lacommunaute/templates/forum_conversation/partials/topic_likes.html b/lacommunaute/templates/forum_conversation/partials/topic_likes.html
index c7a990671..4e5d3a5f0 100644
--- a/lacommunaute/templates/forum_conversation/partials/topic_likes.html
+++ b/lacommunaute/templates/forum_conversation/partials/topic_likes.html
@@ -5,12 +5,12 @@
     {% with topic.likes as counter %}
         {% if user.is_authenticated %}
             <button hx-post="{% url 'forum_conversation_extension:like_topic' topic.forum.slug topic.forum.pk topic.slug topic.pk %}" id="like-button{{topic.pk}}"
-                    hx-target="#likesarea{{topic.pk}}"
-                    hx-swap="outerHTML"
-                    class="btn btn-ico btn-link btn-like px-0 text-nowrap matomo-event"
-                    data-matomo-category="engagement"
-                    data-matomo-action="like"
-                    data-matomo-option="topic"
+                hx-target="#likesarea{{topic.pk}}"
+                hx-swap="outerHTML"
+                class="btn btn-ico btn-link btn-like px-0 text-nowrap matomo-event"
+                data-matomo-category="engagement"
+                data-matomo-action="like"
+                data-matomo-option="topic"
             >
                 <i class="{% if topic.has_liked %}ri-heart-3-fill{% else %}ri-heart-3-line{% endif %} mr-1" aria-hidden="true"></i><span>{{counter}}</span>
             </button>
diff --git a/lacommunaute/templates/forum_conversation/topic_list.html b/lacommunaute/templates/forum_conversation/topic_list.html
index e60c4979c..64f05e77f 100644
--- a/lacommunaute/templates/forum_conversation/topic_list.html
+++ b/lacommunaute/templates/forum_conversation/topic_list.html
@@ -32,10 +32,10 @@
                                     <i class="{% if topic.is_sticky %}ri-lightbulb-flash-line{% elif topic.is_announce %}ri-information-line{% else %}ri-record-circle-line{% endif %} ri-xl aria-hidden="true""></i>
                                 </span>
                                 <a href="{% url 'forum_conversation:topic' topic.forum.slug topic.forum.pk topic.slug topic.pk %}"
-                                   class="matomo-event"
-                                   data-matomo-category="engagement"
-                                   data-matomo-action="view"
-                                   data-matomo-option="topic">
+                                    class="matomo-event"
+                                    data-matomo-category="engagement"
+                                    data-matomo-action="view"
+                                    data-matomo-option="topic">
                                     {{ topic.subject }} {% if topic.is_locked %}&nbsp;<i class="fas fa-times-circle locked-indicator" aria-label="{% trans 'This topic is locked' %}"></i>{% endif %}
                                 </a>
                             </p>
@@ -56,13 +56,13 @@
                                         {{ topic.first_post.content.rendered|urlizetrunc_target_blank:30|img_fluid|truncatechars_html:200 }}
                                         {% if topic.first_post.content.rendered|length > 200 %}
                                             <a hx-get="{% url 'forum_conversation_extension:showmore_topic' topic.forum.slug topic.forum.pk topic.slug topic.pk %}"
-                                               id="showmoretopic-button{{topic.pk}}"
-                                               hx-target="#showmoretopicsarea{{topic.pk}}"
-                                               hx-swap="outerHTML"
-                                               class="btn btn-link p-0 mh-auto matomo-event"
-                                               data-matomo-category="engagement"
-                                               data-matomo-action="showmore"
-                                               data-matomo-option="topic"
+                                                id="showmoretopic-button{{topic.pk}}"
+                                                hx-target="#showmoretopicsarea{{topic.pk}}"
+                                                hx-swap="outerHTML"
+                                                class="btn btn-link p-0 mh-auto matomo-event"
+                                                data-matomo-category="engagement"
+                                                data-matomo-action="showmore"
+                                                data-matomo-option="topic"
                                             >
                                                 {% trans "+ show more" %}
                                             </a>
@@ -121,13 +121,13 @@
             <div id="loadmoretopicsarea{{ loadmoretopic_suffix }}" class="row mx-3 mt-md-5 justify-content-center">
                 <div class="col-12 col-md-auto">
                     <a hx-get="{% url_add_query loadmoretopic_url page=page_obj.next_page_number %}"
-                       id="loadmoretopics-button"
-                       hx-target="#loadmoretopicsarea{{ loadmoretopic_suffix }}"
-                       hx-swap="outerHTML"
-                       class="btn btn-link btn-ico btn-block justify-content-center matomo-event"
-                       data-matomo-category="engagement"
-                       data-matomo-action="loadmore"
-                       data-matomo-option="topic">
+                        id="loadmoretopics-button"
+                        hx-target="#loadmoretopicsarea{{ loadmoretopic_suffix }}"
+                        hx-swap="outerHTML"
+                        class="btn btn-link btn-ico btn-block justify-content-center matomo-event"
+                        data-matomo-category="engagement"
+                        data-matomo-action="loadmore"
+                        data-matomo-option="topic">
                         <i class="ri-loop-right-line" aria-hidden="true"></i>
                         <span>{% trans "load more topics" %}</span>
                     </a>
diff --git a/lacommunaute/templates/forum_conversation/topic_list_newsfeed.html b/lacommunaute/templates/forum_conversation/topic_list_newsfeed.html
index 291e9beba..b441ffd8f 100644
--- a/lacommunaute/templates/forum_conversation/topic_list_newsfeed.html
+++ b/lacommunaute/templates/forum_conversation/topic_list_newsfeed.html
@@ -24,10 +24,10 @@
                             </div>
                             <p class="h4 mb-0 flex-grow-1">
                                 <a href="{% url 'forum_conversation:topic' topic.forum.slug topic.forum.pk topic.slug topic.pk %}"
-                                   class="matomo-event"
-                                   data-matomo-category="engagement"
-                                   data-matomo-action="view"
-                                   data-matomo-option="news">
+                                    class="matomo-event"
+                                    data-matomo-category="engagement"
+                                    data-matomo-action="view"
+                                    data-matomo-option="news">
                                     {{ topic.subject }} {% if topic.is_locked %}&nbsp;<i class="fas fa-times-circle locked-indicator" aria-label="{% trans 'This topic is locked' %}"></i>{% endif %}
                                 </a>
                             </p>
@@ -45,13 +45,13 @@
                                         {{ topic.first_post.content.rendered|urlizetrunc_target_blank:30|img_fluid|truncatechars_html:200 }}
                                         {% if topic.first_post.content.rendered|length > 200 %}
                                             <a hx-get="{% url 'forum_conversation_extension:showmore_topic' topic.forum.slug topic.forum.pk topic.slug topic.pk %}"
-                                               id="showmoretopic-button{{topic.pk}}"
-                                               hx-target="#showmoretopicsarea{{topic.pk}}"
-                                               hx-swap="outerHTML"
-                                               class="btn btn-link p-0 mh-auto matomo-event"
-                                               data-matomo-category="engagement"
-                                               data-matomo-action="showmore"
-                                               data-matomo-option="news"
+                                                id="showmoretopic-button{{topic.pk}}"
+                                                hx-target="#showmoretopicsarea{{topic.pk}}"
+                                                hx-swap="outerHTML"
+                                                class="btn btn-link p-0 mh-auto matomo-event"
+                                                data-matomo-category="engagement"
+                                                data-matomo-action="showmore"
+                                                data-matomo-option="news"
                                             >
                                                 {% trans "+ show more" %}
                                             </a>
@@ -84,13 +84,13 @@
             <div id="loadmoretopicsarea{{ loadmoretopic_suffix }}" class="row mx-3 mt-md-5 justify-content-center">
                 <div class="col-12 col-md-auto">
                     <a hx-get="{% url_add_query loadmoretopic_url page=page_obj.next_page_number %}"
-                       id="loadmoretopics-button"
-                       hx-target="#loadmoretopicsarea{{ loadmoretopic_suffix }}"
-                       hx-swap="outerHTML"
-                       class="btn btn-link btn-ico btn-block justify-content-center matomo-event"
-                       data-matomo-category="engagement"
-                       data-matomo-action="loadmore"
-                       data-matomo-option="topic">
+                        id="loadmoretopics-button"
+                        hx-target="#loadmoretopicsarea{{ loadmoretopic_suffix }}"
+                        hx-swap="outerHTML"
+                        class="btn btn-link btn-ico btn-block justify-content-center matomo-event"
+                        data-matomo-category="engagement"
+                        data-matomo-action="loadmore"
+                        data-matomo-option="topic">
                         <i class="ri-loop-right-line" aria-hidden="true"></i>
                         <span>{% trans "load more topics" %}</span>
                     </a>
diff --git a/lacommunaute/templates/forum_member/forum_profile_detail.html b/lacommunaute/templates/forum_member/forum_profile_detail.html
index bd9ae5196..373045d0f 100644
--- a/lacommunaute/templates/forum_member/forum_profile_detail.html
+++ b/lacommunaute/templates/forum_member/forum_profile_detail.html
@@ -39,10 +39,10 @@ <h3 class="my-3 text-center text-muted">{{ profile.user|forum_member_display_nam
                                     <div class="col-12 post-content-wrapper">
                                         <div class="post-title">
                                             <a href="{% url 'forum_conversation:topic' post.topic.forum.slug post.topic.forum.pk post.topic.slug post.topic.pk %}?post={{ post.pk }}#{{ post.pk }}"
-                                               class="matomo-event"
-                                               data-matomo-category="engagement"
-                                               data-matomo-action="view"
-                                               data-matomo-option="topic">
+                                                class="matomo-event"
+                                                data-matomo-category="engagement"
+                                                data-matomo-action="view"
+                                                data-matomo-option="topic">
                                                 {{ post.topic.subject }}
                                             </a>
                                         </div>
diff --git a/lacommunaute/templates/forum_member/moderator_profiles.html b/lacommunaute/templates/forum_member/moderator_profiles.html
index 3f531144e..a43d94d96 100644
--- a/lacommunaute/templates/forum_member/moderator_profiles.html
+++ b/lacommunaute/templates/forum_member/moderator_profiles.html
@@ -26,10 +26,10 @@ <h2 class="h2">{{paginator.count}} membre{{ paginator.count|pluralizefr }}</h2>
                                 <div class="card-body">
                                     <h3 class="h5 card-title">
                                         <a href="{%url 'members:profile' username=forum_profile.user.username%}"
-                                           class="matomo-event"
-                                           data-matomo-category="engagement"
-                                           data-matomo-action="view"
-                                           data-matomo-option="member">
+                                            class="matomo-event"
+                                            data-matomo-category="engagement"
+                                            data-matomo-action="view"
+                                            data-matomo-option="member">
                                             {{ forum_profile.user.get_full_name }}
                                         </a>
                                     </h3>
diff --git a/lacommunaute/templates/forum_member/profiles.html b/lacommunaute/templates/forum_member/profiles.html
index 087a2431f..06612c855 100644
--- a/lacommunaute/templates/forum_member/profiles.html
+++ b/lacommunaute/templates/forum_member/profiles.html
@@ -27,10 +27,10 @@ <h2 class="h2">Liste des membres de la communauté.</h2>
                                 <div class="card-body">
                                     <h3 class="h5 card-title">
                                         <a href="{%url 'members:profile' username=forum_profile.user.username%}"
-                                           class="matomo-event"
-                                           data-matomo-category="engagement"
-                                           data-matomo-action="view"
-                                           data-matomo-option="member">
+                                            class="matomo-event"
+                                            data-matomo-category="engagement"
+                                            data-matomo-action="view"
+                                            data-matomo-option="member">
                                             {{ forum_profile.user.get_full_name }}
                                         </a>
                                     </h3>
diff --git a/lacommunaute/templates/forum_search/search.html b/lacommunaute/templates/forum_search/search.html
index f84620d1c..81c3b24e0 100644
--- a/lacommunaute/templates/forum_search/search.html
+++ b/lacommunaute/templates/forum_search/search.html
@@ -43,10 +43,10 @@ <h3 class="h4 mb-0">{{ page.paginator.count }} {% trans "result" %}{{ page.pagin
                                                     <tr>
                                                         <td class="position-relative">
                                                             <a href="{% url 'forum_conversation:topic' result.forum_slug result.forum result.topic_slug result.topic %}"
-                                                               class="btn-link stretched-link btn-ico matomo-event"
-                                                               data-matomo-category="engagement"
-                                                               data-matomo-action="view"
-                                                               data-matomo-option="topic"
+                                                                class="btn-link stretched-link btn-ico matomo-event"
+                                                                data-matomo-category="engagement"
+                                                                data-matomo-action="view"
+                                                                data-matomo-option="topic"
                                                             >
                                                                 <i class="ri-user-line ri-lg" aria-hidden="true"></i>
                                                                 <span>{{ result.topic_subject }}</span>
@@ -68,10 +68,10 @@ <h3 class="h4 mb-0">{{ page.paginator.count }} {% trans "result" %}{{ page.pagin
                                                     <tr>
                                                         <td class="position-relative">
                                                             <a href="{% url 'forum_extension:forum' result.forum_slug result.forum %}"
-                                                               class="btn-link btn-ico stretched-link matomo-event"
-                                                               data-matomo-category="engagement"
-                                                               data-matomo-action="view"
-                                                               data-matomo-option="forum"
+                                                                class="btn-link btn-ico stretched-link matomo-event"
+                                                                data-matomo-category="engagement"
+                                                                data-matomo-action="view"
+                                                                data-matomo-option="forum"
                                                             >
                                                                 <i class="ri-article-line" aria-hidden="true"></i>
                                                                 <span>{{ result.forum_name }}</span>
diff --git a/lacommunaute/templates/forum_search/search_form.html b/lacommunaute/templates/forum_search/search_form.html
index 7ae53b764..bdf89b958 100644
--- a/lacommunaute/templates/forum_search/search_form.html
+++ b/lacommunaute/templates/forum_search/search_form.html
@@ -7,10 +7,10 @@
         </div>
         <div class="col-auto mb-3">
             <button type="submit"
-                    class="btn btn-primary btn-ico matomo-event"
-                    data-matomo-category="engagement"
-                    data-matomo-action="search"
-                    data-matomo-option="submit_query"
+                class="btn btn-primary btn-ico matomo-event"
+                data-matomo-category="engagement"
+                data-matomo-action="search"
+                data-matomo-option="submit_query"
             >
                 <i class="ri-search-line"></i>
                 <span>{% trans "Search" %}</span>
diff --git a/lacommunaute/templates/forum_upvote/upvote_list.html b/lacommunaute/templates/forum_upvote/upvote_list.html
index d73105245..638aa35a0 100644
--- a/lacommunaute/templates/forum_upvote/upvote_list.html
+++ b/lacommunaute/templates/forum_upvote/upvote_list.html
@@ -31,10 +31,10 @@ <h1>{% trans "My UpVotes" %}</h1>
                                                 <td class="position-relative">
                                                     {% if upvote.content_type.model == 'forum' %}
                                                         <a href="{% url 'forum_extension:forum' upvote.content_object.slug upvote.content_object.pk %}"
-                                                           class="btn-link btn-ico stretched-link matomo-event"
-                                                           data-matomo-category="engagement"
-                                                           data-matomo-action="view"
-                                                           data-matomo-option="upvoted-forum"
+                                                            class="btn-link btn-ico stretched-link matomo-event"
+                                                            data-matomo-category="engagement"
+                                                            data-matomo-action="view"
+                                                            data-matomo-option="upvoted-forum"
                                                         >
                                                             <i class="ri-article-line" aria-hidden="true"></i>
                                                             <span>{{ upvote.content_object.name }}</span>
@@ -50,10 +50,10 @@ <h1>{% trans "My UpVotes" %}</h1>
                                                         </div>
                                                     {% elif upvote.content_type.model == 'post' %}
                                                         <a href="{% url 'forum_conversation:topic' upvote.content_object.topic.forum.slug upvote.content_object.topic.forum.pk upvote.content_object.topic.slug upvote.content_object.topic.pk %}"
-                                                           class="btn-link stretched-link btn-ico matomo-event"
-                                                           data-matomo-category="engagement"
-                                                           data-matomo-action="view"
-                                                           data-matomo-option="upvoted-topic"
+                                                            class="btn-link stretched-link btn-ico matomo-event"
+                                                            data-matomo-category="engagement"
+                                                            data-matomo-action="view"
+                                                            data-matomo-option="upvoted-topic"
                                                         >
                                                             <i class="ri-user-line ri-lg" aria-hidden="true"></i>
                                                             <span>{{ upvote.content_object.topic.subject }}</span>
diff --git a/lacommunaute/templates/pages/contact.html b/lacommunaute/templates/pages/contact.html
index c068b1d95..be5912e28 100644
--- a/lacommunaute/templates/pages/contact.html
+++ b/lacommunaute/templates/pages/contact.html
@@ -10,13 +10,13 @@
                 <div class="s-title-01__col col-12">
                     <h1 class="s-title-01__title h1"><strong>Contact</strong></h1>
                     <iframe data-tally-src="https://tally.so/embed/n0VN1P?alignLeft=1&hideTitle=1&transparentBackground=1&dynamicHeight=1"
-                            loading="lazy"
-                            width="100%"
-                            height="310"
-                            frameborder="0"
-                            marginheight="0"
-                            marginwidth="0"
-                            title="Contact form">
+                        loading="lazy"
+                        width="100%"
+                        height="310"
+                        frameborder="0"
+                        marginheight="0"
+                        marginwidth="0"
+                        title="Contact form">
                     </iframe>
                     <script>var d=document,w="https://tally.so/widgets/embed.js",v=function(){"undefined"!=typeof Tally?Tally.loadEmbeds():d.querySelectorAll("iframe[data-tally-src]:not([src])").forEach((function(e){e.src=e.dataset.tallySrc}))};if("undefined"!=typeof Tally)v();else if(d.querySelector('script[src="'+w+'"]')==null){var s=d.createElement("script");s.src=w,s.onload=v,s.onerror=v,d.body.appendChild(s);}</script>
                 </div>
diff --git a/lacommunaute/templates/pages/home.html b/lacommunaute/templates/pages/home.html
index a39fb831e..6359568c9 100644
--- a/lacommunaute/templates/pages/home.html
+++ b/lacommunaute/templates/pages/home.html
@@ -64,10 +64,10 @@ <h3 class="m-0">
                                 {% for topic in topics_public %}
                                     <li class="mb-3 position-relative">
                                         <a href="{% url 'forum_conversation:topic' topic.forum.slug topic.forum.pk topic.slug topic.pk %}"
-                                           class="matomo-event btn-link stretched-link"
-                                           data-matomo-category="engagement"
-                                           data-matomo-action="view"
-                                           data-matomo-option="topic">
+                                            class="matomo-event btn-link stretched-link"
+                                            data-matomo-category="engagement"
+                                            data-matomo-action="view"
+                                            data-matomo-option="topic">
                                             {{ topic.subject }}
                                         </a>
                                     </li>
@@ -89,10 +89,10 @@ <h3 class="m-0">
                                 {% for forum in forums_category %}
                                     <li class="mb-3 position-relative">
                                         <a href="{% url 'forum_extension:forum' forum.slug forum.pk %}"
-                                           class="matomo-event btn-link stretched-link"
-                                           data-matomo-category="engagement"
-                                           data-matomo-action="view"
-                                           data-matomo-option="forum">
+                                            class="matomo-event btn-link stretched-link"
+                                            data-matomo-category="engagement"
+                                            data-matomo-action="view"
+                                            data-matomo-option="forum">
                                             [{{ forum.parent.name }}] {{ forum.name }}
                                         </a>
                                     </li>
@@ -114,10 +114,10 @@ <h3 class="m-0">
                                 {% for topic in topics_newsfeed %}
                                     <li class="mb-3 position-relative">
                                         <a href="{% url 'forum_conversation:topic' topic.forum.slug topic.forum.pk topic.slug topic.pk %}"
-                                           class="matomo-event btn-link stretched-link"
-                                           data-matomo-category="engagement"
-                                           data-matomo-action="view"
-                                           data-matomo-option="news">
+                                            class="matomo-event btn-link stretched-link"
+                                            data-matomo-category="engagement"
+                                            data-matomo-action="view"
+                                            data-matomo-option="news">
                                             {{ topic.subject }}
                                         </a>
                                     </li>
diff --git a/lacommunaute/templates/partials/ask_a_question.html b/lacommunaute/templates/partials/ask_a_question.html
index 8293e82ec..5f0acfab1 100644
--- a/lacommunaute/templates/partials/ask_a_question.html
+++ b/lacommunaute/templates/partials/ask_a_question.html
@@ -4,11 +4,11 @@
     <div class="row align-items-center">
         <div class="col-12 col-md-auto">
             <a href="{% url 'forum_conversation:topic_create' forum.slug forum.pk %}"
-               rel="nofollow"
-               class="btn btn-primary btn-ico btn-block matomo-event"
-               data-matomo-category="engagement"
-               data-matomo-action="contribute"
-               data-matomo-option="new_topic">
+                rel="nofollow"
+                class="btn btn-primary btn-ico btn-block matomo-event"
+                data-matomo-category="engagement"
+                data-matomo-action="contribute"
+                data-matomo-option="new_topic">
                 <i class="ri-chat-new-line ri-lg"></i>
                 <span>{% trans "New topic" %}</span>
             </a>
@@ -18,10 +18,10 @@
         </div>
         <div class="col-12 col-md-auto">
             <a href="{% url 'forum_search_extension:search' %}"
-               class="btn btn-outline-primary btn-ico btn-block matomo-event"
-               data-matomo-category="engagement"
-               data-matomo-action="search"
-               data-matomo-option="query">
+                class="btn btn-outline-primary btn-ico btn-block matomo-event"
+                data-matomo-category="engagement"
+                data-matomo-action="search"
+                data-matomo-option="query">
                 <i class="ri-search-line ri-lg"></i>
                 <span>{% trans "Search forums" %}</span>
             </a>
diff --git a/lacommunaute/templates/partials/banner.html b/lacommunaute/templates/partials/banner.html
index 56baeeebf..449f81165 100644
--- a/lacommunaute/templates/partials/banner.html
+++ b/lacommunaute/templates/partials/banner.html
@@ -2,11 +2,11 @@
     <p class="mb-0">
         Une difficulté avec le site des emplois ? Une question à propos d'un Pass IAE ? Posez votre question sur la page du
         <a href="https://aide.emplois.inclusion.beta.gouv.fr/hc/fr"
-           class="font-weight-bold matomo-event"
-           data-matomo-category="support"
-           data-matomo-action="site_emplois"
-           data-matomo-option="banner"
-           aria-label="Posez votre question sur la page du support des emplois de l'inclusion (lien externe)">
+            class="font-weight-bold matomo-event"
+            data-matomo-category="support"
+            data-matomo-action="site_emplois"
+            data-matomo-option="banner"
+            aria-label="Posez votre question sur la page du support des emplois de l'inclusion (lien externe)">
             support des emplois de l'inclusion
         </a>
         <i class="ri-external-link-line ml-2 font-weight-bold" aria-hidden="true"></i> !
diff --git a/lacommunaute/templates/partials/footer.html b/lacommunaute/templates/partials/footer.html
index b676228af..f778250d6 100644
--- a/lacommunaute/templates/partials/footer.html
+++ b/lacommunaute/templates/partials/footer.html
@@ -43,23 +43,23 @@
                     <ul>
                         <li>
                             <a href="/glossaire/"
-                               target="_blank"
-                               aria-label="glossaire des mots de l'inclusion"
-                               class="matomo-event"
-                               data-matomo-category="landing"
-                               data-matomo-action="glossaire"
-                               data-matomo-option="footer">
+                                target="_blank"
+                                aria-label="glossaire des mots de l'inclusion"
+                                class="matomo-event"
+                                data-matomo-category="landing"
+                                data-matomo-action="glossaire"
+                                data-matomo-option="footer">
                                 Glossaire de l'inclusion
                             </a>
                         </li>
                         <li>
                             <a href="https://documentation.inclusion.beta.gouv.fr/aide/emplois/"
-                               target="_blank"
-                               aria-label="Posez votre question sur la page du support des emplois de l'inclusion (lien externe)"
-                               class="matomo-event"
-                               data-matomo-category="support"
-                               data-matomo-action="site_emplois"
-                               data-matomo-option="footer">
+                                target="_blank"
+                                aria-label="Posez votre question sur la page du support des emplois de l'inclusion (lien externe)"
+                                class="matomo-event"
+                                data-matomo-category="support"
+                                data-matomo-action="site_emplois"
+                                data-matomo-option="footer">
                                 Support des emplois de l'inclusion
                             </a>
                         </li>
diff --git a/lacommunaute/templates/partials/form_field_mentions.html b/lacommunaute/templates/partials/form_field_mentions.html
index adf6fa695..359d9b0de 100644
--- a/lacommunaute/templates/partials/form_field_mentions.html
+++ b/lacommunaute/templates/partials/form_field_mentions.html
@@ -1,9 +1,9 @@
 <small class="form-text text-muted">
     <a data-toggle="collapse"
-       href="#collapseMentionsHelp"
-       role="button"
-       aria-expanded="false"
-       aria-controls="collapseMentionsHelp">
+        href="#collapseMentionsHelp"
+        role="button"
+        aria-expanded="false"
+        aria-controls="collapseMentionsHelp">
         mention d'informations
     </a>
     sur les champs libres
diff --git a/lacommunaute/templates/partials/header_nav_primary_items.html b/lacommunaute/templates/partials/header_nav_primary_items.html
index 69e0ce9b0..cbba422cc 100644
--- a/lacommunaute/templates/partials/header_nav_primary_items.html
+++ b/lacommunaute/templates/partials/header_nav_primary_items.html
@@ -8,10 +8,10 @@
                 <input class="form-control" type="search" placeholder="{% trans "Search" %}" aria-label="{% trans "Search" %}" name="q">
                 <div class="input-group-append">
                     <button type="submit"
-                            class="btn btn-link btn-ico matomo-event"
-                            data-matomo-category="engagement"
-                            data-matomo-action="search"
-                            data-matomo-option="submit_query_header"
+                        class="btn btn-link btn-ico matomo-event"
+                        data-matomo-category="engagement"
+                        data-matomo-action="search"
+                        data-matomo-option="submit_query_header"
                     >
                         <i class="ri-search-line font-weight-bold" aria-label="{% trans "Search" %}"></i>
                     </button>
@@ -45,37 +45,37 @@
                     </li>
                     <li>
                         <a href="{% url 'members:profile' user.username %}"
-                           class="dropdown-item text-primary matomo-event"
-                           data-matomo-category="engagement"
-                           data-matomo-action="view"
-                           data-matomo-option="member">
+                            class="dropdown-item text-primary matomo-event"
+                            data-matomo-category="engagement"
+                            data-matomo-action="view"
+                            data-matomo-option="member">
                             Accéder à mon profil
                         </a>
                     </li>
                     <li>
                         <a href="{% url 'forum_upvote:mine' %}"
-                           class="dropdown-item text-primary matomo-event"
-                           data-matomo-category="engagement"
-                           data-matomo-action="view"
-                           data-matomo-option="upvotes">
+                            class="dropdown-item text-primary matomo-event"
+                            data-matomo-category="engagement"
+                            data-matomo-action="view"
+                            data-matomo-option="upvotes">
                             Accéder à mes sauvegardes
                         </a>
                     </li>
                     <li>
                         <a href="{% url 'event:myevents' %}"
-                           class="dropdown-item text-primary matomo-event"
-                           data-matomo-category="engagement"
-                           data-matomo-action="view"
-                           data-matomo-option="event">
+                            class="dropdown-item text-primary matomo-event"
+                            data-matomo-category="engagement"
+                            data-matomo-action="view"
+                            data-matomo-option="event">
                             Accéder à mes évènements
                         </a>
                     </li>
                     <li>
                         <a href="{% url 'forum_extension:index' %}"
-                           class="dropdown-item text-primary matomo-event"
-                           data-matomo-category="engagement"
-                           data-matomo-action="view"
-                           data-matomo-option="forums">
+                            class="dropdown-item text-primary matomo-event"
+                            data-matomo-category="engagement"
+                            data-matomo-action="view"
+                            data-matomo-option="forums">
                             Accéder à mes thématiques
                         </a>
                     </li>
diff --git a/lacommunaute/templates/partials/upvotes.html b/lacommunaute/templates/partials/upvotes.html
index 1a9ef81f6..28d6d3978 100644
--- a/lacommunaute/templates/partials/upvotes.html
+++ b/lacommunaute/templates/partials/upvotes.html
@@ -5,16 +5,16 @@
     {% with obj.upvotes_count as counter %}
         {% if user.is_authenticated %}
             <form hx-post="{% if kind == 'post' %}{% url 'forum_upvote:post' %}{% elif kind == 'forum' %}{% url 'forum_upvote:forum' %}{% endif %}"
-                  id="upvote-button{{obj.pk}}"
-                  hx-target="#upvotesarea{{obj.pk}}"
-                  hx-swap="outerHTML">
+                id="upvote-button{{obj.pk}}"
+                hx-target="#upvotesarea{{obj.pk}}"
+                hx-swap="outerHTML">
                 <input type='hidden' name='pk' value="{{obj.pk}}"/>
                 <button type="submit"
-                        title="{% trans "UpVotes" %}"
-                        class="btn btn-sm btn-ico btn-secondary matomo-event px-2"
-                        data-matomo-category="engagement"
-                        data-matomo-action="upvote"
-                        data-matomo-option="post"
+                    title="{% trans "UpVotes" %}"
+                    class="btn btn-sm btn-ico btn-secondary matomo-event px-2"
+                    data-matomo-category="engagement"
+                    data-matomo-action="upvote"
+                    data-matomo-option="post"
                 >
                     <i class="{% if obj.has_upvoted %}ri-bookmark-fill{% else %}ri-bookmark-line{% endif %} mr-1" aria-hidden="true"></i><span>{{counter}}</span>
                 </button>
diff --git a/lacommunaute/templates/surveys/dsp_detail.html b/lacommunaute/templates/surveys/dsp_detail.html
index b4ed7fdcf..063d766a8 100644
--- a/lacommunaute/templates/surveys/dsp_detail.html
+++ b/lacommunaute/templates/surveys/dsp_detail.html
@@ -1,4 +1,4 @@
-{% extends 'board_base.html' %}
+{% extends "layouts/base.html" %}
 {% load i18n %}
 
 {% block title %}Diagnostic Socio Professionnel{{ block.super }}{% endblock %}
@@ -6,22 +6,32 @@
 
 {% block content %}
 
-    <h1>Les recommandations suite à votre diagnostic</h1>
-
-    {% for label, recommendation in object.recommendations.items %}
-        <div class="row mt-3">
-            <div class="col-12">
-                <div class="card post-edit">
-                    <div class="card-header">
-                        <h3 class="m-0 h4 card-title">{{label}}</h3>
-                    </div>
-                    <div class="card-body">
-                        {{ recommendation }}
-                    </div>
+    <section class="s-title-01 mt-lg-5">
+        <div class="s-title-01__container container">
+            <div class="s-title-01__row row">
+                <div class="s-title-01__col col-12">
+                    <h1 class="s-title-01__title h1">Les recommandations suite à votre diagnostic</h1>
                 </div>
             </div>
         </div>
-    {% endfor %}
+    </section>
 
+    <section class="s-section">
+        <div class="s-section__container container">
+            <div class="s-section__row row">
+                <div class="s-section__col col-12 col-lg-8">
+                    {% for label, recommendation in object.recommendations.items %}
+                        <div>
+                            <h2 class="h3">{{label}}</h2>
+                            <div>
+                                {{ recommendation }}
+                            </div>
+                            <hr class="mt-5">
+                        </div>
+                    {% endfor %}
+                </div>
+            </div>
+        </div>
+    </section>
 
 {% endblock content %}
diff --git a/lacommunaute/templates/surveys/dsp_form.html b/lacommunaute/templates/surveys/dsp_form.html
index 153a7268c..3f944d1ef 100644
--- a/lacommunaute/templates/surveys/dsp_form.html
+++ b/lacommunaute/templates/surveys/dsp_form.html
@@ -1,31 +1,58 @@
-{% extends 'board_base.html' %}
+{% extends "layouts/base.html" %}
 {% load i18n %}
 
 {% block title %}Diagnostic Socio Professionnel{{ block.super }}{% endblock %}
-{% block meta_description %}DSP{% endblock meta_description %}"
+{% block meta_description %}DSP{% endblock meta_description %}
 
-{% block content %}
 
-    <h1>Diagnostic socio-professionnel</h1>
+{% block content %}
 
-    <form method="post">
-        {% csrf_token %}
+    <section class="s-title-01 mt-lg-5">
+        <div class="s-title-01__container container">
+            <div class="s-title-01__row row">
+                <div class="s-title-01__col col-12">
+                    <h1 class="s-title-01__title h1">Diagnostic socio-professionnel</h1>
+                </div>
+            </div>
+        </div>
+    </section>
 
-        {% for field in form %}
-            <div class="row mt-3">
-                <div class="col-12">
-                    <div class="card post-edit">
-                        <div class="card-header">
-                            <h3 class="m-0 h4 card-title">{{ field.label_tag }}</h3>
-                        </div>
-                        <div class="card-body">
-                            {{ field }}
-                        </div>
+    <section class="s-section">
+        <div class="s-section__container container">
+            <div class="s-section__row row">
+                <div class="s-section__col col-12">
+                    <div class="c-form">
+                        <form method="post">
+                            {% csrf_token %}
+                            {% for field in form %}
+                                <fieldset>
+                                    <div class="row">
+                                        <div class="col-12 col-lg-8">
+                                            <legend>{{ field.label_tag }}</legend>
+                                            <div class="form-group form-group-required">{{ field }}</div>
+                                        </div>
+                                    </div>
+                                </fieldset>
+                                <div class="row">
+                                    <div class="col-12 col-lg-7">
+                                        <hr />
+                                    </div>
+                                </div>
+                            {% endfor %}
+                            <div class="row">
+                                <div class="col-12 col-lg-7">
+                                    <div class="form-row justify-content-end">
+                                        <div class="form-group col-12 col-lg-auto">
+                                            <button type="submit" class="btn btn-block btn-primary">Valider</button>
+                                        </div>
+                                    </div>
+                                </div>
+                            </div>
+                        </form>
                     </div>
                 </div>
             </div>
-        {% endfor %}
-        <input type="submit" class="btn btn-sm btn-secondary mt-3" value="Valider">
-    </form>
+        </div>
+    </section>
 
 {% endblock content %}