From e212d3c5a0b467fda0feb8a49b2c2f5863a3faf1 Mon Sep 17 00:00:00 2001 From: Raphael Odini Date: Fri, 29 Sep 2023 09:53:09 +0200 Subject: [PATCH 1/2] Siae detail: show map in card when inbound deactivated --- lemarche/templates/siaes/_card_detail.html | 6 +- lemarche/templates/siaes/_detail_cta.html | 16 ++- .../templates/siaes/_useful_infos_siae.html | 98 +++++++++++++------ .../siaes/_useful_infos_siae_v2.html | 87 ---------------- 4 files changed, 73 insertions(+), 134 deletions(-) delete mode 100644 lemarche/templates/siaes/_useful_infos_siae_v2.html diff --git a/lemarche/templates/siaes/_card_detail.html b/lemarche/templates/siaes/_card_detail.html index 8bef8078d..8a3a02c81 100644 --- a/lemarche/templates/siaes/_card_detail.html +++ b/lemarche/templates/siaes/_card_detail.html @@ -71,10 +71,6 @@

- {% 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/_useful_infos_siae.html" with siae=siae %}
diff --git a/lemarche/templates/siaes/_detail_cta.html b/lemarche/templates/siaes/_detail_cta.html index ca563096b..386d4284d 100644 --- a/lemarche/templates/siaes/_detail_cta.html +++ b/lemarche/templates/siaes/_detail_cta.html @@ -16,12 +16,6 @@

Ce prestataire vous intéresse ?

{% else %} diff --git a/lemarche/templates/siaes/_useful_infos_siae.html b/lemarche/templates/siaes/_useful_infos_siae.html index 202aa6be8..9784d48b1 100644 --- a/lemarche/templates/siaes/_useful_infos_siae.html +++ b/lemarche/templates/siaes/_useful_infos_siae.html @@ -1,55 +1,89 @@ {% load array_choices_display %} +
+
-
-
+
    +
  • Année de création : {{ siae.year_constitution_display }} -
-
-
-
+ +
  • SIRET : {{ siae.siret_display }} -
    • -
    -
    -
    + +
  • Chiffre d'affaires : {{ siae.ca_display }} -
    • -
    -
    -
    - {% include "siaes/_annuaire_entreprises_button.html" with siret=siae.siret %} -
    -
    -
    -
    -
    -
    + +
  • {% if siae.presta_type %} - - {% array_choices_display siae 'presta_type' %} + + {% array_choices_display siae 'presta_type' %} {% endif %} -
    • -
    -
    -
    + +
  • Salariés permanents : {{ siae.employees_permanent_count|default:"non disponible" }} -
    • -
    -
    -
    + +
  • {{ siae.etp_count_label_display }} : {{ siae.etp_count_display|floatformat:0|default:"non disponible" }} -
    • + + {% if inbound_email_is_activated %} + {% if siae.contact_website %} +
  • + + Site internet +
    • + {% endif %} + {% if siae.contact_social_website %} +
  • + + Réseau social +
    • + {% endif %} + {% if siae.is_missing_contact %} +
  • + + Google +
    • + {% endif %} + {% endif %} +
  • + {% include "siaes/_annuaire_entreprises_button.html" with siret=siae.siret %} +
    • + +
    + + +
    +
    +
    +
    +
    +
      +
    • + + Situé à : + {{ siae.city }} +
      • +
    • + + Adresse : + {{ siae.address }} {{ siae.post_code }} {{ siae.city }} +
      • +
    • + + Intervient sur : + {{ siae.geo_range_pretty_display }} +
      • +
    diff --git a/lemarche/templates/siaes/_useful_infos_siae_v2.html b/lemarche/templates/siaes/_useful_infos_siae_v2.html deleted file mode 100644 index 7dc66989e..000000000 --- a/lemarche/templates/siaes/_useful_infos_siae_v2.html +++ /dev/null @@ -1,87 +0,0 @@ -{% load array_choices_display %} - -
    - -
    -
      -
    • - - Année de création : - {{ siae.year_constitution_display }} -
      • -
    • - - SIRET : - {{ siae.siret_display }} -
      • -
    • - - Chiffre d'affaires : - {{ siae.ca_display }} -
      • -
    • - {% if siae.presta_type %} - - {% array_choices_display siae 'presta_type' %} - {% endif %} -
      • -
    • - - Salariés permanents : - {{ siae.employees_permanent_count|default:"non disponible" }} -
      • -
    • - - {{ 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 %} -
      • -
    -
    - - -
    -
    -
    -
    -
    -
      -
    • - - Situé à : - {{ siae.city }} -
      • -
    • - - Adresse : - {{ siae.address }} {{ siae.post_code }} {{ siae.city }} -
      • -
    • - - Intervient sur : - {{ siae.geo_range_pretty_display }} -
      • -
    -
    -
    -
    From 2b5fc71a2c49c77a5dc1d0e63536240e2c748291 Mon Sep 17 00:00:00 2001 From: Raphael Odini Date: Fri, 29 Sep 2023 10:06:24 +0200 Subject: [PATCH 2/2] Simplify css --- .../static/itou_marche/sections/_siae.scss | 9 ----- .../templates/siaes/_useful_infos_siae.html | 38 +++++++++---------- 2 files changed, 18 insertions(+), 29 deletions(-) diff --git a/lemarche/static/itou_marche/sections/_siae.scss b/lemarche/static/itou_marche/sections/_siae.scss index 2df27f0ac..9c17fbd10 100644 --- a/lemarche/static/itou_marche/sections/_siae.scss +++ b/lemarche/static/itou_marche/sections/_siae.scss @@ -124,15 +124,6 @@ z-index: 1; } - .map_details { - background-color: #fff; - border-radius: 0 4px 4px 0; - - .prof_icon { - min-width: 30px - } - } - #content { display: grid; grid-column-gap: 16px; diff --git a/lemarche/templates/siaes/_useful_infos_siae.html b/lemarche/templates/siaes/_useful_infos_siae.html index 9784d48b1..f3b6f8a58 100644 --- a/lemarche/templates/siaes/_useful_infos_siae.html +++ b/lemarche/templates/siaes/_useful_infos_siae.html @@ -63,27 +63,25 @@
    -
    +
    -
    -
      -
    • - - Situé à : - {{ siae.city }} -
      • -
    • - - Adresse : - {{ siae.address }} {{ siae.post_code }} {{ siae.city }} -
      • -
    • - - Intervient sur : - {{ siae.geo_range_pretty_display }} -
      • -
    -
    +
      +
    • + + Situé à : + {{ siae.city }} +
      • +
    • + + Adresse : + {{ siae.address }} {{ siae.post_code }} {{ siae.city }} +
      • +
    • + + Intervient sur : + {{ siae.geo_range_pretty_display }} +
      • +