Merge pull request #9557 from mfo/US/fix-ui-quirks

correctif(design): certains formulaire ne respectaient pas la chartre du DSFR

app/views/france_connect/particulier/merge.html.haml

@@ -22,15 +22,15 @@
     = form_tag france_connect_particulier_merge_with_existing_account_path, data: { turbo: true }, class: 'mt-2 form fconnect-form' do
       = hidden_field_tag :merge_token, @fci.merge_token, id: dom_id(@fci, :fusion_merge_token)
       = hidden_field_tag :email, @fci.email_france_connect, id: dom_id(@fci, :fusion_email)
-
+      .fr-input-group
-      = label_tag :password, t('views.registrations.new.password_label', min_length: 8)
+        = label_tag :password, t('views.registrations.new.password_label', min_length: 8), class: 'fr-label'
-      = password_field_tag :password, nil, autocomplete: 'current-password', class: 'mb-1'
+        = password_field_tag :password, nil, autocomplete: 'current-password', class: 'mb-1 fr-input'
       .mb-2
         = t('views.users.sessions.new.reset_password')
         = link_to france_connect_particulier_resend_and_renew_merge_confirmation_path(merge_token: @fci.merge_token), method: :post do
           = t('.link_confirm_by_email')
 
-      = submit_tag t('.button_merge'), class: 'button primary'
+      = submit_tag t('.button_merge'), class: 'fr-btn'
 
 
   .new-account.hidden

app/views/users/confirmations/new.html.haml

@@ -26,13 +26,11 @@
     .confirmation-resend
       %p Si vous n’avez pas reçu notre message (avez-vous vérifié les indésirables ?), nous pouvons vous le renvoyer.
 
-      = form_for(resource, as: resource_name, url: confirmation_path(resource_name), html: { class: 'form' }) do |f|
+      = form_for(resource, as: resource_name, url: confirmation_path(resource_name)) do |f|
-        = f.label :email, 'Votre email'
+        = render Dsfr::InputComponent.new(form: f, attribute: :email, input_type: :email_field, opts: { autofocus: true })
-        %br
+        = f.submit 'Renvoyer un email de confirmation', class: 'fr-btn'
-        = f.email_field :email, placeholder: 'Email', class: 'small', autofocus: true
-        = f.submit 'Renvoyer un email de confirmation', class: 'button'
 
-      %p
+      %p.fr-mt-3w
         Vous pouvez également consulter notre
         = link_to(t("links.common.faq.label"), t("links.common.faq.email_non_recu_url"), title: new_tab_suffix(t("links.common.faq.title")), **external_link_attributes)
         \.

app/views/users/profil/show.html.haml

@@ -48,8 +48,15 @@
       .card-title= t('.transfer_title')
       = t('.transfer_explication_html')
 
-      = form_tag transfer_all_dossiers_path, class: 'form'  do
+      = form_tag transfer_all_dossiers_path  do
-        = email_field_tag :next_owner, nil, required: true
+        .fr-input-group
+          = label_tag 'next_owner', class: "fr-label"  do
+            = t('.transfer_next_owner_label')
+            = render EditableChamp::AsteriskMandatoryComponent.new
+            %span.fr-hint-text= t('activerecord.attributes.user.hints.email')
+
+          = email_field_tag :next_owner, nil, required: true, id: 'next_owner', class: 'fr-input'
+
         = submit_tag t('.transfer_my_files'), class: 'fr-btn fr-btn--secondary', data: { confirm: t('.transfer_confirmation') }
 
       - if @waiting_transfers.present?

config/locales/views/users/profil/en.yml

@@ -8,8 +8,8 @@ en:
         new_email_address: New email address
         change_address: Change my address
         transfer_title: Transfer all your files
-        transfer_explication_html: "<p>This feature allows you to change the owner of all your files. This is usually useful when changing jobs or if you want to merge several accounts.</p>
+        transfer_explication_html: "<p>This feature allows you to change the owner of all your files. This is usually useful when changing jobs or if you want to merge several accounts.</p>"
-    <p>Email address of the recipient of all your files</p>"
+        transfer_next_owner_label: "Email of the next owner of your files"
         waiting_transfers: "Pending Transfers :"
         one_waiting_transfer:
           one: "The new owner %{email} must confirm the transfer of a file by following the instructions received in their email."

config/locales/views/users/profil/fr.yml

@@ -8,8 +8,8 @@ fr:
         your_email: Votre email est actuellement
         change_address: Changer mon adresse
         transfer_title: Transférer tous vos dossiers
-        transfer_explication_html: "<p>Cette fonctionnalité vous permet de changer le propriétaire de tous vos dossiers. C’est généralement utile lors d’un changement de poste ou si vous souhaitez fusionner plusieurs comptes.</p>
+        transfer_explication_html: "<p>Cette fonctionnalité vous permet de changer le propriétaire de tous vos dossiers. C’est généralement utile lors d’un changement de poste ou si vous souhaitez fusionner plusieurs comptes.</p>"
-    <p>Adresse email du destinataire de tous vos dossiers</p>"
+        transfer_next_owner_label: "Adresse électronique du prochain propriétaire de tous vos dossiers"
         waiting_transfers: "Transfert en attente :"
         one_waiting_transfer:
           one: "Le nouveau propriétaire %{email} doit confirmer le transfert d’un dossier en suivant les instructions reçues dans son mail."