Fin barre de recherche de mot-vedette dans la navbar

public/assets/css/app.css

+.bg-dark-gray {
+    background-color: darkgrey;
+}
+
 /* AJAX LOADING */
 #overlay {
     position: fixed;

public/assets/js/app.js

@@ -52,13 +52,17 @@ $(function() {
             type: "GET",
             url: url,
             cache: false,
-            success: function(resp){
+            success: function(resp, textStatus, xhr){
+                console.log(resp);
+                if (xhr.status === 211) {
+                    window.location.href = resp;
+                }
                 appModal.find('.modal-content').html(resp);
                 appModal.modal('show');
                 if (isForm) {
                     initializeAjaxForm();
                     initializeForm(true);
-                };
+                }
             },
             complete: function() {
                 $overlay.hide();
@@ -369,33 +373,45 @@ function initializeAjaxLinks() {
             })
         }
     })
+}
 
-    function initializeSearchHeadwords() {
-        // cliqk sur search => ajax pour get url entry_show dan sle bon lexique
-        $form = $('#searchHeadwordsForm');
-        $form.on('submit', function (e) {
-            e.preventDefault();
-            var $overlay = $('#overlay').show();
-            var search = $('#searchHeadwordBox').val();
+function initializeSearchHeadwords() {
+    // cliqk sur search => ajax pour get url entry_show dan sle bon lexique
 
-            $.ajax({
-                type: 'GET',
-                url: $form.attr('action') + '?' + search,
-                dataType: "json",
-                success: function (response, textStatus, xhr) {
+    $form = $('#searchHeadwordsForm');
+    $form.on('submit', function (e) {
+        e.preventDefault();
+        var $overlay = $('#overlay').show();
+        var $appModal = $('#bootstrap-modal');
+        var search = $('#searchHeadwordBox').val();
+        var action = $form.attr('action');
+        var url = action + (action.indexOf('?') >= 0 ? '&' : '?') + $form.serialize();
+
+        $.ajax({
+            type: 'GET',
+            url: url,
+            cache: false,
+            success: function (response, textStatus, xhr) {
+                if (xhr.status === 211) {
                     window.location.href = response;
-                },
-                error: function (jqXHR, textStatus, errorThrown) {
-                    console.log(jqXHR.responseText, textStatus, errorThrown);
-                    $wordCreationConfirmationLink = $('headwordConfirmCreation');
-                    $wordCreationConfirmationLink.data('url', $wordCreationConfirmationLink.data('url') + '?' + search);
-                    $wordCreationConfirmationLink.click();
-                    // $overlay.hide();
+                } else {
+                    $appModal.find('.modal-content').html(response);
+                    $appModal.modal('show');
                 }
-            })
-        });
-        // si pas présnete => modal-form ou confirm-dialog pour demander création dans Agora
+            },
+            complete: function() {
+                $overlay.hide();
+            },
+            error: function (jqXHR, textStatus, errorThrown) {
+                console.log(jqXHR.responseText, textStatus, errorThrown);
+                // $wordCreationConfirmationLink = $('headwordConfirmCreation');
+                // $wordCreationConfirmationLink.data('url', $wordCreationConfirmationLink.data('url') + '?' + search);
+                // $wordCreationConfirmationLink.click();
+                // $overlay.hide();
+            }
+        })
+    });
+    // si pas présnete => modal-form ou confirm-dialog pour demander création dans Agora
 
 
-    }
 }
\ No newline at end of file

src/Controller/HeadwordController.php

@@ -41,7 +41,7 @@ class HeadwordController extends AppBaseController
      */
     public function search(Request $request): Response
     {
-        $search = $request->get('search');
+        $search = $request->get('searchHeadwordBox');
         $orderedLexicons = array_merge($this->getUser()->getMyLexicons(), [
             $this->getZeroLexicon($this->getLanguage()),
             $this->getNewWordsLexicon($this->getLanguage()),
@@ -49,9 +49,9 @@ class HeadwordController extends AppBaseController
         $entries = $this->em->getRepository(Entry::class)->getByHeadwordValueInLexicons($search, $orderedLexicons);
 
         if ($entries) {
-            return new JsonResponse($this->generateUrl('app_entry_show', ['id' => $entries[0]->getId()]));
+            return new JsonResponse($this->generateUrl('app_entry_show', ['id' => $entries[0]->getId()]), 211);
         } else {
-            return new JsonResponse(null,404);
+            return  $this->render("headword/confirmAddNewWord.html.twig", ['word' => $search]);
         }
     }
 
@@ -60,11 +60,13 @@ class HeadwordController extends AppBaseController
      */
     public function confirmNewWordCreation(Request $request): Response
     {
-        
+        $word = $request->get('word');
+        $headword = $this->newHeadword($word, $this->getLanguage());
+        $this->createEntryInNewWordsLexicon($headword);
 
-        return $this->render("genericModalForm.html.twig", [
-            'form' => $form->crea
-        ]);
+        $this->addFlash('success', sprintf("Le mot « %s » a été ajouté à l'Agora des nouveaux mots.", $word));
+
+        return $this->render("closeModalAndReload.html.twig");
     }
 
     /**

templates/base.html.twig

@@ -22,7 +22,7 @@
         {% include "js_translations.html.twig" %}
 <script src="{{ asset('assets/js/app.js') }}"></script>
 {% endblock %}
-<body>
+<body {% if app.environment|upper == 'DEV' %}class="bg-dark-gray"{% endif %}>
 
 {% block nav %}
     {% include "nav.html.twig" %}

templates/headword/confirmAddNewWord.html.twig

+{% extends 'modal.html.twig' %}
+
+{% block modal_title %}
+    {{ "Ajouter un mot à l'Agora"|trans }}
+{% endblock %}
+
+{% block modal_body %}
+    <div class="row">
+        <div class="col-md-12">
+
+            {% include "flashes.html.twig" %}
+
+            <div class="alert alert-warning">{{ ("« " ~ word ~ " » est introuvable dans BaLex et dans le Wiktionnaire.<br>Souhaitez-vous l'ajouter à l'Agora des nouveax mots ?"|trans)|raw }}</div>
+
+            <div class="row pt-3">
+                <div class="col-sm-4"></div>
+                <div class="col-sm-8">
+                    <a href="#" data-url="{{ path('app_headword_confirm_creation', {word: word}) }}" class="modal-show btn btn-dark">{{ "Ajouter"|trans }}</a>
+                    <button type="button" class="btn btn-light" data-bs-dismiss="modal">{{ 'Annuler'|trans }}</button>
+                </div>
+            </div>
+
+        </div>
+    </div>
+{% endblock %}
\ No newline at end of file

templates/nav.html.twig

@@ -8,8 +8,7 @@
 
             <form id="searchHeadwordsForm" class="d-flex" role="search" action="{{ path('app_headword_search') }}">
                 <input name="searchHeadwordBox" class="form-control me-2" type="search" placeholder="{{ "Rechercher"|trans }}" aria-label="Search">
-                <button class="btn btn-light me-3" type="submit"><i class="fa fa-search"></i> </button>
-                <a id="headwordConfirmCreation" href="#" class="modal-form d-none" data-url="{{ path('app_headword_confirm_creation') }}"></a>
+                <button id="searchHeadwordButton" class="btn btn-light me-3"><i class="fa fa-search"></i></button>
             </form>
 
             {% if app.user %}