From 79134bc9389809904a4cae2020d20e49fd1610dd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=A9bastien=20Reuiller?= Date: Wed, 25 Sep 2024 10:44:46 +0200 Subject: [PATCH 1/5] also set Hx white text in dark --- lemarche/static/itou_marche/itou_marche.scss | 20 +++++++++++++++++--- 1 file changed, 17 insertions(+), 3 deletions(-) diff --git a/lemarche/static/itou_marche/itou_marche.scss b/lemarche/static/itou_marche/itou_marche.scss index 83f1e93ed..5df098940 100644 --- a/lemarche/static/itou_marche/itou_marche.scss +++ b/lemarche/static/itou_marche/itou_marche.scss @@ -18,12 +18,15 @@ $yellow-super-badge--borders-color: #fcc63a; position: relative; flex-direction: column; } + .fr-input { width: 100%; } + .fr-btn { margin-left: 8px; } + .fr-checkbox-list { position: relative; top: 100%; @@ -36,14 +39,17 @@ $yellow-super-badge--borders-color: #fcc63a; padding: 8px; display: none; } + .fr-checkbox-list.show { display: block; } + .fr-tags-group { display: flex; flex-wrap: wrap; margin-top: 8px; } + .fr-tag { margin: 4px; background-color: #e5e5e5; @@ -52,6 +58,7 @@ $yellow-super-badge--borders-color: #fcc63a; display: flex; align-items: center; } + .fr-tag .fr-tag__close { margin-left: 8px; cursor: pointer; @@ -144,7 +151,14 @@ ul.summary-grid-list { } .cmsfr-background-dark { - & h1, p { + + & h1, + h2, + h3, + h4, + h5, + h6, + p { color: white; } } @@ -166,5 +180,5 @@ ul.summary-grid-list { } .fr-content-media { - margin: 0; -} + margin: 0; +} \ No newline at end of file From 59dc64b6f68988407d7b96f5ae9989a30f0da62e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=A9bastien=20Reuiller?= Date: Wed, 25 Sep 2024 11:20:40 +0200 Subject: [PATCH 2/5] add missing bottom margin --- lemarche/templates/dashboard/home_buyer.html | 143 +++++------- lemarche/templates/dashboard/home_siae.html | 221 +++++++++--------- .../favorites/dashboard_favorite_list.html | 113 ++++----- 3 files changed, 236 insertions(+), 241 deletions(-) diff --git a/lemarche/templates/dashboard/home_buyer.html b/lemarche/templates/dashboard/home_buyer.html index b506bdc8f..9b1658124 100644 --- a/lemarche/templates/dashboard/home_buyer.html +++ b/lemarche/templates/dashboard/home_buyer.html @@ -1,101 +1,86 @@ {% extends "layouts/base.html" %} {% load static get_verbose_name process_dict dsfr_tags %} - -{% block page_title %}{{ DASHBOARD_TITLE }}{{ block.super }}{% endblock page_title %} - +{% block page_title %} + {{ DASHBOARD_TITLE }}{{ block.super }} +{% endblock page_title %} {% block breadcrumb %} {% process_dict root_dir=HOME_PAGE_PATH current=DASHBOARD_TITLE as breadcrumb_data %} {% dsfr_breadcrumb breadcrumb_data %} {% endblock breadcrumb %} - {% block content %} -
-
-
-

{{ DASHBOARD_TITLE }}

+
+
+
+

{{ DASHBOARD_TITLE }}

+
-
- -
-
-
- {% if user.tenders.count %} -
-
-
-

- Mes besoins -

-
-

- - Publier un besoin d'achat - -

- {% for tender in last_3_tenders %} -
-
- {% include "tenders/_card_list_item.html" with tender=tender %} +
+
+
+ {% if user.tenders.count %} +
+
+
+

Mes besoins

+
+

+ + Publier un besoin d'achat + +

