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

[Fiche structure] Répare l'affichage de la carte si Inbound désactivé #928

Merged
merged 2 commits into from
Oct 2, 2023
Merged

[Fiche structure] Répare l'affichage de la carte si Inbound désactivé #928

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
e212d3c
Siae detail: show map in card when inbound deactivated
raphodn Sep 29, 2023
2b5fc71
Simplify css
raphodn Sep 29, 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
9 changes: 0 additions & 9 deletions lemarche/static/itou_marche/sections/_siae.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
6 changes: 1 addition & 5 deletions lemarche/templates/siaes/_card_detail.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -71,10 +71,6 @@ <h1 class="h2 mb-2">
</div>
</div>
<div class="card-body" style="border-top:1px solid #e6e6eb">
{% 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 %}
</div>
</div>
16 changes: 6 additions & 10 deletions lemarche/templates/siaes/_detail_cta.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,12 +16,6 @@ <h3>Ce prestataire vous intéresse ?</h3>
</button>
<div id="collapseCoordonnees" class="collapse mt-2">
<ul class="list-unstyled mb-0">
{% if siae.is_missing_contact %}
<li class="mb-2">
<i class="ri-search-line"></i>
<a href="https://www.google.fr/search?q={{ siae.name_display }}" id="company_google" target="_blank" rel="noopener">Google</a>
</li>
{% endif %}
{% if siae.user_count %}
{% if siae.contact_short_name %}
<li class="mb-2">
Expand Down Expand Up @@ -54,10 +48,12 @@ <h3>Ce prestataire vous intéresse ?</h3>
<a href="{{ siae.contact_social_website }}" id="company_social_website" target="_blank" rel="noopener">{{ siae.contact_social_website }}</a>
</li>
{% endif %}
<li>
<i class="ri-map-pin-line"></i>
<span>{{ siae.address }} {{ siae.post_code }} {{ siae.city }}</span>
</li>
{% if siae.is_missing_contact %}
<li class="mb-2">
<i class="ri-search-line"></i>
<a href="https://www.google.fr/search?q={{ siae.name_display }}" id="company_google" target="_blank" rel="noopener">Google</a>
</li>
{% endif %}
</ul>
</div>
{% else %}
Expand Down
96 changes: 64 additions & 32 deletions lemarche/templates/siaes/_useful_infos_siae.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,55 +1,87 @@
{% load array_choices_display %}

<div class="row">
<!-- First column -->
<div class="col-12 col-md-6">
<div class="row">
<div class="col-12">
<ul class="list-unstyled mb-0">
<li class="mb-2">
<i class="ri-calendar-2-fill"></i>
<strong>Année de création :</strong>
<span>{{ siae.year_constitution_display }}</span>
</div>
</div>
<div class="row">
<div class="col-12">
</li>
<li class="mb-2">
<i class="ri-bill-line"></i>
<strong>SIRET :</strong>
<span>{{ siae.siret_display }}</span>
</div>
</div>
<div class="row">
<div class="col-12">
</li>
<li class="mb-2">
<i class="ri-money-euro-circle-line"></i>
<strong>Chiffre d'affaires :</strong>
<span>{{ siae.ca_display }}</span>
</div>
</div>
<div class="row">
<div class="col-12 mt-2 mb-2">
{% include "siaes/_annuaire_entreprises_button.html" with siret=siae.siret %}
</div>
</div>
</div>
<div class="col-12 col-md-6">
<div class="row">
<div class="col-12">
</li>
<li class="mb-2">
{% if siae.presta_type %}
<i class="ri-briefcase-4-line"></i>
<strong>{% array_choices_display siae 'presta_type' %}</strong>
<i class="ri-briefcase-4-line"></i>
<strong>{% array_choices_display siae 'presta_type' %}</strong>
{% endif %}
</div>
</div>
<div class="row">
<div class="col-12">
</li>
<li class="mb-2">
<i class="ri-group-line"></i>
<strong>Salariés permanents :</strong>
<span>{{ siae.employees_permanent_count|default:"non disponible" }}</span>
</div>
</div>
<div class="row">
<div class="col-12">
</li>
<li class="mb-2">
<i class="ri-user-add-line"></i>
<strong>{{ siae.etp_count_label_display }} :</strong>
<span>{{ siae.etp_count_display|floatformat:0|default:"non disponible" }}</span>
</div>
</li>
{% if inbound_email_is_activated %}
{% if siae.contact_website %}
<li class="mb-2">
<i class="ri-window-2-line"></i>
<a href="{{ siae.contact_website }}" id="company_website" target="_blank" rel="noopener">Site internet</a>
</li>
{% endif %}
{% if siae.contact_social_website %}
<li class="mb-2">
<i class="ri-earth-line"></i>
<a href="{{ siae.contact_social_website }}" id="company_social_website" target="_blank" rel="noopener">Réseau social</a>
</li>
{% endif %}
{% if siae.is_missing_contact %}
<li class="mb-2">
<i class="ri-search-line"></i>
<a href="https://www.google.fr/search?q={{ siae.name_display }}" id="company_google" target="_blank" rel="noopener">Google</a>
</li>
{% endif %}
{% endif %}
<li class="mb-2">
{% include "siaes/_annuaire_entreprises_button.html" with siret=siae.siret %}
</li>
</ul>
</div>

<!-- Second column -->
<div class="col-12 col-md-6">
<div class="map-holder mb-2">
<div id="map-siae" class="map-canvas"></div>
</div>
<ul class="list-unstyled m-0">
<li class="mb-2">
<i class="ri-map-2-line"></i>
<strong>Situé à :</strong>
<span>{{ siae.city }}</span>
</li>
<li class="mb-2">
<i class="ri-map-pin-line"></i>
<strong>Adresse :</strong>
<span>{{ siae.address }} {{ siae.post_code }} {{ siae.city }}</span>
</li>
<li class="mb-2">
<i class="ri-focus-2-line"></i>
<strong>Intervient sur :</strong>
<span>{{ siae.geo_range_pretty_display }}</span>
</li>
</ul>
</div>
</div>
87 changes: 0 additions & 87 deletions lemarche/templates/siaes/_useful_infos_siae_v2.html
View file
Open in desktop

This file was deleted.