From 5e2219416e588808fd2b60142af508e070a38af2 Mon Sep 17 00:00:00 2001 From: gregoirenovel Date: Tue, 22 May 2018 17:12:17 +0200 Subject: [PATCH 1/9] Add the DOC_URL constant --- app/views/administration_mailer/invite_admin.html.haml | 2 +- app/views/gestionnaire_mailer/invite_gestionnaire.html.haml | 2 +- app/views/layouts/_new_footer.html.haml | 2 +- app/views/root/landing.html.haml | 2 +- config/initializers/constants.rb | 1 + 5 files changed, 5 insertions(+), 4 deletions(-) diff --git a/app/views/administration_mailer/invite_admin.html.haml b/app/views/administration_mailer/invite_admin.html.haml index dfbf0cb3c..49be915cd 100644 --- a/app/views/administration_mailer/invite_admin.html.haml +++ b/app/views/administration_mailer/invite_admin.html.haml @@ -16,7 +16,7 @@ Vous pouvez me joindre au numéro suivant : 01 76 42 02 87. %br %br Je vous invite également à consulter notre site de documentation qui regroupe l'ensemble des informations relatives à demarches-simplifiees.fr ainsi que des tutoriels d’utilisation : -= link_to('https://demarches-simplifiees.gitbook.io/demarches-simplifiees/', 'https://demarches-simplifiees.gitbook.io/demarches-simplifiees/') += link_to(DOC_URL, DOC_URL) %br %br = render partial: "layouts/mailers/bizdev_signature" diff --git a/app/views/gestionnaire_mailer/invite_gestionnaire.html.haml b/app/views/gestionnaire_mailer/invite_gestionnaire.html.haml index 3b5fa28d3..56d39d440 100644 --- a/app/views/gestionnaire_mailer/invite_gestionnaire.html.haml +++ b/app/views/gestionnaire_mailer/invite_gestionnaire.html.haml @@ -10,7 +10,7 @@ Votre compte a été créé pour l'adresse email #{@gestionnaire.email}. Pour l %br %br Par ailleurs, notre site de documentation qui regroupe l'ensemble des informations relatives à demarches-simplifiees.fr ainsi que des tutoriels d’utilisation est à votre disposition :  -= link_to('https://demarches-simplifiees.gitbook.io/demarches-simplifiees/', 'https://demarches-simplifiees.gitbook.io/demarches-simplifiees/') += link_to(DOC_URL, DOC_URL) %br %br Bonne journée, diff --git a/app/views/layouts/_new_footer.html.haml b/app/views/layouts/_new_footer.html.haml index 264c5c331..8eedebb7a 100644 --- a/app/views/layouts/_new_footer.html.haml +++ b/app/views/layouts/_new_footer.html.haml @@ -33,7 +33,7 @@ "mailto:#{t('dynamics.contact_email')}", :class => "footer-link" %li.footer-link - = link_to "Documentation", "https://demarches-simplifiees.gitbook.io/demarches-simplifiees/", :class => "footer-link", :target => "_blank", rel: "noopener noreferrer" + = link_to "Documentation", DOC_URL, :class => "footer-link", :target => "_blank", rel: "noopener noreferrer" %li.footer-link = link_to "Documentation de l'API", "/docs", :class => "footer-link", :target => "_blank", rel: "noopener noreferrer" %li.footer-link diff --git a/app/views/root/landing.html.haml b/app/views/root/landing.html.haml index f208b0a79..9aa8c71ed 100644 --- a/app/views/root/landing.html.haml +++ b/app/views/root/landing.html.haml @@ -74,7 +74,7 @@ onclick: "javascript: ga('send', 'pageview', '/demander-une-demo')" = link_to "Voir la documentation", - "https://demarches-simplifiees.gitbook.io/demarches-simplifiees/", + DOC_URL, target: "_blank", rel: "noopener noreferrer", class: "role-panel-button-secondary" diff --git a/config/initializers/constants.rb b/config/initializers/constants.rb index 95da3f7ed..360a8862e 100644 --- a/config/initializers/constants.rb +++ b/config/initializers/constants.rb @@ -1 +1,2 @@ +DOC_URL = "https://demarches-simplifiees.gitbook.io/demarches-simplifiees/" CGU_URL = "https://demarches-simplifiees.gitbook.io/demarches-simplifiees/cgu" From dc962f0c0a0286147609a99e12850eca3a1e97df Mon Sep 17 00:00:00 2001 From: gregoirenovel Date: Tue, 22 May 2018 17:12:51 +0200 Subject: [PATCH 2/9] Add LISTE_DES_DEMARCHES_URL --- app/views/root/landing.html.haml | 2 +- config/initializers/constants.rb | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/app/views/root/landing.html.haml b/app/views/root/landing.html.haml index 9aa8c71ed..f518b3086 100644 --- a/app/views/root/landing.html.haml +++ b/app/views/root/landing.html.haml @@ -51,7 +51,7 @@ class: "role-panel-button-primary" = link_to "Voir les démarches disponibles", - "https://demarches-simplifiees.gitbook.io/demarches-simplifiees/listes-des-demarches", + LISTE_DES_DEMARCHES_URL, target: "_blank", rel: "noopener noreferrer", class: "role-panel-button-secondary" diff --git a/config/initializers/constants.rb b/config/initializers/constants.rb index 360a8862e..a6ab22e05 100644 --- a/config/initializers/constants.rb +++ b/config/initializers/constants.rb @@ -1,2 +1,3 @@ DOC_URL = "https://demarches-simplifiees.gitbook.io/demarches-simplifiees/" +LISTE_DES_DEMARCHES_URL = "https://demarches-simplifiees.gitbook.io/demarches-simplifiees/listes-des-demarches" CGU_URL = "https://demarches-simplifiees.gitbook.io/demarches-simplifiees/cgu" From 5126503cfc8592086b56151b12ab4c80cec2edbd Mon Sep 17 00:00:00 2001 From: gregoirenovel Date: Tue, 22 May 2018 17:13:30 +0200 Subject: [PATCH 3/9] Add MENTIONS_LEGALES_URL --- app/views/layouts/_new_footer.html.haml | 2 +- config/initializers/constants.rb | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/app/views/layouts/_new_footer.html.haml b/app/views/layouts/_new_footer.html.haml index 8eedebb7a..3568a88ac 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", rel: "noopener noreferrer" %li.footer-link - = link_to "Mentions légales", "https://demarches-simplifiees.gitbook.io/demarches-simplifiees/cgu#4.-mentions-legales", :class => "footer-link", :target => "_blank", rel: "noopener noreferrer" + = link_to "Mentions légales", MENTIONS_LEGALES_URL, :class => "footer-link", :target => "_blank", rel: "noopener noreferrer" %li.footer-column %ul.footer-links diff --git a/config/initializers/constants.rb b/config/initializers/constants.rb index a6ab22e05..e4e9a50da 100644 --- a/config/initializers/constants.rb +++ b/config/initializers/constants.rb @@ -1,3 +1,4 @@ DOC_URL = "https://demarches-simplifiees.gitbook.io/demarches-simplifiees/" LISTE_DES_DEMARCHES_URL = "https://demarches-simplifiees.gitbook.io/demarches-simplifiees/listes-des-demarches" CGU_URL = "https://demarches-simplifiees.gitbook.io/demarches-simplifiees/cgu" +MENTIONS_LEGALES_URL = "https://demarches-simplifiees.gitbook.io/demarches-simplifiees/cgu#4.-mentions-legales" From 52d878fea85734a3baf52a3b139ecfa983dc66c8 Mon Sep 17 00:00:00 2001 From: gregoirenovel Date: Tue, 22 May 2018 17:16:09 +0200 Subject: [PATCH 4/9] Remove trailing slash from DOC_URL --- config/initializers/constants.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/config/initializers/constants.rb b/config/initializers/constants.rb index e4e9a50da..4a5920570 100644 --- a/config/initializers/constants.rb +++ b/config/initializers/constants.rb @@ -1,4 +1,4 @@ -DOC_URL = "https://demarches-simplifiees.gitbook.io/demarches-simplifiees/" +DOC_URL = "https://demarches-simplifiees.gitbook.io/demarches-simplifiees" LISTE_DES_DEMARCHES_URL = "https://demarches-simplifiees.gitbook.io/demarches-simplifiees/listes-des-demarches" CGU_URL = "https://demarches-simplifiees.gitbook.io/demarches-simplifiees/cgu" MENTIONS_LEGALES_URL = "https://demarches-simplifiees.gitbook.io/demarches-simplifiees/cgu#4.-mentions-legales" From b93ec30a2d4e88269e028b5cee1e66d5f9c6bc49 Mon Sep 17 00:00:00 2001 From: gregoirenovel Date: Tue, 22 May 2018 17:17:14 +0200 Subject: [PATCH 5/9] Make the GitBook URLs depend on DOC_URL --- config/initializers/constants.rb | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/config/initializers/constants.rb b/config/initializers/constants.rb index 4a5920570..963e7a9b8 100644 --- a/config/initializers/constants.rb +++ b/config/initializers/constants.rb @@ -1,4 +1,4 @@ DOC_URL = "https://demarches-simplifiees.gitbook.io/demarches-simplifiees" -LISTE_DES_DEMARCHES_URL = "https://demarches-simplifiees.gitbook.io/demarches-simplifiees/listes-des-demarches" -CGU_URL = "https://demarches-simplifiees.gitbook.io/demarches-simplifiees/cgu" -MENTIONS_LEGALES_URL = "https://demarches-simplifiees.gitbook.io/demarches-simplifiees/cgu#4.-mentions-legales" +LISTE_DES_DEMARCHES_URL = [DOC_URL, "listes-des-demarches"].join("/") +CGU_URL = [DOC_URL, "cgu"].join("/") +MENTIONS_LEGALES_URL = [CGU_URL, "4.-mentions-legales"].join("#") From 6ac8d6abf8fe9f8a68245e8651dee468fcade2b6 Mon Sep 17 00:00:00 2001 From: gregoirenovel Date: Tue, 22 May 2018 17:17:42 +0200 Subject: [PATCH 6/9] Update the DOC_URL --- config/initializers/constants.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/config/initializers/constants.rb b/config/initializers/constants.rb index 963e7a9b8..373660a54 100644 --- a/config/initializers/constants.rb +++ b/config/initializers/constants.rb @@ -1,4 +1,4 @@ -DOC_URL = "https://demarches-simplifiees.gitbook.io/demarches-simplifiees" +DOC_URL = "https://doc.demarches-simplifiees.fr" LISTE_DES_DEMARCHES_URL = [DOC_URL, "listes-des-demarches"].join("/") CGU_URL = [DOC_URL, "cgu"].join("/") MENTIONS_LEGALES_URL = [CGU_URL, "4.-mentions-legales"].join("#") From de201fca0476baacde48b5af3f5b92aedd73425b Mon Sep 17 00:00:00 2001 From: gregoirenovel Date: Tue, 22 May 2018 17:18:06 +0200 Subject: [PATCH 7/9] Add FAQ_URL --- app/views/layouts/_new_footer.html.haml | 2 +- config/initializers/constants.rb | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/app/views/layouts/_new_footer.html.haml b/app/views/layouts/_new_footer.html.haml index 3568a88ac..462609955 100644 --- a/app/views/layouts/_new_footer.html.haml +++ b/app/views/layouts/_new_footer.html.haml @@ -37,6 +37,6 @@ %li.footer-link = 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", rel: "noopener noreferrer" + = link_to "FAQ", FAQ_URL, :class => "footer-link", :target => "_blank", rel: "noopener noreferrer" %li.footer-link = link_to "Accessibilité", accessibilite_index_path, :class => "footer-link" diff --git a/config/initializers/constants.rb b/config/initializers/constants.rb index 373660a54..f9541e56f 100644 --- a/config/initializers/constants.rb +++ b/config/initializers/constants.rb @@ -2,3 +2,5 @@ DOC_URL = "https://doc.demarches-simplifiees.fr" LISTE_DES_DEMARCHES_URL = [DOC_URL, "listes-des-demarches"].join("/") CGU_URL = [DOC_URL, "cgu"].join("/") MENTIONS_LEGALES_URL = [CGU_URL, "4.-mentions-legales"].join("#") + +FAQ_URL = "http://demarches-simplifiees.helpscoutdocs.com/" From a98ab683aa641a10718e01188ba99c9d822bbe85 Mon Sep 17 00:00:00 2001 From: gregoirenovel Date: Tue, 22 May 2018 17:18:33 +0200 Subject: [PATCH 8/9] Update FAQ_URL --- config/initializers/constants.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/config/initializers/constants.rb b/config/initializers/constants.rb index f9541e56f..2a942a275 100644 --- a/config/initializers/constants.rb +++ b/config/initializers/constants.rb @@ -3,4 +3,4 @@ LISTE_DES_DEMARCHES_URL = [DOC_URL, "listes-des-demarches"].join("/") CGU_URL = [DOC_URL, "cgu"].join("/") MENTIONS_LEGALES_URL = [CGU_URL, "4.-mentions-legales"].join("#") -FAQ_URL = "http://demarches-simplifiees.helpscoutdocs.com/" +FAQ_URL = "https://faq.demarches-simplifiees.fr" From 5757782d29511c670ff04b6da8a772e0599e5345 Mon Sep 17 00:00:00 2001 From: gregoirenovel Date: Tue, 22 May 2018 17:28:17 +0200 Subject: [PATCH 9/9] Fix the mentions legales link --- config/initializers/constants.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/config/initializers/constants.rb b/config/initializers/constants.rb index 2a942a275..a1408744f 100644 --- a/config/initializers/constants.rb +++ b/config/initializers/constants.rb @@ -1,6 +1,6 @@ DOC_URL = "https://doc.demarches-simplifiees.fr" LISTE_DES_DEMARCHES_URL = [DOC_URL, "listes-des-demarches"].join("/") CGU_URL = [DOC_URL, "cgu"].join("/") -MENTIONS_LEGALES_URL = [CGU_URL, "4.-mentions-legales"].join("#") +MENTIONS_LEGALES_URL = [CGU_URL, "4-mentions-legales"].join("#") FAQ_URL = "https://faq.demarches-simplifiees.fr"