From de9481a7e3b7b0751ce85e5c9443c4d7e0b1d7b4 Mon Sep 17 00:00:00 2001
From: Raphael Odini <raphodn@users.noreply.github.com>
Date: Tue, 26 Sep 2023 10:42:44 +0200
Subject: [PATCH] =?UTF-8?q?[Recherche]=20R=C3=A9pare=20les=20liens=20de=20?=
 =?UTF-8?q?redirection=20apr=C3=A8s=20la=20modale=20de=20recherche=20avanc?=
 =?UTF-8?q?=C3=A9e=20(#919)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 ...login_or_signup_search_advanced_modal.html | 54 ++++++++++++++++
 lemarche/templates/siaes/search_results.html  | 61 +------------------
 2 files changed, 57 insertions(+), 58 deletions(-)
 create mode 100644 lemarche/templates/auth/_login_or_signup_search_advanced_modal.html

diff --git a/lemarche/templates/auth/_login_or_signup_search_advanced_modal.html b/lemarche/templates/auth/_login_or_signup_search_advanced_modal.html
new file mode 100644
index 000000000..288bba225
--- /dev/null
+++ b/lemarche/templates/auth/_login_or_signup_search_advanced_modal.html
@@ -0,0 +1,54 @@
+<div class="modal fade modal-siae" id="modal_login_to_access_advanced_search" tabindex="-1" role="dialog" aria-modal="true" data-backdrop="static" data-keyboard="false" aria-labelledby="exampleModalLabel">
+    <div class="modal-dialog modal-dialog-centered">
+        <div class="modal-content">
+            <div class="modal-header">
+                <h3 class="modal-title">Pour accéder à la recherche avancée multicritères, inscrivez-vous, c'est gratuit !</h3>
+                <button type="button" class="close" data-dismiss="modal" aria-label="Fermer">
+                    <i class="ri-close-line"></i>
+                </button>
+            </div>
+            <div class="modal-body home-content-body">
+                <p class="mb-4">
+                    Vous pourrez filtrer selon les critères suivants :
+                </p>
+                <ul class="list-unstyled mb-5">
+                    <li class="d-flex mb-2">
+                        <span class="font-weight-bold ml-2">Type de structure</span>
+                    </li>
+                    {% comment %}<li class="d-flex mb-2">
+                        <span class="font-weight-bold ml-2">Certification (Qualibat, RGE, Ecocert, Imprim'vert, Bio, ESS…)</span>
+                    </li> {% endcomment %}
+                    <li class="d-flex mb-2">
+                        <span class="font-weight-bold ml-2">Taille d'entreprise</span>
+                    </li>
+                    <li class="d-flex mb-2">
+                        <span class="font-weight-bold ml-2">Chiffre d'affaires</span>
+                    </li>
+                    <li class="d-flex mb-2">
+                        <span class="font-weight-bold ml-2">Localisation</span>
+                    </li>
+                    <li class="d-flex mb-2">
+                        <span class="font-weight-bold ml-2">Référence client</span>
+                    </li>
+                    <li class="d-flex mb-2">
+                        <span class="font-weight-bold ml-2">Groupement</span>
+                    </li>
+                    <li class="d-flex mb-2">
+                        <span class="font-weight-bold ml-2">QPV/ZRR</span>
+                    </li>
+                    <li class="d-flex mb-2">
+                        <span class="font-weight-bold ml-2">Forme juridique</span>
+                    </li>
+                </ul>
+                <div class="text-center">
+                    <a href="{% url 'auth:signup' %}?next=/prestataires/" id="auth-link" class="btn btn-sm btn-primary">Créer un compte</a>
+                </div>
+                <hr class="my-5" data-text="ou" />
+                <div class="text-center">
+                    <p class="mb-0">Vous avez déjà un compte ?</p>
+                    <a href="{% url 'auth:login' %}?next=/prestataires/" id="auth-link" class="btn btn-sm btn-link">Se connecter</a>
+                </div>
+            </div>
+        </div>
+    </div>
+</div>
diff --git a/lemarche/templates/siaes/search_results.html b/lemarche/templates/siaes/search_results.html
index bb0445d8e..848d3ce35 100644
--- a/lemarche/templates/siaes/search_results.html
+++ b/lemarche/templates/siaes/search_results.html
@@ -290,64 +290,9 @@ <h3 class="h4">Idées reçues</h3>
 {% endblock %}
 {% block modals %}
     {% include "auth/_login_or_signup_modal.html" %}
+    {% include "auth/_login_or_signup_search_advanced_modal.html" %}
     {% include "favorites/_favorite_item_add_modal.html" %}
     {% include "favorites/_favorite_item_remove_modal.html" %}
-    <div class="modal fade modal-siae" id="modal_login_to_access_advanced_search" tabindex="-1" role="dialog" aria-modal="true" data-backdrop="static" data-keyboard="false" aria-labelledby="exampleModalLabel">
-        <div class="modal-dialog modal-dialog-centered">
-            <div class="modal-content">
-                <div class="modal-header">
-                    <h3 class="modal-title">Pour accéder à la recherche avancée multicritères, inscrivez-vous, c’est gratuit !</h3>
-                    <button type="button" class="close" data-dismiss="modal" aria-label="Fermer">
-                        <i class="ri-close-line"></i>
-                    </button>
-                </div>
-                <div class="modal-body home-content-body">
-
-                    <p class="mb-4">
-                        Vous pourrez filtrer selon les critères suivants :
-                    </p>
-                    <ul class="list-unstyled mb-5">
-                        <li class="d-flex mb-2">
-                            <span class="font-weight-bold ml-2">Type de structure</span>
-                        </li>
-                        {% comment %}<li class="d-flex mb-2">
-                            <span class="font-weight-bold ml-2">Certification (Qualibat, RGE, Ecocert, Imprim’vert, Bio, ESS…)</span>
-                        </li> {% endcomment %}
-                        <li class="d-flex mb-2">
-                            <span class="font-weight-bold ml-2">Taille d’entreprise</span>
-                        </li>
-                        <li class="d-flex mb-2">
-                            <span class="font-weight-bold ml-2">Chiffre d’affaires</span>
-                        </li>
-                        <li class="d-flex mb-2">
-                            <span class="font-weight-bold ml-2">Localisation</span>
-                        </li>
-                        <li class="d-flex mb-2">
-                            <span class="font-weight-bold ml-2">Référence client</span>
-                        </li>
-                        <li class="d-flex mb-2">
-                            <span class="font-weight-bold ml-2">Groupement</span>
-                        </li>
-                        <li class="d-flex mb-2">
-                            <span class="font-weight-bold ml-2">QPV/ZRR</span>
-                        </li>
-                        <li class="d-flex mb-2">
-                            <span class="font-weight-bold ml-2">Forme juridique</span>
-                        </li>
-                    </ul>
-                    <div class="text-center">
-                        <a href="{% url 'auth:signup' %}?next=next-params-to-replace" id="auth-link" class="btn btn-sm btn-primary">Créer un compte</a>
-                    </div>
-                    <hr class="my-5" data-text="ou" />
-                    <div class="text-center">
-                        <p class="mb-0">Vous avez déjà un compte ?</p>
-                        <a href="{% url 'auth:login' %}?next=next-params-to-replace" id="auth-link" class="btn btn-sm btn-link">Se connecter</a>
-                    </div>
-                </div>
-            </div>
-        </div>
-    </div>
-
 {% endblock %}
 {% block extra_js %}
     <script type="text/javascript" src="{% static 'vendor/alpinejs@3.11.1.min.js'%}" defer></script>
@@ -360,7 +305,7 @@ <h3 class="modal-title">Pour accéder à la recherche avancée multicritères, i
         {
             open: {{is_advanced_search|yesno:"true,false"}},
             is_authenticated: {{user.is_authenticated|yesno:"true,false"}},
-            is_already_opened:false,
+            is_already_opened: false,
             toggle() {
                 if(!this.is_authenticated && !this.is_already_opened){
                     this.is_already_opened=true;
@@ -383,7 +328,7 @@ <h3 class="modal-title">Pour accéder à la recherche avancée multicritères, i
     let qInput = document.getElementById('id_q');
     let resetBtn = document.getElementById('form-reset-btn');
 
-    if (resetBtn){
+    if (resetBtn) {
         resetBtn.addEventListener("click", resetForm);
     }