Skip to content

Commit

Permalink
Ajout du survol sur les Super ESI (#1083)
Browse files Browse the repository at this point in the history
* first try

* improve css of tooltip

* remove hard link 'a' for siae card

* update click mode for search

* include inside tooltip

* update fixtures

* fix inner size
  • Loading branch information
madjid-asa authored Feb 14, 2024
1 parent 14cfe43 commit dc791d1
Show file tree
Hide file tree
Showing 13 changed files with 74 additions and 12 deletions.
14 changes: 9 additions & 5 deletions lemarche/fixtures/django/01_siaes.json
Original file line number Diff line number Diff line change
Expand Up @@ -103967,7 +103967,8 @@
"source": "ASP",
"created_at": "2020-04-09T13:36:57.328Z",
"updated_at": "2020-12-18T10:40:08.674Z",
"slug": "ei-garage-martinet-siege-13"
"slug": "ei-garage-martinet-siege-13",
"super_badge": true
}
},
{
Expand All @@ -103994,7 +103995,8 @@
"source": "GEIQ",
"created_at": "2020-04-14T16:09:19.471Z",
"updated_at": "2020-12-18T09:56:51.812Z",
"slug": "geiq-vertigo-films-13"
"slug": "geiq-vertigo-films-13",
"super_badge": true
}
},
{
Expand Down Expand Up @@ -104022,7 +104024,8 @@
"source": "ASP",
"created_at": "2020-12-01T10:30:23.006Z",
"updated_at": "2020-12-18T10:40:07.948Z",
"slug": "job-insertion-90-90"
"slug": "job-insertion-90-90",
"super_badge": true
}
},
{
Expand Down Expand Up @@ -104053,7 +104056,8 @@
"source": "USER_CREATED",
"created_at": "2020-12-18T13:08:07.627Z",
"updated_at": "2020-12-18T13:08:08.043Z",
"slug": "el-garage-martinet-nord-13"
"slug": "el-garage-martinet-nord-13",
"super_badge": true
}
},
{
Expand Down Expand Up @@ -104114,4 +104118,4 @@
"slug": "les-moulins-de-limmobilier-13"
}
}
]
]
8 changes: 7 additions & 1 deletion lemarche/static/itou_marche/sections/_siae.scss
Original file line number Diff line number Diff line change
Expand Up @@ -255,7 +255,9 @@

