Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[Dépôt de besoin] Inverser l'affichage des secteurs et de l'entreprise #943

Merged
merged 2 commits into from
Oct 16, 2023
Merged

[Dépôt de besoin] Inverser l'affichage des secteurs et de l'entreprise #943

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
1019e7e
Tender: invert company & sector position
raphodn Oct 11, 2023
0158bf2
Same for tender display for Siae & Network
raphodn Oct 11, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
21 changes: 10 additions & 11 deletions lemarche/templates/tenders/_detail_card.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,26 +12,25 @@
<div class="col-md-12">
<h1>
{{ tender.title }}
<span class="fs-sm badge badge-base badge-pill badge-emploi float-right"
aria-hidden="true">{{ tender_kind_display|default:tender.get_kind_display }}</span>
<span class="fs-sm badge badge-base badge-pill badge-emploi float-right" aria-hidden="true">{{ tender_kind_display|default:tender.get_kind_display }}</span>
</h1>
</div>
</div>
<div class="row text-bold">
<div class="col" title="Secteurs d'activité : {{ tender.sectors_full_list_string|safe }}">
<i class="ri-award-line"></i>
{{ tender.sectors_list_string|safe }}
</div>
<div class="col" title="Lieu d'intervention">
<i class="ri-map-pin-2-line"></i>
{{ tender.location_display|safe }}
</div>
{% if tender.contact_company_name_display %}
<div class="col" title="Entreprise">
<div class="col-md-4" title="Entreprise">
<i class="ri-building-4-line"></i>
{{ tender.contact_company_name_display }}
</div>
{% endif %}
<div class="col-md-4" title="Lieu d'intervention">
<i class="ri-map-pin-2-line"></i>
{{ tender.location_display|safe }}
</div>
<div class="col-md-4" title="Secteurs d'activité : {{ tender.sectors_full_list_string|safe }}">
<i class="ri-award-line"></i>
{{ tender.sectors_list_string|safe }}
</div>
</div>
{% if not source_form %}
{% if user.is_authenticated %}
Expand Down
20 changes: 13 additions & 7 deletions lemarche/templates/tenders/_list_item_network.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,19 +23,25 @@ <h2 class="py-2">{{ tender.title }}</h2>
<hr />

<div class="row">
{% if tender.contact_company_name_display %}
<div class="col-md-4" title="Entreprise">
<i class="ri-building-4-line"></i>
{{ tender.contact_company_name_display }}
</div>
{% endif %}
<div class="col-md-4" title="{% get_verbose_name tender 'location' %}">
{% if tender.perimeters_list_string %}
<i class="ri-map-pin-2-line"></i>
{{ tender.location_display|safe }}
{% endif %}
</div>
<div class="col-md-4" title="{% get_verbose_name tender 'sectors' %} : {{ tender.sectors_full_list_string|safe }}">
{% if tender.sectors.count %}
<i class="ri-award-line"></i>
{{ tender.sectors_list_string|safe }}
{% endif %}
</div>
<div class="col-md-4 text-center" title="{% get_verbose_name tender 'location' %}">
{% if tender.perimeters_list_string %}
<i class="ri-map-pin-2-line"></i>
{{ tender.location_display|safe }}
{% endif %}
</div>
<div class="col-md-4 text-center" title="{% get_verbose_name tender 'amount' %}">
<div class="col-md-4" title="{% get_verbose_name tender 'amount' %}">
{% if tender.amount %}
<i class="ri-money-euro-circle-line"></i>
{{ tender.get_amount_display|default:"-" }}
Expand Down
24 changes: 14 additions & 10 deletions lemarche/templates/tenders/_list_item_siae.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,26 +23,30 @@
</div>
</div>

<a href="{% url 'tenders:detail' tender.slug %}" class="text-decoration-none">
<h2 class="py-2">{{ tender.title }}</h2>
</a>
<h2 class="py-2">{{ tender.title }}</h2>

<hr />

<div class="row">
{% if tender.contact_company_name_display %}
<div class="col-md-4" title="Entreprise">
<i class="ri-building-4-line"></i>
{{ tender.contact_company_name_display }}
</div>
{% endif %}
<div class="col-md-4" title="{% get_verbose_name tender 'location' %}">
{% if tender.perimeters_list_string %}
<i class="ri-map-pin-2-line"></i>
{{ tender.location_display|safe }}
{% endif %}
</div>
<div class="col-md-4" title="{% get_verbose_name tender 'sectors' %} : {{ tender.sectors_full_list_string|safe }}">
{% if tender.sectors.count %}
<i class="ri-award-line"></i>
{{ tender.sectors_list_string|safe }}
{% endif %}
</div>
<div class="col-md-4 text-center" title="{% get_verbose_name tender 'location' %}">
{% if tender.perimeters_list_string %}
<i class="ri-map-pin-2-line"></i>
{{ tender.location_display|safe }}
{% endif %}
</div>
<div class="col-md-4 text-center" title="{% get_verbose_name tender 'amount' %}">
<div class="col-md-4" title="{% get_verbose_name tender 'amount' %}">
{% if tender.amount %}
<i class="ri-money-euro-circle-line"></i>
{{ tender.get_amount_display|default:"-" }}
Expand Down