+ {% for tender in last_3_tenders %} +
+
{% include "tenders/_card_list_item.html" with tender=tender %}
-
- {% endfor %} + {% endfor %} +
+
+
+
-
-
-
+ {% else %} + {% include "dashboard/_add_tender_card.html" %} + {% endif %} +
+
+
+
+ {% include "dashboard/_stats_card.html" with user_buyer_count=user_buyer_count siae_count=siae_count tender_count=tender_count %} +
+ {% if not user.partner_network %} +
{% include "dashboard/_impact_calculator_card.html" %}
+ {% else %} +
{% include "dashboard/_network_card.html" with network=user.partner_network %}
+ {% endif %}
- {% else %} - {% include "dashboard/_add_tender_card.html" %} - {% endif %} -
-
-
-
- {% include "dashboard/_stats_card.html" with user_buyer_count=user_buyer_count siae_count=siae_count tender_count=tender_count %} -
- {% if not user.partner_network %} -
- {% include "dashboard/_impact_calculator_card.html" %} -
- {% else %} -
- {% include "dashboard/_network_card.html" with network=user.partner_network %} -
- {% endif %}
-
-
-
-
-
- {% include "dashboard/_facilitator_list_card.html" %} -
-
- {% include "dashboard/_valoriser_achats_card.html" %} +
+
+
+
{% include "dashboard/_facilitator_list_card.html" %}
+
{% include "dashboard/_valoriser_achats_card.html" %}
+
+ {% include "dashboard/_ressource_card.html" with user_kind="BUYER" ressources=last_3_ressources category_slug=category_slug_cat %} +
-
- {% include "dashboard/_ressource_card.html" with user_kind="BUYER" ressources=last_3_ressources category_slug=category_slug_cat %} -
-
-
-
- {% include "dashboard/_favorites_card.html" %} -
-
- {% include "dashboard/_api_key_card.html" with api_key=user.api_key user_kind="BUYER" %} +
+
{% include "dashboard/_favorites_card.html" %}
+
+ {% include "dashboard/_api_key_card.html" with api_key=user.api_key user_kind="BUYER" %} +
-
{% endblock content %} diff --git a/lemarche/templates/dashboard/home_siae.html b/lemarche/templates/dashboard/home_siae.html index 92f3f677f..8e178208c 100644 --- a/lemarche/templates/dashboard/home_siae.html +++ b/lemarche/templates/dashboard/home_siae.html @@ -1,137 +1,144 @@ {% extends "layouts/base.html" %} {% load dsfr_tags static get_verbose_name process_dict %} - -{% block page_title %}{{ page_title }}{{ block.super }}{% endblock page_title %} - +{% block page_title %} + {{ page_title }}{{ block.super }} +{% endblock page_title %} {% block breadcrumb %} {% process_dict root_dir=HOME_PAGE_PATH current=page_title as breadcrumb_data %} {% dsfr_breadcrumb breadcrumb_data %} {% endblock breadcrumb %} - {% block content %} -
-
-
-
-

{{ page_title }}

-
-
-
-
- -{% if user.siaeuser_set.count %} -
-
-
-
-
-
    - {% for siaeuser in user.siaeuser_set.all %} -
  • - -
    • - {% endfor %} -
  • - - - Ajouter une structure - -
    • -
- {% for siaeuser in user.siaeuser_set.all %} -
- {% include "dashboard/_siae_tab_content.html" with siae=siaeuser.siae %} -
- {% endfor %} -
-
-
-
-
-{% else %}
-
- {% include "dashboard/_add_siae_card.html" %} +
+

{{ page_title }}

-{% endif %} - -
-
-
-
-
-
-
-

- Vos opportunités commerciales -

-
-

- Vous trouverez ici les demandes de devis, appels d'offre ou projets d'achat qui ont été déposés sur le Marché de l'inclusion - et qui correspondent à vos secteurs d'activité et zone d'intervention. -

- {% for tender in last_3_tenders %} -
-
- {% include "tenders/_card_list_item.html" with tender=tender %} -
-
+ {% if user.siaeuser_set.count %} +
+
+
+
+
+
    + {% for siaeuser in user.siaeuser_set.all %} +
  • + +
    • {% endfor %} -
