amelioration(app/views/shared/help/_help_dropdown_dossier.html.haml): passe le menu d'aide sur un dossier au nouveau menu

app/views/shared/help/_help_dropdown_dossier.html.haml

@@ -1,15 +1,16 @@
-.dropdown.help-dropdown{ data: { controller: 'menu-button' } }
-  %button.fr-btn.dropdown-button{ data: { menu_button_target: 'button' } }
+= render Dropdown::MenuComponent.new(wrapper: :span, wrapper_options: { class: ['help-dropdown']}, menu_options: { id: "help-menu" }) do |menu|
+  - menu.with_button_inner_html do
     = t('help')
-  #help-menu.dropdown-content.fade-in-down{ data: { menu_button_target: 'menu' } }
-    %ul.dropdown-items
-      - title = dossier.brouillon? ? "Besoin d’aide pour remplir votre dossier ?" : "Une question sur votre dossier ?"
+  - title = dossier.brouillon? ? "Besoin d’aide pour remplir votre dossier ?" : "Une question sur votre dossier ?"
 
-      - if dossier.messagerie_available?
-        = render partial: 'shared/help/dropdown_items/messagerie_item',
-          locals: { dossier: dossier, title: title }
-      - elsif dossier.procedure.service.present?
-        = render partial: 'shared/help/dropdown_items/service_item',
-          locals: { service: dossier.procedure.service, title: title }
+  - if dossier.messagerie_available?
+    - menu.with_item do
+      = render partial: 'shared/help/dropdown_items/messagerie_item', locals: { dossier: dossier, title: title }
 
-      = render partial: 'shared/help/dropdown_items/faq_item'
+  - elsif dossier.procedure.service.present?
+    - menu.with_item do
+      = render partial: 'shared/help/dropdown_items/service_item',
+        locals: { service: dossier.procedure.service, title: title }
+
+  - menu.with_item do
+    = render partial: 'shared/help/dropdown_items/faq_item'

app/views/shared/help/dropdown_items/_faq_item.html.haml

@@ -1,9 +1,7 @@
-%li
-  = link_to t("links.common.faq.url"), title: new_tab_suffix(t('help_dropdown.general_title')), **external_link_attributes do
-    %span.icon.help
-    .dropdown-description
-      %span.help-dropdown-title
-        = t('help_dropdown.problem_title')
-      %p
-        = t('help_dropdown.problem_description')
-
+= link_to t("links.common.faq.url"), title: new_tab_suffix(t('help_dropdown.general_title')), **external_link_attributes, role: 'menuitem' do
+  %span.icon.help
+  .dropdown-description
+    %span.help-dropdown-title
+      = t('help_dropdown.problem_title')
+    %p
+      = t('help_dropdown.problem_description')

app/views/shared/help/dropdown_items/_messagerie_item.html.haml

@@ -1,6 +1,5 @@
-%li
-  = link_to messagerie_dossier_path(dossier) do
-    %span.icon.mail
-    .dropdown-description
-      %span.help-dropdown-title= title
-      %p Envoyez directement un message à l’instructeur.
+= link_to messagerie_dossier_path(dossier), role: 'menuitem' do
+  %span.icon.mail
+  .dropdown-description
+    %span.help-dropdown-title= title
+    %p Envoyez directement un message à l’instructeur.

app/views/shared/help/dropdown_items/_service_item.html.haml

@@ -1,15 +1,14 @@
-%li.help-dropdown-service
-  %span.icon.person
-  .dropdown-description
-    %span.help-dropdown-title= title
-    .help-dropdown-service-action
-      %p Contactez directement l’administration :
-      %p.help-dropdown-service-item
-        %span.icon.small.mail
-        = link_to service.email, "mailto:#{service.email}"
-      %p.help-dropdown-service-item
-        %span.icon.small.phone
-        = link_to service.telephone, service.telephone_url
-      %p.help-dropdown-service-item
-        %span.icon.small.clock
-        = service.horaires
+%span.icon.person
+.dropdown-description
+  %span.help-dropdown-title= title
+  .help-dropdown-service-action
+    %p Contactez directement l’administration :
+    %p.help-dropdown-service-item
+      %span.icon.small.mail
+      = link_to service.email, "mailto:#{service.email}", role: 'menuitem'
+    %p.help-dropdown-service-item
+      %span.icon.small.phone
+      = link_to service.telephone, service.telephone_url, role: 'menuitem'
+    %p.help-dropdown-service-item
+      %span.icon.small.clock
+      = service.horaires