From 002ccf3552749ba07a3d0b26b0ce4cf7fa85ff64 Mon Sep 17 00:00:00 2001 From: gregoirenovel Date: Thu, 5 Oct 2017 15:39:10 +0200 Subject: [PATCH 1/2] In the Avis header, the Instruction tab is now Avis --- app/views/new_gestionnaire/avis/_header.html.haml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/views/new_gestionnaire/avis/_header.html.haml b/app/views/new_gestionnaire/avis/_header.html.haml index 1933d5a71..c8ffedf7e 100644 --- a/app/views/new_gestionnaire/avis/_header.html.haml +++ b/app/views/new_gestionnaire/avis/_header.html.haml @@ -8,6 +8,6 @@ %li{ class: current_page?(avis_path(avis)) ? 'active' : nil } = link_to 'Demande', avis_path(avis) %li{ class: current_page?(instruction_avis_path(avis)) ? 'active' : nil } - = link_to 'Instruction', instruction_avis_path(avis) + = link_to 'Avis', instruction_avis_path(avis) %li{ class: current_page?(messagerie_avis_path(avis)) ? 'active' : nil } = link_to 'Messagerie', messagerie_avis_path(avis) From 044e0e69b83cf461cac4aa22c0e135d654e2a318 Mon Sep 17 00:00:00 2001 From: gregoirenovel Date: Thu, 5 Oct 2017 15:39:41 +0200 Subject: [PATCH 2/2] Normalize the capitalisation of tab names in the Accompagnateur header --- app/views/new_gestionnaire/dossiers/_header.html.haml | 4 ++-- spec/features/new_gestionnaire/gestionnaire_spec.rb | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/app/views/new_gestionnaire/dossiers/_header.html.haml b/app/views/new_gestionnaire/dossiers/_header.html.haml index 2321f44aa..c25a332b6 100644 --- a/app/views/new_gestionnaire/dossiers/_header.html.haml +++ b/app/views/new_gestionnaire/dossiers/_header.html.haml @@ -18,11 +18,11 @@ %li{ class: current_page?(annotations_privees_dossier_path(dossier.procedure, dossier)) ? 'active' : nil } - if notifications_summary[:annotations_privees] %span.notifications{ 'aria-label': 'notifications' } - = link_to "Annotations Privées", annotations_privees_dossier_path(dossier.procedure, dossier) + = link_to "Annotations privées", annotations_privees_dossier_path(dossier.procedure, dossier) %li{ class: current_page?(avis_dossier_path(dossier.procedure, dossier)) ? 'active' : nil } - if notifications_summary[:avis] %span.notifications{ 'aria-label': 'notifications' } - = link_to "Avis Externes", avis_dossier_path(dossier.procedure, dossier) + = link_to "Avis externes", avis_dossier_path(dossier.procedure, dossier) %li{ class: current_page?(messagerie_dossier_path(dossier.procedure, dossier)) ? 'active' : nil } - if notifications_summary[:messagerie] %span.notifications{ 'aria-label': 'notifications' } diff --git a/spec/features/new_gestionnaire/gestionnaire_spec.rb b/spec/features/new_gestionnaire/gestionnaire_spec.rb index eef94239e..85f8ceff3 100644 --- a/spec/features/new_gestionnaire/gestionnaire_spec.rb +++ b/spec/features/new_gestionnaire/gestionnaire_spec.rb @@ -64,7 +64,7 @@ feature 'The gestionnaire part' do click_on procedure.libelle click_on dossier.user.email - click_on 'Avis Externes' + click_on 'Avis externes' expect(page).to have_current_path(avis_dossier_path(procedure, dossier)) expert_email = 'expert@tps.com'