From 73a1d42ee79c863da47c6f1f7915247df1ea0468 Mon Sep 17 00:00:00 2001
From: Mathieu Jaumotte <mathieu.jaumotte@champs-libres.coop>
Date: Sun, 22 Aug 2021 14:55:30 +0200
Subject: [PATCH] fix conflict with AccompanyingPeriod list button

---
 .../views/AccompanyingPeriod/list.html.twig   | 26 ++++++++++++-------
 1 file changed, 17 insertions(+), 9 deletions(-)

diff --git a/src/Bundle/ChillPersonBundle/Resources/views/AccompanyingPeriod/list.html.twig b/src/Bundle/ChillPersonBundle/Resources/views/AccompanyingPeriod/list.html.twig
index b51d2f7f5..bdad9ce86 100644
--- a/src/Bundle/ChillPersonBundle/Resources/views/AccompanyingPeriod/list.html.twig
+++ b/src/Bundle/ChillPersonBundle/Resources/views/AccompanyingPeriod/list.html.twig
@@ -17,9 +17,17 @@
                class="btn btn-cancel">{{ 'Person details'|trans }}
             </a>
         </li>
-        <li class="dropdown">
+        <li>
             <a class="btn btn-create change-icon"
-               href="{{ path ('chill_person_accompanying_course_new', {'person_id' : [ person.id ] } ) }}" role="button" id="newAccompanyingPeriod">
+               href="{{ path ('chill_person_accompanying_course_new', {'person_id' : [ person.id ] } ) }}" role="button">
+                {{ 'Create an accompanying period'|trans }}
+            </a>
+        </li>
+
+        {#  disable dropdown
+        <li class="dropdown">
+            <a class="btn btn-create change-icon dropdown-toggle"
+               href="#" role="button" id="newAccompanyingPeriod" data-bs-toggle="dropdown" aria-expanded="false">
                 {{ 'Create an accompanying period'|trans }}
             </a>
             <ul class="dropdown-menu" aria-labelledby="newAccompanyingPeriod">
@@ -28,22 +36,22 @@
                         <i class="fa fa-fw fa-plus"></i> {{ 'Create an accompanying period'|trans }}
                     </a>
                 </li>
-                {# disabled
                 <li>
                     <a class="dropdown-item" href="{{ path ('chill_person_accompanying_period_create', {'person_id' : person.id } ) }}">
                         <i class="fa fa-fw fa-reply"></i> {{ 'Add an accompanying period in the past'|trans }}
                     </a>
                 </li>
-                #}
                 {% if person.isOpen == false %}
-                <li>
-                    <a class="dropdown-item" href="{{ path('chill_person_accompanying_period_open', {'person_id' : person.id} ) }}">
-                        <i class="fa fa-fw fa-unlock"></i> {{'Begin a new accompanying period'|trans }}
-                    </a>
-                </li>
+                    <li>
+                        <a class="dropdown-item" href="{{ path('chill_person_accompanying_period_open', {'person_id' : person.id} ) }}">
+                            <i class="fa fa-fw fa-unlock"></i> {{'Begin a new accompanying period'|trans }}
+                        </a>
+                    </li>
                 {% endif %}
             </ul>
         </li>
+        #}
+
     </ul>
 
 </div>