-
-
- + {% for siaeuser in user.siaeuser_set.all %} +
+ {% include "dashboard/_siae_tab_content.html" with siae=siaeuser.siae %} +
+ {% endfor %}
-
- {% include "dashboard/_ressource_card.html" with user_kind="SIAE" ressources=last_3_ressources category_slug=category_slug_cat %} +
+ {% else %} +
+
+
+
{% include "dashboard/_add_siae_card.html" %}
+
-
-
- - -{% if user.api_key %} -
-
-
-
- {% include "dashboard/_api_key_card.html" with user_kind="SIAE" api_key=user.api_key %} +
+ {% endif %} +
+
+
+
+
+
+
+

Vos opportunités commerciales

+
+

+ Vous trouverez ici les demandes de devis, appels d'offre ou projets d'achat qui ont été déposés sur le Marché de l'inclusion + et qui correspondent à vos secteurs d'activité et zone d'intervention. +

+ {% for tender in last_3_tenders %} +
+
{% include "tenders/_card_list_item.html" with tender=tender %}
+
+ {% endfor %} +
+
+
+ +
+
+
+
+
+ {% include "dashboard/_ressource_card.html" with user_kind="SIAE" ressources=last_3_ressources category_slug=category_slug_cat %} +
-
- -{% endif %} - -{% include "dashboard/_aides_territoires_section.html" with extra_class="fr-pt-6v" %} -{% include "includes/_super_siae_arguments_badge.html" %} - + + {% if user.api_key %} +
+
+
+
+ {% include "dashboard/_api_key_card.html" with user_kind="SIAE" api_key=user.api_key %} +
+
+
+
+ {% endif %} + {% include "dashboard/_aides_territoires_section.html" with extra_class="fr-py-6v" %} + {% include "includes/_super_siae_arguments_badge.html" %} {% endblock content %} - {% block extra_css %} - + {% endblock extra_css %} diff --git a/lemarche/templates/favorites/dashboard_favorite_list.html b/lemarche/templates/favorites/dashboard_favorite_list.html index bac96b1e1..715ef5c36 100644 --- a/lemarche/templates/favorites/dashboard_favorite_list.html +++ b/lemarche/templates/favorites/dashboard_favorite_list.html @@ -1,70 +1,73 @@ {% extends "layouts/base.html" %} {% load dsfr_tags %} - -{% block page_title %}{{ FAVORITE_LIST_TITLE }}{{ block.super }}{% endblock page_title %} - +{% block page_title %} + {{ FAVORITE_LIST_TITLE }}{{ block.super }} +{% endblock page_title %} {% block breadcrumb %} {% dsfr_breadcrumb %} {% endblock breadcrumb %} - {% block content %} -
-
-
-
-

{{ FAVORITE_LIST_TITLE }}

+
+
+
+
+

{{ FAVORITE_LIST_TITLE }}

+
-
-
-
- -

Nouvelle liste

-
- {% csrf_token %} - {% if form.non_field_errors %} -
- {{ form.non_field_errors }} -
- {% endif %} -
-
- {% dsfr_form_field form.name %} -
-
- {% dsfr_button label="Créer" extra_classes="fr-btn--icon-right fr-icon-add-circle-fill" %} +
+
+ +

Nouvelle liste

+ + {% csrf_token %} + {% if form.non_field_errors %} +
+ {{ form.non_field_errors }} +
+ {% endif %} +
+
{% dsfr_form_field form.name %}
+
+ {% dsfr_button label="Créer" extra_classes="fr-btn--icon-right fr-icon-add-circle-fill" %} +
-
- + +
-
-
-
- - {% if favorite_lists.count %} -

{{ favorite_lists.count }} liste{% if favorite_lists.count > 1 %}s{% endif %} existante{% if favorite_lists.count > 1 %}s{% endif %}

