From b0b3a706517442676fce76f2a18ff864fdfb3f12 Mon Sep 17 00:00:00 2001 From: madjid-asa Date: Wed, 13 Nov 2024 15:04:50 +0100 Subject: [PATCH] =?UTF-8?q?fix:=20Affichage=20du=20d=C3=A9tail=20du=20d?= =?UTF-8?q?=C3=A9p=C3=B4t=20de=20besoin=20(#1515)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- lemarche/static/itou_marche/itou_marche.scss | 8 +++ lemarche/templates/layouts/base.html | 18 +++--- lemarche/templates/tenders/_closed_badge.html | 12 ++-- lemarche/templates/tenders/_detail_card.html | 58 +++++++++---------- 4 files changed, 53 insertions(+), 43 deletions(-) diff --git a/lemarche/static/itou_marche/itou_marche.scss b/lemarche/static/itou_marche/itou_marche.scss index d6dd56cfe..1f87a85e5 100644 --- a/lemarche/static/itou_marche/itou_marche.scss +++ b/lemarche/static/itou_marche/itou_marche.scss @@ -204,3 +204,11 @@ ul.summary-grid-list { box-shadow: 0px 2px 4px rgba(0, 0, 0, 0.1); padding: 8px; } + +.text-center { + text-align: center; +} + +.bg-gray { + background-color: var(--g300); +} diff --git a/lemarche/templates/layouts/base.html b/lemarche/templates/layouts/base.html index dd7f2d256..4cd83e95d 100644 --- a/lemarche/templates/layouts/base.html +++ b/lemarche/templates/layouts/base.html @@ -4,7 +4,8 @@ {% if SITE_CONFIG.mourning %}data-fr-mourning{% endif %}> - + {% dsfr_favicon %} {% dsfr_css %} {% compress css %} @@ -25,7 +26,11 @@ {% block extra_css %} {% endblock extra_css %} {% block title %} - {% block page_title %}— Le marché de l'inclusion{% endblock page_title %} + + {% block page_title %} + — Le marché de l'inclusion + {% endblock page_title %} + {% endblock title %} {% block meta_description %} +
{% block messages %} {% dsfr_django_messages wrapper_classes="fr-container fr-my-4v" %} {% endblock messages %} @@ -74,7 +77,8 @@ src="{% static 'vendor/alphagov-accessible-autocomplete-2.0.3/accessible-autocomplete.min.js' %}"> - + {% if BITOUBI_ENV not in "dev" %} {% include "includes/_tracker_tarteaucitron.html" %} diff --git a/lemarche/templates/tenders/_closed_badge.html b/lemarche/templates/tenders/_closed_badge.html index 8233e9048..1440b033d 100644 --- a/lemarche/templates/tenders/_closed_badge.html +++ b/lemarche/templates/tenders/_closed_badge.html @@ -1,7 +1,8 @@ - {% if tender.deadline_date_is_outdated_annotated %} -

- {{ tender_kind_display|default:tender.get_kind_display }} clôturé{% if tender.kind == "QUOTE" %}e{% endif %} + {% if tender.deadline_date_is_outdated_annotated or tender.deadline_date_outdated %} +

+ {{ tender_kind_display|default:tender.get_kind_display }} + clôturé{% if tender.kind == "QUOTE" %}e{% endif %} le {{ tender.deadline_date|default:"" }}

{% else %} @@ -12,9 +13,6 @@ {{ tender.get_kind_display }} {% endif %}

- Disponible jusqu'au : {{ tender.deadline_date|default:"" }} - {% if is_new_for_siaes %} -

Nouveau

- {% endif %} + {% if is_new_for_siaes %}

Nouveau

{% endif %} {% endif %} diff --git a/lemarche/templates/tenders/_detail_card.html b/lemarche/templates/tenders/_detail_card.html index 33c1e9244..32da058c9 100644 --- a/lemarche/templates/tenders/_detail_card.html +++ b/lemarche/templates/tenders/_detail_card.html @@ -1,21 +1,7 @@ {% load static humanize %} - -
+
-
-
- {% include "tenders/_closed_badge.html" with tender=tender is_new_for_siaes=is_new_for_siaes %} -
-
- -
-
-

- {{ tender.title }} -

-
-
-
+
{% if tender.contact_company_name_display %}
@@ -26,19 +12,31 @@

{{ tender.location_display|safe }}

-
+
{{ tender.sectors_list_string|safe }}
+
+
+ {% include "tenders/_closed_badge.html" with tender=tender is_new_for_siaes=is_new_for_siaes %} +
+
+ +
+
+

{{ tender.title }}

+
+
{% if not source_form %} {% if user.is_authenticated %} {% if user == tender.author %} -
+
{% include "tenders/_detail_contact.html" with tender=tender %} {% elif user_partner_can_display_tender_contact_details %} -
+
{% include "tenders/_detail_contact.html" with tender=tender %} {% elif siae_has_detail_contact_click_date and not tender.deadline_date_outdated %} @@ -46,17 +44,19 @@

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

- Description -

{% if tender.start_working_date %} -

Début d'intervention : {{ tender.start_working_date }}

+

+ {% if tender.deadline_date_is_outdated_annotated or not tender.deadline_date_outdated %} + Disponible jusqu'au {{ tender.deadline_date|default:"" }} +
+ {% endif %} + Début d'intervention : {{ tender.start_working_date }} +

{% endif %} -

{{ tender.description|safe|linebreaks }}

+

{{ tender.description|safe }}

{% if source_form or not source_form and tender.questions_list|length %} -
+

{% if source_form or user == tender.author %} Questions à poser aux prestataires ciblés @@ -70,13 +70,13 @@

{% endif %} {% if tender.constraints %} -
+

Comment répondre à cette demande ?

-

{{ tender.constraints|default:"-"|safe|linebreaks }}

+

{{ tender.constraints|safe }}

{% endif %} {% if source_form or user == tender.author or tender.accept_share_amount %} -
+

{% if source_form or user == tender.author %} Montant du marché