From 657b9d2e93201043d0ddf1912d3cd8720b143c1c Mon Sep 17 00:00:00 2001 From: gregoirenovel Date: Mon, 12 Mar 2018 17:50:20 +0100 Subject: [PATCH 1/5] Change link to doc --- app/controllers/root_controller.rb | 2 +- app/views/layouts/_new_footer.html.haml | 4 ++-- app/views/root/landing.html.haml | 2 +- config/initializers/urls.rb | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/app/controllers/root_controller.rb b/app/controllers/root_controller.rb index 3e6031214..84f085b21 100644 --- a/app/controllers/root_controller.rb +++ b/app/controllers/root_controller.rb @@ -13,7 +13,7 @@ class RootController < ApplicationController end if Date.today < Date.new(2018, 03, 31) - flash.now.notice = ["Téléprocédures Simplifiées change de nom et devient demarches-simplifiees.fr, en savoir plus."] + flash.now.notice = ["Téléprocédures Simplifiées change de nom et devient demarches-simplifiees.fr, en savoir plus."] end render 'landing' diff --git a/app/views/layouts/_new_footer.html.haml b/app/views/layouts/_new_footer.html.haml index 874c6d66e..0698b05db 100644 --- a/app/views/layouts/_new_footer.html.haml +++ b/app/views/layouts/_new_footer.html.haml @@ -24,7 +24,7 @@ %li.footer-link = link_to "CGU", CGU_URL, :class => "footer-link", :target => "_blank" %li.footer-link - = link_to "Mentions légales", "https://tps.gitbooks.io/tps-documentation/content/conditions-generales-dutilisation.html#4-mentions-l%C3%A9gales", :class => "footer-link", :target => "_blank" + = link_to "Mentions légales", "https://demarches-simplifiees.gitbooks.io/demarches-simplifiees/content/conditions-generales-dutilisation.html#4-mentions-l%C3%A9gales", :class => "footer-link", :target => "_blank" %li.footer-column %ul.footer-links @@ -33,7 +33,7 @@ "mailto:#{t('dynamics.contact_email')}", :class => "footer-link" %li.footer-link - = link_to "Documentation", "https://tps.gitbooks.io/tps-documentation/content/", :class => "footer-link", :target => "_blank" + = link_to "Documentation", "https://demarches-simplifiees.gitbooks.io/demarches-simplifiees/content/", :class => "footer-link", :target => "_blank" %li.footer-link = link_to "Documentation de l'API", "/docs", :class => "footer-link", :target => "_blank" %li.footer-link diff --git a/app/views/root/landing.html.haml b/app/views/root/landing.html.haml index 50e02717a..67e7c867e 100644 --- a/app/views/root/landing.html.haml +++ b/app/views/root/landing.html.haml @@ -53,7 +53,7 @@ onclick: "javascript: ga('send', 'pageview', '/demander-une-demo')" = link_to "Voir la documentation", - "https://tps.gitbooks.io/tps-documentation/content/", + "https://demarches-simplifiees.gitbooks.io/demarches-simplifiees/content/", target: "_blank", class: "role-panel-button-secondary" diff --git a/config/initializers/urls.rb b/config/initializers/urls.rb index cf385571e..f74cf787d 100644 --- a/config/initializers/urls.rb +++ b/config/initializers/urls.rb @@ -4,4 +4,4 @@ else SIADEURL = 'https://staging.entreprise.api.gouv.fr' end -CGU_URL = "https://tps.gitbooks.io/tps-documentation/content/conditions-generales-dutilisation.html" +CGU_URL = "https://demarches-simplifiees.gitbooks.io/demarches-simplifiees/content/conditions-generales-dutilisation.html" From acc2ed56468c1406a2de45a1808dc32387f10855 Mon Sep 17 00:00:00 2001 From: gregoirenovel Date: Mon, 12 Mar 2018 18:08:48 +0100 Subject: [PATCH 2/5] Move CGU_URL to a new initializer --- config/initializers/constants.rb | 1 + config/initializers/urls.rb | 2 -- 2 files changed, 1 insertion(+), 2 deletions(-) create mode 100644 config/initializers/constants.rb diff --git a/config/initializers/constants.rb b/config/initializers/constants.rb new file mode 100644 index 000000000..3644b50cb --- /dev/null +++ b/config/initializers/constants.rb @@ -0,0 +1 @@ +CGU_URL = "https://demarches-simplifiees.gitbooks.io/demarches-simplifiees/content/conditions-generales-dutilisation.html" diff --git a/config/initializers/urls.rb b/config/initializers/urls.rb index f74cf787d..7bc572d7d 100644 --- a/config/initializers/urls.rb +++ b/config/initializers/urls.rb @@ -3,5 +3,3 @@ if Rails.env.production? else SIADEURL = 'https://staging.entreprise.api.gouv.fr' end - -CGU_URL = "https://demarches-simplifiees.gitbooks.io/demarches-simplifiees/content/conditions-generales-dutilisation.html" From 53ad9d361180e538af2d7a46b9d86819da755a60 Mon Sep 17 00:00:00 2001 From: gregoirenovel Date: Tue, 13 Mar 2018 11:24:12 +0100 Subject: [PATCH 3/5] [Fix #1591] Add rel attribute to target blank links --- app/controllers/root_controller.rb | 2 +- app/views/layouts/_new_footer.html.haml | 10 +++++----- app/views/root/landing.html.haml | 25 ++++++++++++++----------- 3 files changed, 20 insertions(+), 17 deletions(-) diff --git a/app/controllers/root_controller.rb b/app/controllers/root_controller.rb index 84f085b21..6888a1770 100644 --- a/app/controllers/root_controller.rb +++ b/app/controllers/root_controller.rb @@ -13,7 +13,7 @@ class RootController < ApplicationController end if Date.today < Date.new(2018, 03, 31) - flash.now.notice = ["Téléprocédures Simplifiées change de nom et devient demarches-simplifiees.fr, en savoir plus."] + flash.now.notice = ["Téléprocédures Simplifiées change de nom et devient demarches-simplifiees.fr, en savoir plus."] end render 'landing' diff --git a/app/views/layouts/_new_footer.html.haml b/app/views/layouts/_new_footer.html.haml index 0698b05db..da94e6f41 100644 --- a/app/views/layouts/_new_footer.html.haml +++ b/app/views/layouts/_new_footer.html.haml @@ -22,9 +22,9 @@ %li.footer-link = link_to "Statistiques", stats_path, :class => "footer-link" %li.footer-link - = link_to "CGU", CGU_URL, :class => "footer-link", :target => "_blank" + = link_to "CGU", CGU_URL, :class => "footer-link", :target => "_blank", rel: "noopener noreferrer" %li.footer-link - = link_to "Mentions légales", "https://demarches-simplifiees.gitbooks.io/demarches-simplifiees/content/conditions-generales-dutilisation.html#4-mentions-l%C3%A9gales", :class => "footer-link", :target => "_blank" + = link_to "Mentions légales", "https://demarches-simplifiees.gitbooks.io/demarches-simplifiees/content/conditions-generales-dutilisation.html#4-mentions-l%C3%A9gales", :class => "footer-link", :target => "_blank", rel: "noopener noreferrer" %li.footer-column %ul.footer-links @@ -33,10 +33,10 @@ "mailto:#{t('dynamics.contact_email')}", :class => "footer-link" %li.footer-link - = link_to "Documentation", "https://demarches-simplifiees.gitbooks.io/demarches-simplifiees/content/", :class => "footer-link", :target => "_blank" + = link_to "Documentation", "https://demarches-simplifiees.gitbooks.io/demarches-simplifiees/content/", :class => "footer-link", :target => "_blank", rel: "noopener noreferrer" %li.footer-link - = link_to "Documentation de l'API", "/docs", :class => "footer-link", :target => "_blank" + = link_to "Documentation de l'API", "/docs", :class => "footer-link", :target => "_blank", rel: "noopener noreferrer" %li.footer-link - = link_to "FAQ", "http://demarches-simplifiees.helpscoutdocs.com/", :class => "footer-link", :target => "_blank" + = link_to "FAQ", "http://demarches-simplifiees.helpscoutdocs.com/", :class => "footer-link", :target => "_blank", rel: "noopener noreferrer" %li.footer-link = link_to "Accessibilité", accessibilite_index_path, :class => "footer-link" diff --git a/app/views/root/landing.html.haml b/app/views/root/landing.html.haml index 67e7c867e..28420a47d 100644 --- a/app/views/root/landing.html.haml +++ b/app/views/root/landing.html.haml @@ -50,11 +50,13 @@ "mailto:#{t("dynamics.contact_email")}?subject=Demande%20de%20compte%20administrateur%20demarches-simplifiees.fr", class: "role-panel-button-primary", target: "_blank", + rel: "noopener noreferrer", onclick: "javascript: ga('send', 'pageview', '/demander-une-demo')" = link_to "Voir la documentation", "https://demarches-simplifiees.gitbooks.io/demarches-simplifiees/content/", target: "_blank", + rel: "noopener noreferrer", class: "role-panel-button-secondary" .landing-panel.admins-panel @@ -156,36 +158,36 @@ %ul.users %li.user - = link_to "https://www.ecologique-solidaire.gouv.fr/", target: :blank do + = link_to "https://www.ecologique-solidaire.gouv.fr/", target: :blank, rel: "noopener noreferrer" do %img.user-image{ :src => image_url("landing/users/mtes.jpg"), alt: "Ministère de la Transition Écologique et Solidaire" } %li.user - = link_to "https://www.iledefrance.fr/", target: :blank do + = link_to "https://www.iledefrance.fr/", target: :blank, rel: "noopener noreferrer" do %img.user-image{ :src => image_url("landing/users/region-idf.jpg"), alt: "Région Île-de-France" } %li.user - = link_to "http://www.artisanat.fr/", target: :blank do + = link_to "http://www.artisanat.fr/", target: :blank, rel: "noopener noreferrer" do %img.user-image{ :src => image_url("landing/users/chambres-de-metiers.jpg"), alt: "Chambres des Métiers et de l'Artisanat" } %li.user - = link_to "http://www.cci.fr/", target: :blank do + = link_to "http://www.cci.fr/", target: :blank, rel: "noopener noreferrer" do %img.user-image{ :src => image_url("landing/users/cci.jpg"), alt: "CCI de France" } %li.user - = link_to "http://www.driea.ile-de-france.developpement-durable.gouv.fr/", target: :blank do + = link_to "http://www.driea.ile-de-france.developpement-durable.gouv.fr/", target: :blank, rel: "noopener noreferrer" 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 - = link_to "https://www.debatpublic.fr/", target: :blank do + = link_to "https://www.debatpublic.fr/", target: :blank, rel: "noopener noreferrer" do %img.user-image{ :src => image_url("landing/users/cndp.jpg"), alt: "Commission Nationale du Débat Public" } %li.user - = link_to "https://www.iledefrance.ars.sante.fr/", target: :blank do + = link_to "https://www.iledefrance.ars.sante.fr/", target: :blank, rel: "noopener noreferrer" do %img.user-image{ :src => image_url("landing/users/ars-idf.jpg"), alt: "Agence Régionale de Santé d'Île-de-France" } %li.user - = link_to "http://www.franceagrimer.fr/", target: :blank do + = link_to "http://www.franceagrimer.fr/", target: :blank, rel: "noopener noreferrer" do %img.user-image{ :src => image_url("landing/users/france-agrimer.jpg"), alt: "FranceAgrimer" } %li.user - = link_to "http://www.rhone.gouv.fr/", target: :blank do + = link_to "http://www.rhone.gouv.fr/", target: :blank, rel: "noopener noreferrer" do %img.user-image{ :src => image_url("landing/users/prefecture-rhone.jpg"), alt: "Préfecture de la région Rhône-Alpes" } %li.user - = link_to "http://www.lillemetropole.fr/", target: :blank do + = link_to "http://www.lillemetropole.fr/", target: :blank, rel: "noopener noreferrer" do %img.user-image{ :src => image_url("landing/users/mel.jpg"), alt: "Métropole Européenne de Lille" } .landing-panel.cta-panel @@ -198,4 +200,5 @@ = link_to "Contactez-nous", "mailto:#{t("dynamics.contact_email")}?subject=Question%20à%20propos%20de%20demarches-simplifiees.fr", class: "cta-panel-button-white", - target: "_blank" + target: "_blank", + rel: "noopener noreferrer" From 092df8e8af6c1afa057bcbe71463086458fe9c6b Mon Sep 17 00:00:00 2001 From: gregoirenovel Date: Tue, 13 Mar 2018 17:15:48 +0100 Subject: [PATCH 4/5] Change a reply_to email address equipe@ is an internal email address --- app/mailers/administration_mailer.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/mailers/administration_mailer.rb b/app/mailers/administration_mailer.rb index 602366696..a7954908c 100644 --- a/app/mailers/administration_mailer.rb +++ b/app/mailers/administration_mailer.rb @@ -13,7 +13,7 @@ class AdministrationMailer < ApplicationMailer @reset_password_token = reset_password_token mail(to: admin.email, subject: "demarches-simplifiees.fr - Activez votre compte administrateur", - reply_to: "equipe@demarches-simplifiees.fr") + reply_to: "contact@demarches-simplifiees.fr") end def dubious_procedures(procedures_and_type_de_champs) From 734950f36b1453ee5183705bff1010fba61432fe Mon Sep 17 00:00:00 2001 From: Mathieu Magnin Date: Wed, 14 Mar 2018 11:33:20 +0100 Subject: [PATCH 5/5] [Fix #1609] Fix buttons on 2 lines --- .../new_design/accompagnateur.scss | 22 +++++++++++-------- 1 file changed, 13 insertions(+), 9 deletions(-) diff --git a/app/assets/stylesheets/new_design/accompagnateur.scss b/app/assets/stylesheets/new_design/accompagnateur.scss index 1a33af65c..d5538c10b 100644 --- a/app/assets/stylesheets/new_design/accompagnateur.scss +++ b/app/assets/stylesheets/new_design/accompagnateur.scss @@ -30,16 +30,20 @@ } } -.mixed-buttons-bar .button { - // Needed so that buttons without text - // are ligned with those that have text - vertical-align: top; -} +.mixed-buttons-bar { + flex-shrink: 0; -.mixed-buttons-bar .label { - padding: $default-spacer $default-padding; - font-size: 14px; - line-height: 20px; + .button { + // Needed so that buttons without text + // are ligned with those that have text + vertical-align: top; + } + + .label { + padding: $default-spacer $default-padding; + font-size: 14px; + line-height: 20px; + } } .print-menu-opener {