From 1c63a8f97d8cd3ffb12030f5a59ffae89353d660 Mon Sep 17 00:00:00 2001
From: Raphael Odini <raphodn@users.noreply.github.com>
Date: Tue, 19 Sep 2023 15:52:10 +0200
Subject: [PATCH] Move map to detail info card

---
 .../siaes/_useful_infos_siae_v2.html          | 89 ++++++++++++-------
 lemarche/templates/siaes/detail.html          | 18 +---
 2 files changed, 57 insertions(+), 50 deletions(-)

diff --git a/lemarche/templates/siaes/_useful_infos_siae_v2.html b/lemarche/templates/siaes/_useful_infos_siae_v2.html
index 736b08d22..f39589542 100644
--- a/lemarche/templates/siaes/_useful_infos_siae_v2.html
+++ b/lemarche/templates/siaes/_useful_infos_siae_v2.html
@@ -1,6 +1,7 @@
 {% load array_choices_display %}
 
 <div class="row">
+    <!-- First column -->
     <div class="col-12 col-md-6">
         <ul class="list-unstyled mb-0">
             <li class="mb-2">
@@ -34,55 +35,77 @@
                 <strong>{{ siae.etp_count_label_display }} :</strong>
                 <span>{{ siae.etp_count_display|floatformat:0|default:"non disponible" }}</span>
             </li>
+            {% if siae.contact_website %}
+                <li class="mb-2">
+                    <i class="ri-window-2-line"></i>
+                    <a href="{{ siae.contact_website }}" id="company_website" target="_blank" rel="noopener">Site internet</a>
+                </li>
+            {% endif %}
+            {% if siae.contact_social_website %}
+                <li class="mb-2">
+                    <i class="ri-earth-line"></i>
+                    <a href="{{ siae.contact_social_website }}" id="company_social_website" target="_blank" rel="noopener">Réseau social</a>
+                </li>
+            {% endif %}
+            {% if siae.is_missing_contact %}
+                <li class="mb-2">
+                    <i class="ri-search-line"></i>
+                    <a href="https://www.google.fr/search?q={{ siae.name_display }}" id="company_google" target="_blank" rel="noopener">Google</a>
+                </li>
+            {% endif %}
             <li class="mb-2">
                 {% include "siaes/_annuaire_entreprises_button.html" with siret=siae.siret %}
             </li>
         </ul>
     </div>
+
+    <!-- Second column -->
     <div class="col-12 col-md-6">
         <ul class="list-unstyled mb-0">
-            {% if siae.is_missing_contact %}
-                <li class="mb-2">
-                    <i class="ri-search-line"></i>
-                    <a href="https://www.google.fr/search?q={{ siae.name_display }}" id="company_google" target="_blank" rel="noopener">Google</a>
-                </li>
-            {% endif %}
-            {% if siae.user_count %}
-                {% if siae.contact_short_name %}
+            {% if is_admin %}
+                {% if siae.user_count %}
+                    {% if siae.contact_short_name %}
+                        <li class="mb-2">
+                            <i class="ri-user-line"></i>
+                            <span>{{ siae.contact_short_name }}</span>
+                        </li>
+                    {% endif %}
+                {% endif %}
+                {% if siae.contact_email %}
                     <li class="mb-2">
-                        <i class="ri-user-line"></i>
-                        <span>{{ siae.contact_short_name }}</span>
+                        <i class="ri-at-line"></i>
+                        <a href="mailto:{{ siae.contact_email }}" id="company_email">{{ siae.contact_email }}</a>
+                    </li>
+                {% endif %}
+                {% if siae.contact_phone %}
+                    <li class="mb-2">
+                        <i class="ri-phone-line"></i>
+                        <a href="tel:{{ siae.contact_phone }}" id="company_phone">{{ siae.contact_phone }}</a>
                     </li>
                 {% endif %}
             {% endif %}
-            {% comment %} {% if siae.contact_email %}
+        </ul>
+        <div class="map-holder mb-3">
+            <div id="map-siae" class="map-canvas"></div>
+        </div>
+        <div class="map_details">
+            <ul class="list-unstyled m-0 fs-sm">
                 <li class="mb-2">
-                    <i class="ri-at-line"></i>
-                    <a href="mailto:{{ siae.contact_email }}" id="company_email">{{ siae.contact_email }}</a>
+                    <i class="ri-map-2-line"></i>
+                    <strong>Situé à :</strong>
+                    <span>{{ siae.city }}</span>
                 </li>
-            {% endif %} {% endcomment %}
-            {% if is_admin and siae.contact_phone %}
                 <li class="mb-2">
-                    <i class="ri-phone-line"></i>
-                    <a href="tel:{{ siae.contact_phone }}" id="company_phone">{{ siae.contact_phone }}</a>
+                    <i class="ri-map-pin-line"></i>
+                    <strong>Adresse :</strong>
+                    <span>{{ siae.address }} {{ siae.post_code }} {{ siae.city }}</span>
                 </li>
-            {% endif %}
-            {% if siae.contact_website %}
                 <li class="mb-2">
-                    <i class="ri-window-2-line"></i>
-                    <a href="{{ siae.contact_website }}" id="company_website" target="_blank" rel="noopener">Site internet</a>
-                </li>
-            {% endif %}
-            {% if siae.contact_social_website %}
-                <li class="mb-2">
-                    <i class="ri-earth-line"></i>
-                    <a href="{{ siae.contact_social_website }}" id="company_social_website" target="_blank" rel="noopener">Réseau social</a>
+                    <i class="ri-focus-2-line"></i>
+                    <strong>Intervient sur :</strong>
+                    <span>{{ siae.geo_range_pretty_display }}</span>
                 </li>
-            {% endif %}
-            <li>
-                <i class="ri-map-pin-line"></i>
-                <span>{{ siae.address }} {{ siae.post_code }} {{ siae.city }}</span>
-            </li>
-        </ul>
+            </ul>
+        </div>
     </div>
 </div>
diff --git a/lemarche/templates/siaes/detail.html b/lemarche/templates/siaes/detail.html
index 36f0f0b54..1b330b456 100644
--- a/lemarche/templates/siaes/detail.html
+++ b/lemarche/templates/siaes/detail.html
@@ -1,5 +1,5 @@
 {% extends "layouts/base.html" %}
-{% load static array_choices_display siae_sectors_display %}
+{% load static siae_sectors_display %}
 {% load theme_inclusion %}
 
 {% block title %}{{ siae.name_display }} est sur le marché de l'inclusion{% endblock %}
@@ -46,22 +46,6 @@
                             {% else %}
                                 {% include "siaes/_detail_cta.html" with siae=siae %}
                             {% endif %}
-                            <br />
-                            <div class="map-holder mb-3">
-                                <div id="map-siae" class="map-canvas"></div>
-                            </div>
-                            <div class="map_details">
-                                <ul class="list-unstyled m-0 fs-sm">
-                                    <li class="mb-1">
-                                        <i class="ri-map-pin-line"></i>
-                                        <span>Situé à {{ siae.city }}</span>
-                                    </li>
-                                    <li>
-                                        <i class="ri-map-2-line"></i>
-                                        <span>Intervient sur : {{ siae.geo_range_pretty_display }}</span>
-                                    </li>
-                                </ul>
-                            </div>
                         </div>
                         <hr class="mt-5 d-block d-lg-none">
                     </div>