-
- {% for favorite_list in favorite_lists.all %} -
-
-
-
-

- {{ favorite_list.name }} -

-

- {{ favorite_list.siaes.count }} structure{{ favorite_list.siaes.count|pluralize }} -

+
+
+ + {% if favorite_lists.count %} +

+ {{ favorite_lists.count }} liste + {% if favorite_lists.count > 1 %}s{% endif %} + existante + {% if favorite_lists.count > 1 %}s{% endif %} +

+
+ {% for favorite_list in favorite_lists.all %} +
+
+
+
+

+ {{ favorite_list.name }} +

+

+ {{ favorite_list.siaes.count }} structure{{ favorite_list.siaes.count|pluralize }} +

+
-
- {% endfor %} -
- {% else %} - {% dsfr_alert type="info" content="Vous n'avez pas encore créé de listes !" %} - {% endif %} + {% endfor %} +
+ {% else %} + {% dsfr_alert type="info" content="Vous n'avez pas encore créé de listes !" %} + {% endif %} +
-
-
+
{% endblock content %} From fd6daaf87e715444618b3002a3e71c82711ebb33 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=A9bastien=20Reuiller?= Date: Wed, 25 Sep 2024 11:22:04 +0200 Subject: [PATCH 3/5] better margin around detail btn --- .../templates/dashboard/siae_edit_base.html | 212 +++++++++++------- 1 file changed, 126 insertions(+), 86 deletions(-) diff --git a/lemarche/templates/dashboard/siae_edit_base.html b/lemarche/templates/dashboard/siae_edit_base.html index f2211a651..7642e5b7c 100644 --- a/lemarche/templates/dashboard/siae_edit_base.html +++ b/lemarche/templates/dashboard/siae_edit_base.html @@ -1,104 +1,144 @@ {% extends "layouts/base.html" %} {% load static process_dict dsfr_tags %} - -{% block page_title %}Modifier votre structure{{ block.super }}{% endblock page_title %} - +{% block page_title %} + Modifier votre structure{{ block.super }} +{% endblock page_title %} {% block breadcrumb %} -
-
-
-
- {% process_dict root_dir=HOME_PAGE_PATH links=breadcrumb_links current=breadcrumb_current as breadcrumb_data %} - {% dsfr_breadcrumb breadcrumb_data %} -
-
- - Voir votre fiche - +
+
+
+
+ {% process_dict root_dir=HOME_PAGE_PATH links=breadcrumb_links current=breadcrumb_current as breadcrumb_data %} + {% dsfr_breadcrumb breadcrumb_data %} +
+
+ +
-
-
+ {% endblock breadcrumb %} - {% block content %} - -{% if siae.is_missing_content %} -
-
-
-
-
-

Votre fiche n'est pas complète, et donc moins visible par les acheteurs.

-

-

    - {% if not siae.sector_count %} -
  1. Ajoutez un ou plusieurs secteurs d'activité
    2. - {% endif %} - {% if not siae.description and not siae.logo_url %} -
  2. Ajoutez une description & votre logo
    3. - {% endif %} - {% if not siae.offer_count and not siae.client_reference_count %} -
  3. Détaillez vos offres & vos références clients
    4. - {% endif %} - {% if siae.is_missing_contact %} -
  4. Complétez vos informations de contact
    5. - {% endif %} -
-

+ + {% if siae.is_missing_content %} +
+
+
+
+
+

Votre fiche n'est pas complète, et donc moins visible par les acheteurs.

+

+

    + {% if not siae.sector_count %} +
  1. + Ajoutez un ou plusieurs secteurs d'activité +
    2. + {% endif %} + {% if not siae.description and not siae.logo_url %} +
  2. + Ajoutez une description & votre logo +
    3. + {% endif %} + {% if not siae.offer_count and not siae.client_reference_count %} +
  3. + Détaillez vos offres & vos références clients +
    4. + {% endif %} + {% if siae.is_missing_contact %} +
  4. + Complétez vos informations de contact +
    5. + {% endif %} +