.siae-card {
margin-bottom: 1.5rem;

&[data-url]{
cursor: pointer;
};
.sc-profile-type,
.sc-profile-sectors {
span.ml-1 {
Expand Down Expand Up @@ -309,6 +311,10 @@ $super-badge-color: #ffbe18;
line-height: 20px;
letter-spacing: 0px;
text-align: left;

&:hover {
cursor: help;
}
}

.super-badge-tab {
Expand Down
15 changes: 15 additions & 0 deletions lemarche/static/itou_marche/utils.scss
Original file line number Diff line number Diff line change
Expand Up @@ -27,3 +27,18 @@
transform: rotate(360deg);
}
}

.tooltip-inner {
max-width: 50em;
padding: 3px 8px;
background-color: #fff;
color: #000;
text-align: left;
border: 1px solid #cccdd7;
border-radius: 0.25rem;
}

.icon-success {
color: $green;
font-weight: bold;
}
20 changes: 20 additions & 0 deletions lemarche/static/js/utils.js
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,26 @@ window.addEventListener('DOMContentLoaded', function () {

initModalMessages();

$('.super-badge-badge').each(function (element) {
$(this).tooltip(
{
html: true,
placement: "bottom",
title: $('#tooltip-super-badge').html()
});
});

document.querySelectorAll('.siae-card[data-url]').forEach(function (card) {
card.addEventListener('click', function (event) {
if (event.target.className == 'ri-star-line ri-xl') {
// manage case of favorites
event.preventDefault()
}
else if (this.dataset.url) window.open(this.dataset.url, '_blank');

});
});

$('.s-tabs-01__nav .nav-item').on('click', function (event) {
event.preventDefault()
let tabContent = this.parentElement.parentElement.querySelector(".tab-content");
Expand Down
1 change: 1 addition & 0 deletions lemarche/templates/dashboard/home_siae.html
Original file line number Diff line number Diff line change
Expand Up @@ -139,5 +139,6 @@ <h1 class="s-title-01__title h1"><strong>Tableau de bord</strong></h1>
{% endif %}

{% include "dashboard/_aides_territoires_section.html" with extra_class="pt-3" %}
{% include "includes/_super_siae_arguments_badge.html" %}

{% endblock %}
Original file line number Diff line number Diff line change
Expand Up @@ -72,6 +72,8 @@ <h1 class="h1 mb-3 mb-lg-5 d-flex justify-content-between">
</div>
</div>
</section>
{% include "includes/_super_siae_arguments_badge.html" %}

{% endblock %}

{% block modals %}
Expand Down
10 changes: 10 additions & 0 deletions lemarche/templates/includes/_super_siae_arguments_badge.html
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
<div class="d-none">
<div id="tooltip-super-badge">
<ul class="list-unstyled pt-1">
<li><i class="ri-check-line icon-success"></i> Fiche commerciale complète et mise à jour régulièrement</li>
<li><i class="ri-check-line icon-success"></i> Taux de réponse élevé</li>
<li><i class="ri-check-line icon-success"></i> Délai moyen de réponse élevé</li>
<li><i class="ri-check-line icon-success"></i> Coordonnées de contact à jour</li>
</ul>
</div>
</div>
Original file line number Diff line number Diff line change
Expand Up @@ -76,4 +76,6 @@ <h1 class="mb-3 mb-lg-5">Mes adhérents notifiés et intéressés par cette oppo
</div>
</div>
</section>
{% include "includes/_super_siae_arguments_badge.html" %}

{% endblock %}
6 changes: 1 addition & 5 deletions lemarche/templates/siaes/_card_search_result.html
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{% load static siae_sectors_display %}
{% load theme_inclusion %}

<div class="card c-card c-card--hovershadow siae-card {% if siae.super_badge %}super-badge-card{% endif %}">
<div class="card c-card c-card--hovershadow siae-card {% if siae.super_badge %}super-badge-card{% endif %}" data-url="{% url 'siae:detail' siae.slug %}" role="button">
<div class="card-header">
<div class="row">
<div class="col-auto">
Expand All @@ -28,7 +28,6 @@ <h2 class="h4 mb-0">
</div>
</div>
<div class="card-body">
<a href="{% url 'siae:detail' siae.slug %}" target="_blank" id="search-results-siae-card" class="text-decoration-none stretched-link">
<ul class="list-unstyled m-0 lh-sm row no-gutters">
<li class="sc-profile-type col-12 col-lg-6 pr-lg-2 d-flex">
<i class="ri-briefcase-4-line mr-1"></i>
Expand Down Expand Up @@ -58,10 +57,8 @@ <h2 class="h4 mb-0">
<i class="ri-star-line ri-xl"></i>
</a>
{% endif %}
</a>
</div>
<div class="card-footer fs-sm">
<a href="{% url 'siae:detail' siae.slug %}" target="_blank" id="search-results-siae-card" class="text-primary text-decoration-none stretched-link">
<span>
<i class="ri-map-pin-line"></i>
<span class="sr-only">Situé à {{ siae.city }}</span>
Expand All @@ -85,6 +82,5 @@ <h2 class="h4 mb-0">
<span class="sr-only">Type de structure : {{ siae.get_kind_display }}</span>
<span>{{ siae.get_kind_display }}</span>
</span>
</a>
</div>
</div>
2 changes: 1 addition & 1 deletion lemarche/templates/siaes/_card_tender.html
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{% load static %}

<div class="card c-card siae-card super-esi-card {% if siae.super_badge %}super-badge-card{% endif %}">
<div class="card c-card siae-card {% if siae.super_badge %}super-badge-card{% endif %}">
<div class="card-header">
<div class="row">
<div class="col-auto">
Expand Down
2 changes: 2 additions & 0 deletions lemarche/templates/siaes/detail.html
Original file line number Diff line number Diff line change
Expand Up @@ -264,6 +264,8 @@ <h3 class="h2 m-0">
</div>
</div>
</section>
{% include "includes/_super_siae_arguments_badge.html" %}

{% endblock %}

{% block modals %}
Expand Down
2 changes: 2 additions & 0 deletions lemarche/templates/siaes/search_results.html
Original file line number Diff line number Diff line change
Expand Up @@ -300,6 +300,8 @@ <h1 class="h4 mb-0">
</div>
</div>
</section>
{% include "includes/_super_siae_arguments_badge.html" %}

{% endblock %}
{% block modals %}
{% include "auth/_login_or_signup_modal.html" %}
Expand Down
2 changes: 2 additions & 0 deletions lemarche/templates/tenders/siae_interested_list.html
Original file line number Diff line number Diff line change
Expand Up @@ -137,6 +137,8 @@ <h1 class="mb-3 mb-lg-5">{{ siaes.count }} prestataire{{ siaes.count|pluralize }
{% endblock %}
</div>
</section>
{% include "includes/_super_siae_arguments_badge.html" %}

{% endblock %}


Expand Down

0 comments on commit dc791d1

Please sign in to comment.