avoid link and contact name overlap

gip-inclusion · Feb 5, 2025 · 2a9321f · 2a9321f
1 parent 6392e03
commit 2a9321f
Showing 1 changed file with 28 additions and 30 deletions.
diff --git a/lemarche/templates/tenders/_detail_contact.html b/lemarche/templates/tenders/_detail_contact.html
@@ -1,13 +1,11 @@
-
 <h2>
     {% if user == tender.author %}
         Coordonnées
     {% else %}
         Contactez le client dès maintenant
     {% endif %}
 </h2>
-
-<div class="fr-grid-row fr-grid-row--gutters">
+<div class="fr-grid-row fr-grid-row--gutters fr-mb-1w">
     {% if tender.contact_full_name %}
         <div class="fr-col-md-6">
             <span class="fr-icon-account-circle-line"></span>
@@ -21,30 +19,31 @@ <h2>
         </div>
     {% endif %}
 </div>
-<div class="fr-grid-row fr-grid-row--gutters">
-    {% if tender.can_display_contact_email %}
-        <div class="fr-col-md-6">
-            <span class="fr-icon-mail-line"></span>
-            {{ tender.contact_email }}
-        </div>
-    {% endif %}
-    {% if tender.can_display_contact_phone %}
-        <div class="fr-col-md-6">
-            <span class="fr-icon-phone-line"></span>
-            {{ tender.contact_phone }}
-        </div>
-    {% endif %}
-    {% if source == "alert" and not tender.response_kind_is_only_external %}
-        <div class="fr-col-md-12">
-            <span class="fr-icon-mail-line"></span>
-            {{ TEAM_CONTACT_EMAIL }}
-        </div>
-    {% endif %}
-</div>
-
+{% if tender.can_display_contact_email or tender.can_display_contact_phone or source == "alert" and not tender.response_kind_is_only_external %}
+    <div class="fr-grid-row fr-grid-row--gutters fr-mb-1w">
+        {% if tender.can_display_contact_email %}
+            <div class="fr-col-md-6">
+                <span class="fr-icon-mail-line"></span>
+                {{ tender.contact_email }}
+            </div>
+        {% endif %}
+        {% if tender.can_display_contact_phone %}
+            <div class="fr-col-md-6">
+                <span class="fr-icon-phone-line"></span>
+                {{ tender.contact_phone }}
+            </div>
+        {% endif %}
+        {% if source == "alert" and not tender.response_kind_is_only_external %}
+            <div class="fr-col-md-12">
+                <span class="fr-icon-mail-line"></span>
+                {{ TEAM_CONTACT_EMAIL }}
+            </div>
+        {% endif %}
+    </div>
+{% endif %}
 {% if tender.can_display_contact_external_link %}
-    <div class="fr-grid-row">
-        <div class="fr-col-12">
+    <div class="fr-grid-row fr-grid-row--gutters">
+        <div class="fr-col-md-12">
             {% if tender.is_partner_approch %}
                 <p>
                     <span class="fr-icon-lightbulb-line" aria-hidden="true"></span>Ce projet d'achat a été publié sur la plateforme <strong>APProch</strong>.
@@ -53,10 +52,9 @@ <h2>
                     ou pour indiquer votre intérêt auprès de l'acheteur public, cliquez sur le lien ci-dessous.
                 </p>
             {% endif %}
-            <a href="{{ tender.external_link }}" target="_blank" class="btn btn-outline-primary float-right">
-                {{ tender.external_link_title|safe }}
-                <span class="fr-icon-external-link-line" aria-hidden="true"></span>
-            </a>
+            <a href="{{ tender.external_link }}"
+               target="_blank"
+               class="btn btn-outline-primary float-right">{{ tender.external_link_title|safe }}</a>
         </div>
     </div>
 {% endif %}