Merge pull request #787 from sgmap/header-wording

Header wording
This commit is contained in:
gregoirenovel 2017-10-05 15:57:08 +02:00 committed by GitHub
commit f9d9ee41f7
3 changed files with 4 additions and 4 deletions

View file

@ -8,6 +8,6 @@
%li{ class: current_page?(avis_path(avis)) ? 'active' : nil } %li{ class: current_page?(avis_path(avis)) ? 'active' : nil }
= link_to 'Demande', avis_path(avis) = link_to 'Demande', avis_path(avis)
%li{ class: current_page?(instruction_avis_path(avis)) ? 'active' : nil } %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 } %li{ class: current_page?(messagerie_avis_path(avis)) ? 'active' : nil }
= link_to 'Messagerie', messagerie_avis_path(avis) = link_to 'Messagerie', messagerie_avis_path(avis)

View file

@ -18,11 +18,11 @@
%li{ class: current_page?(annotations_privees_dossier_path(dossier.procedure, dossier)) ? 'active' : nil } %li{ class: current_page?(annotations_privees_dossier_path(dossier.procedure, dossier)) ? 'active' : nil }
- if notifications_summary[:annotations_privees] - if notifications_summary[:annotations_privees]
%span.notifications{ 'aria-label': 'notifications' } %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 } %li{ class: current_page?(avis_dossier_path(dossier.procedure, dossier)) ? 'active' : nil }
- if notifications_summary[:avis] - if notifications_summary[:avis]
%span.notifications{ 'aria-label': 'notifications' } %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 } %li{ class: current_page?(messagerie_dossier_path(dossier.procedure, dossier)) ? 'active' : nil }
- if notifications_summary[:messagerie] - if notifications_summary[:messagerie]
%span.notifications{ 'aria-label': 'notifications' } %span.notifications{ 'aria-label': 'notifications' }

View file

@ -64,7 +64,7 @@ feature 'The gestionnaire part' do
click_on procedure.libelle click_on procedure.libelle
click_on dossier.user.email click_on dossier.user.email
click_on 'Avis Externes' click_on 'Avis externes'
expect(page).to have_current_path(avis_dossier_path(procedure, dossier)) expect(page).to have_current_path(avis_dossier_path(procedure, dossier))
expert_email = 'expert@tps.com' expert_email = 'expert@tps.com'