From b1584ff739cfc570481bff80179395852a157c51 Mon Sep 17 00:00:00 2001 From: Mathieu Magnin Date: Thu, 8 Mar 2018 23:03:58 +0100 Subject: [PATCH 1/3] fix target _blank --- app/views/root/landing.html.haml | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/app/views/root/landing.html.haml b/app/views/root/landing.html.haml index bf1d1348e..2ac59c85a 100644 --- a/app/views/root/landing.html.haml +++ b/app/views/root/landing.html.haml @@ -156,36 +156,36 @@ %ul.users %li.user - %a{ :href => "https://www.ecologique-solidaire.gouv.fr/", :target => "_blank " } + = link_to "https://www.ecologique-solidaire.gouv.fr/", target: :blank do %img.user-image{ :src => image_url("landing/users/mtes.jpg"), alt: "Ministère de la Transition Écologique et Solidaire" } %li.user - %a{ :href => "https://www.iledefrance.fr/", :target => "_blank " } + = link_to "https://www.iledefrance.fr/", target: :blank do %img.user-image{ :src => image_url("landing/users/region-idf.jpg"), alt: "Région Île-de-France" } %li.user - %a{ :href => "http://www.artisanat.fr/", :target => "_blank " } + = link_to "http://www.artisanat.fr/", target: :blank do %img.user-image{ :src => image_url("landing/users/chambres-de-metiers.jpg"), alt: "Chambres des Métiers et de l'Artisanat" } %li.user - %a{ :href => "http://www.cci.fr/", :target => "_blank " } + = link_to "http://www.cci.fr/", target: :blank do %img.user-image{ :src => image_url("landing/users/cci.jpg"), alt: "CCI de France" } %li.user - %a{ :href => "http://www.driea.ile-de-france.developpement-durable.gouv.fr/", :target => "_blank " } + = link_to "http://www.driea.ile-de-france.developpement-durable.gouv.fr/", target: :blank do %img.user-image{ :src => image_url("landing/users/driea-idf.jpg"), alt: "Direction Régionale et Interdépartementale de l'Équipement et de l'Aménagement" } %ul.users %li.user - %a{ :href => "https://www.debatpublic.fr/", :target => "_blank " } + = link_to "https://www.debatpublic.fr/", target: :blank do %img.user-image{ :src => image_url("landing/users/cndp.jpg"), alt: "Commission Nationale du Débat Public" } %li.user - %a{ :href => "https://www.iledefrance.ars.sante.fr/", :target => "_blank " } + = link_to "https://www.iledefrance.ars.sante.fr/", target: :blank do %img.user-image{ :src => image_url("landing/users/ars-idf.jpg"), alt: "Agence Régionale de Santé d'Île-de-France" } %li.user - %a{ :href => "http://www.franceagrimer.fr/", :target => "_blank " } + = link_to "http://www.franceagrimer.fr/", target: :blank do %img.user-image{ :src => image_url("landing/users/france-agrimer.jpg"), alt: "FranceAgrimer" } %li.user - %a{ :href => "http://www.rhone.gouv.fr/", :target => "_blank " } + = link_to "http://www.rhone.gouv.fr/", target: :blank do %img.user-image{ :src => image_url("landing/users/prefecture-rhone.jpg"), alt: "Préfecture de la région Rhône-Alpes" } %li.user - %a{ :href => "http://www.lillemetropole.fr/", :target => "_blank " } + = link_to "http://www.lillemetropole.fr/", target: :blank do %img.user-image{ :src => image_url("landing/users/mel.jpg"), alt: "Métropole Européenne de Lille" } .landing-panel.cta-panel From df625f3b6c5c137046abf8902f2cdd6fcc38ae1d Mon Sep 17 00:00:00 2001 From: Mathieu Magnin Date: Thu, 8 Mar 2018 23:10:03 +0100 Subject: [PATCH 2/3] fix spaces in href --- app/views/root/landing.html.haml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/views/root/landing.html.haml b/app/views/root/landing.html.haml index 2ac59c85a..50e02717a 100644 --- a/app/views/root/landing.html.haml +++ b/app/views/root/landing.html.haml @@ -47,7 +47,7 @@ %p.role-panel-explanation Créez des formulaires en ligne en quelques minutes et instruisez les demandes des usagers sur une plateforme dédiée = link_to "Demander un compte", - "mailto:#{t("dynamics.contact_email")}?subject=Demande de compte administrateur demarches-simplifiees.fr", + "mailto:#{t("dynamics.contact_email")}?subject=Demande%20de%20compte%20administrateur%20demarches-simplifiees.fr", class: "role-panel-button-primary", target: "_blank", onclick: "javascript: ga('send', 'pageview', '/demander-une-demo')" @@ -196,6 +196,6 @@ %p.cta-panel-explanation Notre équipe est disponible pour vous renseigner et vous aider %div = link_to "Contactez-nous", - "mailto:#{t("dynamics.contact_email")}?subject=Question à propos de demarches-simplifiees.fr", + "mailto:#{t("dynamics.contact_email")}?subject=Question%20à%20propos%20de%20demarches-simplifiees.fr", class: "cta-panel-button-white", target: "_blank" From 5b07f59ffbb1e79714b2679f00cef79510dcdddf Mon Sep 17 00:00:00 2001 From: Mathieu Magnin Date: Thu, 8 Mar 2018 23:18:49 +0100 Subject: [PATCH 3/3] fix data tag without a value attribute --- app/views/layouts/_mailjet_newsletter.html.haml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/views/layouts/_mailjet_newsletter.html.haml b/app/views/layouts/_mailjet_newsletter.html.haml index ef5de8af3..0cf468a00 100644 --- a/app/views/layouts/_mailjet_newsletter.html.haml +++ b/app/views/layouts/_mailjet_newsletter.html.haml @@ -1,2 +1,2 @@ -%data.mj-w-data{ "data-apikey" => "1v5T", "data-base" => "https://app.mailjet.com", "data-height" => "328", "data-lang" => "fr_FR", "data-statics" => "statics", "data-token" => "11c89e7ddb46fbcdcb7f8fe5fdfca818", "data-w-id" => "39b", "data-width" => "640" } +%data.mj-w-data{ "data-apikey" => "1v5T", "data-base" => "https://app.mailjet.com", "data-height" => "328", "data-lang" => "fr_FR", "data-statics" => "statics", "data-token" => "11c89e7ddb46fbcdcb7f8fe5fdfca818", "data-w-id" => "39b", "data-width" => "640", "value" => "mj" } %script{ src: 'https://app.mailjet.com/statics/js/widget.modal.js', 'data-turbolinks-eval': 'false' }