From 78bb1d9235a4427d6f0fcfd6e2ff5920fbf26efc Mon Sep 17 00:00:00 2001 From: Raphael Odini Date: Wed, 20 Sep 2023 17:18:30 +0200 Subject: [PATCH] =?UTF-8?q?[Fiche=20structure]=20Int=C3=A9grer=20la=20cart?= =?UTF-8?q?e=20et=20les=20informations=20g=C3=A9o=20(#915)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * Siae detail: move info into new card template * Move map to detail info card * Homogenize font size and alignement --- lemarche/templates/siaes/_card_detail.html | 80 +++++++++++++++ .../siaes/_useful_infos_siae_v2.html | 89 ++++++++++------- lemarche/templates/siaes/detail.html | 97 +------------------ 3 files changed, 138 insertions(+), 128 deletions(-) create mode 100644 lemarche/templates/siaes/_card_detail.html diff --git a/lemarche/templates/siaes/_card_detail.html b/lemarche/templates/siaes/_card_detail.html new file mode 100644 index 000000000..01048e647 --- /dev/null +++ b/lemarche/templates/siaes/_card_detail.html @@ -0,0 +1,80 @@ +{% load static %} + +
+
+
+
+ {% if siae.logo_url %} + Logo de la structure {{ siae.name }} + {% else %} + {{ siae.name }} + {% endif %} +
+
+
+
+

+ {{ siae.name_display }} +
+ (profil mis à jour il y a {{ siae.updated_at|timesince }}) +

+ {% if user.is_authenticated %} + {% if siae.in_user_favorite_list_count %} + + + + {% else %} + + + + {% endif %} + {% else %} + + + + {% endif %} +
+
+
+
+
    +
  • + + {{ siae.get_kind_display }} +
    • + {% if siae.legal_form %} +
  • + + {{ siae.get_legal_form_display }} +
    • + {% endif %} +
+
+
+
+ {% if siae.is_qpv %} + QPV + {% endif %} + {% if siae.is_zrr %} + ZRR + {% endif %} + {% for group in siae.groups.all %} + {{ group.name }} + {% endfor %} + {% if siae.is_cocontracting %} + Ouvert à la co-traitance + {% endif %} +
+
+
+
+
+
+
+ {% if inbound_email_is_activated %} + {% include "siaes/_useful_infos_siae_v2.html" with siae=siae %} + {% else %} + {% include "siaes/_useful_infos_siae.html" with siae=siae %} + {% endif %} +
+
diff --git a/lemarche/templates/siaes/_useful_infos_siae_v2.html b/lemarche/templates/siaes/_useful_infos_siae_v2.html index 736b08d22..8f23e3ed1 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 %}
+
  • @@ -34,55 +35,77 @@ {{ siae.etp_count_label_display }} : {{ siae.etp_count_display|floatformat:0|default:"non disponible" }}
    • + {% if siae.contact_website %} +
  • + + Site internet +
    • + {% endif %} + {% if siae.contact_social_website %} +
  • + + Réseau social +
    • + {% endif %} + {% if siae.is_missing_contact %} +
  • + + Google +
    • + {% endif %}
  • {% include "siaes/_annuaire_entreprises_button.html" with siret=siae.siret %}
+ +
    - {% if siae.is_missing_contact %} -
  • - - Google -
    • - {% endif %} - {% if siae.user_count %} - {% if siae.contact_short_name %} + {% if is_admin %} + {% if siae.user_count %} + {% if siae.contact_short_name %} +
  • + + {{ siae.contact_short_name }} +
    • + {% endif %} + {% endif %} + {% if siae.contact_email %}
  • - - {{ siae.contact_short_name }} + + {{ siae.contact_email }} +
    • + {% endif %} + {% if siae.contact_phone %} +
  • + + {{ siae.contact_phone }}
    • {% endif %} {% endif %} - {% comment %} {% if siae.contact_email %} +
+
+
+
+
+
  • - - {{ siae.contact_email }} + + Situé à : + {{ siae.city }}
    • - {% endif %} {% endcomment %} - {% if is_admin and siae.contact_phone %}
  • - - {{ siae.contact_phone }} + + Adresse : + {{ siae.address }} {{ siae.post_code }} {{ siae.city }}
    • - {% endif %} - {% if siae.contact_website %}
  • - - Site internet -
    • - {% endif %} - {% if siae.contact_social_website %} -
  • - - Réseau social + + Intervient sur : + {{ siae.geo_range_pretty_display }}
    • - {% endif %} -
  • - - {{ siae.address }} {{ siae.post_code }} {{ siae.city }} -
    • -
+ +
diff --git a/lemarche/templates/siaes/detail.html b/lemarche/templates/siaes/detail.html index 1b7337b8f..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 %} @@ -35,84 +35,7 @@
-
-
-
-
- {% if siae.logo_url %} - Logo de {{ siae.name }} - {% else %} - {{ siae.name }} - {% endif %} -
-
-
-
-

- {{ siae.name_display }} -
- (profil mis à jour il y a {{ siae.updated_at|timesince }}) -

- {% if user.is_authenticated %} - {% if siae.in_user_favorite_list_count %} - - - - {% else %} - - - - {% endif %} - {% else %} - - - - {% endif %} -
-
-
-
-
-
-
    -
  • - - {{ siae.get_kind_display }} -
    • - {% if siae.legal_form %} -
  • - - {{ siae.get_legal_form_display }} -
    • - {% endif %} -
-
-
-
- {% if siae.is_qpv %} - QPV - {% endif %} - {% if siae.is_zrr %} - ZRR - {% endif %} - {% for group in siae.groups.all %} - {{ group.name }} - {% endfor %} - {% if siae.is_cocontracting %} - Ouvert à la co-traitance - {% endif %} -
-
-
- -
- {% if inbound_email_is_activated %} - {% include "siaes/_useful_infos_siae_v2.html" with siae=siae %} - {% else %} - {% include "siaes/_useful_infos_siae.html" with siae=siae %} - {% endif %} -
-
+ {% include "siaes/_card_detail.html" with siae=siae %}