diff --git a/app/views/france_connect/particulier/merge.html.haml b/app/views/france_connect/particulier/merge.html.haml index aeb4ec2bb..a32ee84c9 100644 --- a/app/views/france_connect/particulier/merge.html.haml +++ b/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) - - = label_tag :password, t('views.registrations.new.password_label', min_length: 8) - = password_field_tag :password, nil, autocomplete: 'current-password', class: 'mb-1' + .fr-input-group + = 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 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 diff --git a/app/views/users/confirmations/new.html.haml b/app/views/users/confirmations/new.html.haml index 2abd83f3f..dd0fba759 100644 --- a/app/views/users/confirmations/new.html.haml +++ b/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| - = f.label :email, 'Votre email' - %br - = f.email_field :email, placeholder: 'Email', class: 'small', autofocus: true - = f.submit 'Renvoyer un email de confirmation', class: 'button' + = form_for(resource, as: resource_name, url: confirmation_path(resource_name)) do |f| + = render Dsfr::InputComponent.new(form: f, attribute: :email, input_type: :email_field, opts: { autofocus: true }) + = f.submit 'Renvoyer un email de confirmation', class: 'fr-btn' - %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) \. diff --git a/app/views/users/profil/show.html.haml b/app/views/users/profil/show.html.haml index 6aed93abb..a9a4703ba 100644 --- a/app/views/users/profil/show.html.haml +++ b/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 - = email_field_tag :next_owner, nil, required: true + = form_tag transfer_all_dossiers_path do + .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? diff --git a/config/locales/views/users/profil/en.yml b/config/locales/views/users/profil/en.yml index fd072e3cb..04e61e67a 100644 --- a/config/locales/views/users/profil/en.yml +++ b/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: "

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.

-

Email address of the recipient of all your files

" + transfer_explication_html: "

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.

" + 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." diff --git a/config/locales/views/users/profil/fr.yml b/config/locales/views/users/profil/fr.yml index 89181672b..632ce4806 100644 --- a/config/locales/views/users/profil/fr.yml +++ b/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: "

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.

-

Adresse email du destinataire de tous vos dossiers

" + transfer_explication_html: "

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.

" + 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."