From 9e87662c8f95d6ad5e739e62141f5fe327363c2c Mon Sep 17 00:00:00 2001
From: Corinne Durrmeyer <corinne@inseo.fr>
Date: Thu, 8 Aug 2024 11:23:56 +0200
Subject: [PATCH] Distinguish links from content

---
 app/assets/stylesheets/buttons.scss                  | 12 ++++++++++++
 .../shared/help/_help_dropdown_dossier.html.haml     |  2 +-
 .../shared/help/dropdown_items/_faq_item.html.haml   |  9 ++++-----
 .../help/dropdown_items/_messagerie_item.html.haml   |  9 ++++-----
 config/locales/en.yml                                |  1 -
 config/locales/fr.yml                                |  1 -
 6 files changed, 21 insertions(+), 13 deletions(-)

diff --git a/app/assets/stylesheets/buttons.scss b/app/assets/stylesheets/buttons.scss
index a09e46812..59317a60c 100644
--- a/app/assets/stylesheets/buttons.scss
+++ b/app/assets/stylesheets/buttons.scss
@@ -249,6 +249,7 @@ ul.dropdown-items {
 }
 
 .help-content.fr-menu ul.fr-menu__list {
+  --text-decoration: underline;
   text-align: left;
   font-size: 1rem;
 
@@ -280,6 +281,17 @@ ul.dropdown-items {
     font-size: inherit;
     line-height: inherit;
   }
+
+  dd {
+    word-break: break-all;
+  }
+}
+
+.help-content a[href]:hover,
+.help-content a[href]:active {
+  @media (hover: hover) and (pointer: fine) {
+    --text-decoration: none;
+  }
 }
 
 .dropdown-items {
diff --git a/app/views/shared/help/_help_dropdown_dossier.html.haml b/app/views/shared/help/_help_dropdown_dossier.html.haml
index a5177e82f..acf2d247a 100644
--- a/app/views/shared/help/_help_dropdown_dossier.html.haml
+++ b/app/views/shared/help/_help_dropdown_dossier.html.haml
@@ -16,5 +16,5 @@
             = render partial: 'shared/help/dropdown_items/service_item',
               locals: { service: dossier.procedure.service, title: title }
 
-        %li
+        %li.flex
           = render partial: 'shared/help/dropdown_items/faq_item'
diff --git a/app/views/shared/help/dropdown_items/_faq_item.html.haml b/app/views/shared/help/dropdown_items/_faq_item.html.haml
index 1c4f0b3b6..264d303e4 100644
--- a/app/views/shared/help/dropdown_items/_faq_item.html.haml
+++ b/app/views/shared/help/dropdown_items/_faq_item.html.haml
@@ -1,5 +1,4 @@
-= link_to t("links.common.faq.url"), class: 'flex', title: new_tab_suffix(t('help_dropdown.general_title')), **external_link_attributes do
-  %span.fr-icon-question-fill.fr-text-action-high--blue-france{ "aria-hidden": "true" }
-  .fr-pl-1w
-    %h1= t('help_dropdown.problem_title')
-    %p= t('help_dropdown.problem_description')
+%span.fr-icon-question-fill.fr-text-action-high--blue-france{ "aria-hidden": "true" }
+.fr-pl-1w
+  %h1= t('help_dropdown.problem_title')
+  = link_to t('help_dropdown.problem_description'), t("links.common.faq.url"), title: new_tab_suffix(t('help_dropdown.problem_description')), **external_link_attributes
diff --git a/app/views/shared/help/dropdown_items/_messagerie_item.html.haml b/app/views/shared/help/dropdown_items/_messagerie_item.html.haml
index cec0aef68..d0684ffee 100644
--- a/app/views/shared/help/dropdown_items/_messagerie_item.html.haml
+++ b/app/views/shared/help/dropdown_items/_messagerie_item.html.haml
@@ -1,5 +1,4 @@
-= link_to messagerie_dossier_path(dossier), class: 'flex' do
-  %span.fr-icon-mail-fill.fr-text-action-high--blue-france{ "aria-hidden": "true" }
-  .fr-pl-1w
-    %h1= title
-    %p= t('help_dropdown.contact_instructeur')
+%span.fr-icon-mail-fill.fr-text-action-high--blue-france{ "aria-hidden": "true" }
+.fr-pl-1w
+  %h1= title
+  = link_to t('help_dropdown.contact_instructeur'), messagerie_dossier_path(dossier)
diff --git a/config/locales/en.yml b/config/locales/en.yml
index fd58c6d50..008719000 100644
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -34,7 +34,6 @@ en:
     sentence_for_humans: 'If you are a human, ignore this field'
   help: 'Help'
   help_dropdown:
-    general_title: "A problem with the website? Find your answer in the online help."
     procedure_title: "Do you have a question about this procedure?"
     problem_title: A problem with the website?
     problem_description: Find your answer in the online help.
diff --git a/config/locales/fr.yml b/config/locales/fr.yml
index 8a81603a7..4cbb3459b 100644
--- a/config/locales/fr.yml
+++ b/config/locales/fr.yml
@@ -24,7 +24,6 @@ fr:
     sentence_for_humans: 'Si vous êtes un humain, laissez ce champ vide'
   help: 'Aide'
   help_dropdown:
-    general_title: "Un problème avec le site ? Trouvez votre réponse dans l’aide en ligne."
     procedure_title: "Une question sur cette démarche ?"
     problem_title: Un problème avec le site ?
     problem_description: Trouvez votre réponse dans l’aide en ligne.