+

+
-
-
-{% endif %} - - -
-
-
-
-
-
+ {% endif %} + +
+
+
+
+
+ -
- {% block content_siae_form %}{% endblock content_siae_form %} +
  • + + Votre référencement + +
    • + {% if user.is_authenticated and user.is_admin %} +
  • + + Votre référencement (2) + +
    • + {% endif %} +
  • + + Votre structure + +
    • +
  • + + Vos offres commerciales + +
    • +
  • + + Groupements + +
    • + +
    + {% block content_siae_form %} + {% endblock content_siae_form %} +
    -
    -
    + {% endblock content %} From b0de241b84b334d1b92ca6023eb280cec89280d0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=A9bastien=20Reuiller?= Date: Wed, 25 Sep 2024 11:47:18 +0200 Subject: [PATCH 4/5] better position for the share button --- lemarche/templates/dashboard/siae_edit_base.html | 2 +- .../templates/siaes/_share_search_results.html | 16 +++++++++------- 2 files changed, 10 insertions(+), 8 deletions(-) diff --git a/lemarche/templates/dashboard/siae_edit_base.html b/lemarche/templates/dashboard/siae_edit_base.html index 7642e5b7c..98ff07ba9 100644 --- a/lemarche/templates/dashboard/siae_edit_base.html +++ b/lemarche/templates/dashboard/siae_edit_base.html @@ -16,7 +16,7 @@
  • Voir votre fiche + class="fr-btn fr-btn--sm fr-btn--secondary fr-icon-eye-line">Voir votre fiche
    • diff --git a/lemarche/templates/siaes/_share_search_results.html b/lemarche/templates/siaes/_share_search_results.html index 936e9bf7c..6fdac5776 100644 --- a/lemarche/templates/siaes/_share_search_results.html +++ b/lemarche/templates/siaes/_share_search_results.html @@ -1,7 +1,9 @@ - +
      +
    • + +
      • +
    From eb4801b8bb32304a99d4b3dd4daa6a83ffd1d9cc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=A9bastien=20Reuiller?= Date: Wed, 25 Sep 2024 11:48:27 +0200 Subject: [PATCH 5/5] add missing margin --- lemarche/templates/dashboard/home_siae.html | 6 +- lemarche/templates/dashboard/siae_users.html | 199 ++++++++-------- .../templates/pages/impact-calculator.html | 220 +++++++++--------- lemarche/templates/siaes/search_results.html | 10 +- 4 files changed, 228 insertions(+), 207 deletions(-) diff --git a/lemarche/templates/dashboard/home_siae.html b/lemarche/templates/dashboard/home_siae.html index 8e178208c..c3f264481 100644 --- a/lemarche/templates/dashboard/home_siae.html +++ b/lemarche/templates/dashboard/home_siae.html @@ -18,7 +18,7 @@

    {{ page_title }}

    {% if user.siaeuser_set.count %} -
    +
    @@ -79,9 +79,9 @@

    {{ page_title }}

    {% else %}
    -
    +
    -
    {% include "dashboard/_add_siae_card.html" %}
    +
    {% include "dashboard/_add_siae_card.html" %}
    diff --git a/lemarche/templates/dashboard/siae_users.html b/lemarche/templates/dashboard/siae_users.html index c8d7e2972..24f512898 100644 --- a/lemarche/templates/dashboard/siae_users.html +++ b/lemarche/templates/dashboard/siae_users.html @@ -1,130 +1,143 @@ {% extends "layouts/base.html" %} {% load static process_dict dsfr_tags %} - -{% block page_title %}Mes collaborateurs{{ block.super }}{% endblock page_title %} - +{% block page_title %} + Mes collaborateurs{{ block.super }} +{% endblock page_title %} {% block breadcrumb %} -
    -
    -
    -
    - {% process_dict root_dir=HOME_PAGE_PATH links=breadcrumb_links current=breadcrumb_current as breadcrumb_data %} - {% dsfr_breadcrumb breadcrumb_data %} +
    +
    +
    +
    + {% process_dict root_dir=HOME_PAGE_PATH links=breadcrumb_links current=breadcrumb_current as breadcrumb_data %} + {% dsfr_breadcrumb breadcrumb_data %} +
    -
    -
    +
    {% endblock breadcrumb %} - {% block content %} -
    -
    -
    -
    -

    - Mes collaborateurs -

    +
    +
    +
    +
    +

    Mes collaborateurs

    +
    -
    -
    -
    - {% if siae.siaeuserrequest_set.pending.count %} -
    +
    +
    + {% if siae.siaeuserrequest_set.pending.count %} +
    +
    +

    En attente

    +
    +
    + {% for siaeuserrequest in siae.siaeuserrequest_set.pending %} +
    +
    +
    +
    +
    +

    {{ siaeuserrequest.initiator.full_name }}

    +

    + {{ siaeuserrequest.initiator.email }} +

    +
    +
      +
    • +

      + Nouveau collaborateur +

      +
      • +
    +
    +
    +
    +
      +
    • + +
      • +
    • + +
      • +
    +
    +
    +
    +
    +
    + {% endfor %} + {% endif %} +
    -

    En attente

    +

    Confirmés

    - {% for siaeuserrequest in siae.siaeuserrequest_set.pending %} + {% for siaeuser in siae.siaeuser_set.all %}
    -
    +
    -

    - {{ siaeuserrequest.initiator.full_name }} -

    -

    {{ siaeuserrequest.initiator.email }}

    -
    -
      +

      {{ siaeuser.user.full_name }}

      +

      + {{ siaeuser.user.email }} +

      +
    + {% if siaeuser.user != user %} +
    +
    • -

      Nouveau collaborateur

      +
    -
    -
    -
      -
    • - -
      • -
    • - -
      • -
    -
    + {% endif %}
    {% endfor %} - {% endif %} - -
    -
    -

    Confirmés

    -
    - {% for siaeuser in siae.siaeuser_set.all %} -
    -
    -
    -
    -
    -

    - {{ siaeuser.user.full_name }} -

    -

    {{ siaeuser.user.email }}

    -
    - {% if siaeuser.user != user %} -
    -
      -
    • - -
      • -
    -
    - {% endif %} -
    -
    -
    +
    +
    +

    + Collaborateurs +

    +

    Gérez ici les collaborateurs liés à votre structure.

    - {% endfor %} -
    -
    -
    -

    Collaborateurs

    -

    - Gérez ici les collaborateurs liés à votre structure. -

    -
    -
    +
    {% endblock content %} - {% block modals %} {% include "siaes/_siae_user_request_confirm_modal.html" %} {% include "siaes/_siae_user_request_cancel_modal.html" %} {% include "siaes/_siae_user_delete_modal.html" %} {% endblock modals %} - {% block extra_js %} - + {% endblock extra_js %} diff --git a/lemarche/templates/pages/impact-calculator.html b/lemarche/templates/pages/impact-calculator.html index 8a215e828..28162b244 100644 --- a/lemarche/templates/pages/impact-calculator.html +++ b/lemarche/templates/pages/impact-calculator.html @@ -1,133 +1,137 @@ {% extends BASE_TEMPLATE %} {% load dsfr_tags process_dict static humanize wagtailcore_tags advert_cms %} - -{% block page_title %}Calibrer votre achat socialement responsable{{ block.super }}{% endblock page_title %} +{% block page_title %} + Calibrer votre achat socialement responsable{{ block.super }} +{% endblock page_title %} {% block meta_description %} - + {% endblock meta_description %} - {% block breadcrumb %} {% process_dict root_dir=HOME_PAGE_PATH current="Calibrer votre achat socialement responsable" as breadcrumb_data %} {% dsfr_breadcrumb breadcrumb_data %} {% endblock breadcrumb %} - {% block content %} -
    -
    -
    -
    -

    - Calibrer votre achat socialement responsable -

    -

    - Identifier rapidement le nombre total de prestataires inclusifs pouvant répondre à votre besoin, - et mesurer leur capacité globale de production. -

    +
    +
    +
    +
    +

    Calibrer votre achat socialement responsable

    +

    + Identifier rapidement le nombre total de prestataires inclusifs pouvant répondre à votre besoin, + et mesurer leur capacité globale de production. +

    +
    -
    -
    - -
    -
    - {% block htmx %} -
    -
    -
    - {% if form.non_field_errors %} -
    - {{ form.non_field_errors }} -
    - {% endif %} -
    -
    - {% dsfr_form_field form.sectors %} -
    -
    -
    - -
    - {{ form.perimeters.help_text }} -
    - {{ current_perimeters|json_script:"current-perimeters" }} - {% if form.perimeters.errors %} -
    -
      -
    • - Ce champ est obligatoire. +
    +
    +
    + {% block htmx %} +
    +
    + + {% if form.non_field_errors %} +
    + {{ form.non_field_errors }} +
    + {% endif %} +
    +
    {% dsfr_form_field form.sectors %}
    +
    +
    + +
    + {{ form.perimeters.help_text }} +
    + {{ current_perimeters|json_script:"current-perimeters" }} + {% if form.perimeters.errors %} +
    +
      +
    • Ce champ est obligatoire.
      • +
    +
    + {% endif %} +
    +
    +
    {% dsfr_form_field form.presta_type %}
    +
    +
    +
    +
      + {% if show_results %} +
    • +
      • -
    + {% endif %} +
  • + +
    • +
    - {% endif %}
    -
    -
    - {% dsfr_form_field form.presta_type %} -
    - - -
    -
    -
      - {% if show_results %} -
    • - -
      • - {% endif %} + +
    + {% if show_results %} +
    +

    Résultats

    +

    + Il y a {{ results.count }} prestataires inclusifs positionnés sur les secteurs d'activités {{ current_sectors_pretty|join:", " }} + pouvant intervenir sur {{ current_perimeters_pretty|join:", " }}. +

    + {% if results.count > 0 %} +

    + Ces {{ results.count }} prestataires inclusifs représentent plus de {{ results_aggregated.ca_declared__sum|intcomma }} € de chiffres d'affaires cumulé + et plus de {{ results_aggregated.employees_insertion__sum|intcomma }} salariés en insertion. +

    +

    + Découvrir ces prestataires +

    + {% endif %} +

    Ces données sont issues de plusieurs sources :

    +
    -
    - -
    - {% if show_results %} -
    -

    Résultats

    -

    - Il y a {{ results.count }} prestataires inclusifs positionnés sur les secteurs d'activités {{ current_sectors_pretty|join:", " }} - pouvant intervenir sur {{ current_perimeters_pretty|join:", " }}. -

    - {% if results.count > 0 %} -

    - Ces {{ results.count }} prestataires inclusifs représentent plus de {{ results_aggregated.ca_declared__sum|intcomma }} € de chiffres d'affaires cumulé - et plus de {{ results_aggregated.employees_insertion__sum|intcomma }} salariés en insertion. -

    -

    - - Découvrir ces prestataires - -

    {% endif %} -

    - Ces données sont issues de plusieurs sources : -

    -
    - {% endif %} + {% endblock htmx %}
    - {% endblock htmx %} -
    - - -{% cms_advert %} - + + {% cms_advert %} {% endblock content %} - {% block extra_js %} - - - - + + + + {% endblock extra_js %} diff --git a/lemarche/templates/siaes/search_results.html b/lemarche/templates/siaes/search_results.html index d949d43ef..251702a62 100644 --- a/lemarche/templates/siaes/search_results.html +++ b/lemarche/templates/siaes/search_results.html @@ -213,7 +213,7 @@
    -
    +
    @@ -235,8 +235,12 @@

    {% if siaes %} - - + + {% for siae in siaes %}
    {% include "siaes/_card_search_result.html" with siae=siae %}