From e0ea60546083711448ac475fa8e0abcdc4199bc3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Chai=CC=88b=20Martinez?= Date: Thu, 18 Oct 2018 18:21:59 +0200 Subject: [PATCH 1/3] [Fix #2877] Modification du titre contact dans le menu instructeur --- app/views/layouts/_new_header.haml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/views/layouts/_new_header.haml b/app/views/layouts/_new_header.haml index 0a951df0f..5f8dd10de 100644 --- a/app/views/layouts/_new_header.haml +++ b/app/views/layouts/_new_header.haml @@ -23,7 +23,7 @@ %span.badge.warning= avis_counter %li .tab-link.contact-link - Contact + Aide .contact-details Vous avez besoin d’aide ? Contactez-nous : %br From 0ae8c1d7194e0e65d7bf2ed735c76c1da2da6f16 Mon Sep 17 00:00:00 2001 From: gregoirenovel Date: Thu, 18 Oct 2018 18:24:45 +0200 Subject: [PATCH 2/3] [Fix #2880] Do not show our phone number to instructeurs --- app/views/layouts/_new_header.haml | 9 ++------- spec/views/layouts/_new_header_spec.rb | 2 +- 2 files changed, 3 insertions(+), 8 deletions(-) diff --git a/app/views/layouts/_new_header.haml b/app/views/layouts/_new_header.haml index 5f8dd10de..62939959e 100644 --- a/app/views/layouts/_new_header.haml +++ b/app/views/layouts/_new_header.haml @@ -25,13 +25,8 @@ .tab-link.contact-link Aide .contact-details - Vous avez besoin d’aide ? Contactez-nous : - %br - – par téléphone : - = link_to CONTACT_PHONE, "tel:#{CONTACT_PHONE}" - %br - – par email : - = contact_link CONTACT_EMAIL + Vous avez besoin d’aide ? Contactez-nous + = contact_link("par email") - if nav_bar_profile == :user %ul.header-tabs diff --git a/spec/views/layouts/_new_header_spec.rb b/spec/views/layouts/_new_header_spec.rb index 5e7b5ee9e..9c81e7118 100644 --- a/spec/views/layouts/_new_header_spec.rb +++ b/spec/views/layouts/_new_header_spec.rb @@ -27,7 +27,7 @@ describe 'layouts/_new_header.html.haml', type: :view do it "displays the contact infos" do expect(rendered).to have_text("Contact") - expect(rendered).to have_link(CONTACT_EMAIL, href: contact_url) + expect(rendered).to have_link("par email", href: contact_url) end end end From f47aab8ce61aa02f9a0139e9d17d514fde404146 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Chai=CC=88b=20Martinez?= Date: Thu, 18 Oct 2018 18:25:46 +0200 Subject: [PATCH 3/3] Improve the help CTA message for instructeurs --- app/views/layouts/_new_header.haml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/views/layouts/_new_header.haml b/app/views/layouts/_new_header.haml index 62939959e..4b2da6288 100644 --- a/app/views/layouts/_new_header.haml +++ b/app/views/layouts/_new_header.haml @@ -25,7 +25,7 @@ .tab-link.contact-link Aide .contact-details - Vous avez besoin d’aide ? Contactez-nous + Besoin d’aide technique ? Contactez-nous = contact_link("par email") - if nav_bar_profile == :user