diff --git a/app/views/root/accessibilite.html.haml b/app/views/root/accessibilite.html.haml index 5ed1165dd..921bab63a 100644 --- a/app/views/root/accessibilite.html.haml +++ b/app/views/root/accessibilite.html.haml @@ -1,4 +1,6 @@ - content_for(:title, 'Accessibilité') +- content_for :footer do + = render partial: "root/footer" .accessibilite diff --git a/app/views/root/suivi.html.haml b/app/views/root/suivi.html.haml index 12f4a963b..4cd6e9dde 100644 --- a/app/views/root/suivi.html.haml +++ b/app/views/root/suivi.html.haml @@ -1,4 +1,6 @@ - content_for(:title, 'Suivi') +- content_for :footer do + = render partial: "root/footer" .suivi %h1.new-h1 Cookies déposés et configuration du suivi diff --git a/app/views/stats/index.html.haml b/app/views/stats/index.html.haml index 8e0167a84..6f60f2628 100644 --- a/app/views/stats/index.html.haml +++ b/app/views/stats/index.html.haml @@ -1,4 +1,6 @@ - content_for(:title, 'Statistiques') +- content_for :footer do + = render partial: "root/footer" .statistiques -# Load Chartkick lazily, by using our React lazy-loader. diff --git a/app/views/support/index.html.haml b/app/views/support/index.html.haml index 02dfa31c9..61d6302d8 100644 --- a/app/views/support/index.html.haml +++ b/app/views/support/index.html.haml @@ -1,4 +1,6 @@ - content_for(:title, 'Contact') +- content_for :footer do + = render partial: "root/footer" #contact-form .container diff --git a/app/views/users/dossiers/identite.html.haml b/app/views/users/dossiers/identite.html.haml index a180c1585..1e65a5123 100644 --- a/app/views/users/dossiers/identite.html.haml +++ b/app/views/users/dossiers/identite.html.haml @@ -12,8 +12,16 @@ %span.mandatory * champs requis - = f.label :gender, class: "required" - = f.select :gender, [Individual::GENDER_MALE, Individual::GENDER_FEMALE], {}, class: "small" + %fieldset + %legend + = f.label :gender, class: "required" + .radios + %label + = f.radio_button :gender, Individual::GENDER_MALE + = Individual::GENDER_MALE + %label + = f.radio_button :gender, Individual::GENDER_FEMALE + = Individual::GENDER_FEMALE .flex .inline-champ diff --git a/app/views/users/registrations/new.html.haml b/app/views/users/registrations/new.html.haml index 7a83cc034..e6602c9b5 100644 --- a/app/views/users/registrations/new.html.haml +++ b/app/views/users/registrations/new.html.haml @@ -20,7 +20,7 @@ Non = f.label :password, "Mot de passe" - = f.password_field :password, value: @user.password, placeholder: "8 caractères minimum" + = f.password_field :password, value: @user.password, placeholder: "8 caractères minimum", 'aria-describedby':'8 caractères minimum' = f.submit "Créer un compte", class: "button large primary expand" diff --git a/config/initializers/urls.rb b/config/initializers/urls.rb index 00b747247..6207c799a 100644 --- a/config/initializers/urls.rb +++ b/config/initializers/urls.rb @@ -18,7 +18,7 @@ CADRE_JURIDIQUE_URL = [DOC_URL, "tutoriels/video-le-cadre-juridique"].join("/") WEBINAIRE_URL = "https://app.livestorm.co/demarches-simplifiees" LISTE_DES_DEMARCHES_URL = [DOC_URL, "listes-des-demarches"].join("/") CGU_URL = [DOC_URL, "cgu"].join("/") -MENTIONS_LEGALES_URL = [CGU_URL, "4-mentions-legales"].join("#") +MENTIONS_LEGALES_URL = [DOC_URL, "mentions-legales"].join("/") API_DOC_URL = [DOC_URL, "pour-aller-plus-loin", "api"].join("/") WEBHOOK_DOC_URL = [DOC_URL, "pour-aller-plus-loin", "webhook"].join("/") FAQ_URL = "https://faq.demarches-simplifiees.fr" diff --git a/spec/features/routing/full_scenario_spec.rb b/spec/features/routing/full_scenario_spec.rb index b1bdb5c70..0401a8ade 100644 --- a/spec/features/routing/full_scenario_spec.rb +++ b/spec/features/routing/full_scenario_spec.rb @@ -189,6 +189,7 @@ feature 'The routing', js: true do visit commencer_path(path: procedure.reload.path) click_on 'Commencer la démarche' + choose 'M.' fill_in 'individual_nom', with: 'Nom' fill_in 'individual_prenom', with: 'Prenom' click_button('Continuer') diff --git a/spec/features/users/brouillon_spec.rb b/spec/features/users/brouillon_spec.rb index 42bd5ec3c..af96dc834 100644 --- a/spec/features/users/brouillon_spec.rb +++ b/spec/features/users/brouillon_spec.rb @@ -282,6 +282,7 @@ feature 'The user' do end def fill_individual + choose 'M.' fill_in('individual_prenom', with: 'prenom') fill_in('individual_nom', with: 'nom') click_on 'Continuer' diff --git a/spec/features/users/dossier_creation_spec.rb b/spec/features/users/dossier_creation_spec.rb index e54228974..b15f6ece0 100644 --- a/spec/features/users/dossier_creation_spec.rb +++ b/spec/features/users/dossier_creation_spec.rb @@ -22,6 +22,7 @@ feature 'Creating a new dossier:' do expect(page).to have_current_path identite_dossier_path(user.reload.dossiers.last) expect(page).to have_procedure_description(procedure) + choose 'M.' fill_in 'individual_nom', with: 'Nom' fill_in 'individual_prenom', with: 'Prenom' end diff --git a/spec/features/users/linked_dropdown_spec.rb b/spec/features/users/linked_dropdown_spec.rb index 87fd9d73b..1b088a0d0 100644 --- a/spec/features/users/linked_dropdown_spec.rb +++ b/spec/features/users/linked_dropdown_spec.rb @@ -62,6 +62,7 @@ feature 'linked dropdown lists' do end def fill_individual + choose 'M.' fill_in('individual_prenom', with: 'prenom') fill_in('individual_nom', with: 'nom') click_on 'Continuer'