From f3688678331681188020f01d671bf4418b78a147 Mon Sep 17 00:00:00 2001
From: Anto59290 <antonin59290@hotmail.com>
Date: Fri, 28 Feb 2025 14:37:52 +0100
Subject: [PATCH] =?UTF-8?q?Am=C3=A9liorer=20l'affichage=20des=20labels=20p?=
 =?UTF-8?q?our=20les=20messages?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- Corrige l'espacement du raccourci dans le cas des demandes
  d'intervention
- Replace l'astérisque au bon endroit en contournant la règle CSS et en
  l'ajoutant de la label
- Retirer les précisions sur les suffix label car déjà défini dans le DSFRForm
---
 core/forms.py                | 16 ++++++----------
 core/static/core/message.css |  6 ++++--
 2 files changed, 10 insertions(+), 12 deletions(-)

diff --git a/core/forms.py b/core/forms.py
index 1617e5cb..58f9b0e1 100644
--- a/core/forms.py
+++ b/core/forms.py
@@ -150,17 +150,13 @@ def __init__(self, *args, **kwargs):
 
 
 class MessageForm(DSFRForm, WithNextUrlMixin, WithContentTypeMixin, forms.ModelForm):
-    recipients = ContactModelMultipleChoiceField(
-        queryset=Contact.objects.none(), label_suffix="", label="Destinataires :"
-    )
+    recipients = ContactModelMultipleChoiceField(queryset=Contact.objects.none(), label="Destinataires*")
     recipients_structures_only = ContactModelMultipleChoiceField(
-        queryset=Contact.objects.none(), label_suffix="", label="Destinataires :"
-    )
-    recipients_copy = ContactModelMultipleChoiceField(
-        queryset=Contact.objects.none(), required=False, label="Copie :", label_suffix=""
+        queryset=Contact.objects.none(), label="Destinataires*"
     )
+    recipients_copy = ContactModelMultipleChoiceField(queryset=Contact.objects.none(), required=False, label="Copie")
     recipients_copy_structures_only = ContactModelMultipleChoiceField(
-        queryset=Contact.objects.none(), required=False, label="Copie :", label_suffix=""
+        queryset=Contact.objects.none(), required=False, label="Copie"
     )
     recipients_limited_recipients = forms.MultipleChoiceField(
         choices=[("mus", "MUS"), ("bsv", "BSV")],
@@ -214,13 +210,13 @@ def _get_structures(self, obj):
     def _get_recipients_label(self, obj):
         structure_ids = ",".join([str(c.id) for c in self._get_structures(obj)])
         return mark_safe(
-            f"Destinataires :<a href='#' class='fr-link destinataires-shortcut' data-structures='{structure_ids}'>Ajouter toutes les structures de la fiche</a>"
+            f"Destinataires*<a href='#' class='fr-link destinataires-shortcut' data-structures='{structure_ids}'>Ajouter toutes les structures de la fiche</a>"
         )
 
     def _get_recipients_copy_label(self, obj):
         structure_ids = ",".join([str(c.id) for c in self._get_structures(obj)])
         return mark_safe(
-            f"Copie :<a href='#' class='fr-link copie-shortcut' data-structures='{structure_ids}'>Ajouter toutes les structures de la fiche</a>"
+            f"Copie <a href='#' class='fr-link copie-shortcut' data-structures='{structure_ids}'>Ajouter toutes les structures de la fiche</a>"
         )
 
     def __init__(self, *args, sender, **kwargs):
diff --git a/core/static/core/message.css b/core/static/core/message.css
index 1775a162..b3c555dd 100644
--- a/core/static/core/message.css
+++ b/core/static/core/message.css
@@ -6,7 +6,9 @@
     align-items: center;
     justify-content: space-between
 }
-
+label[for=id_recipients]::after, label[for=id_recipients_structures_only]::after{
+    content: none !important;
+}
 .btn-full{
     width: 100%;
     display: block;
@@ -30,7 +32,7 @@
     display: flex;
     justify-content: end;
 }
-label[for=id_recipients], label[for=id_recipients_copy]
+label[for=id_recipients], label[for=id_recipients_copy], label[for=id_recipients_structures_only], label[for=id_recipients_copy_structures_only]
 {
     display: flex;
     justify-content: space-between;