From 8b895df34c622da10ebc59b088282528cd5efe04 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Chai=CC=88b=20Martinez?= Date: Mon, 30 Sep 2019 16:03:32 +0200 Subject: [PATCH 1/7] =?UTF-8?q?Update=20"nouveaut=C3=A9"=20link?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Chaïb Martinez --- app/views/layouts/_footer.html.haml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/views/layouts/_footer.html.haml b/app/views/layouts/_footer.html.haml index 711e0da84..b5714c126 100644 --- a/app/views/layouts/_footer.html.haml +++ b/app/views/layouts/_footer.html.haml @@ -3,7 +3,7 @@ = link_to 'DINSIC', "http://etatplateforme.modernisation.gouv.fr" = Time.zone.now.year \- - = link_to 'Nouveautés', 'https://github.com/betagouv/demarches-simplifiees.fr/releases', target: '_blank' + = link_to 'Nouveautés', 'https://doc.demarches-simplifiees.fr/nouveautes', target: '_blank' \- = link_to 'Statistiques', stats_path, data: { turbolinks: false } # Turbolinks disabled for Chartkick. See Issue #350 \- From 9b98bcd176b9483e6018f57afa5f11b59dfa25de Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Chai=CC=88b=20Martinez?= Date: Mon, 30 Sep 2019 16:03:57 +0200 Subject: [PATCH 2/7] remove duplicate link MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Chaïb Martinez --- app/views/layouts/_footer.html.haml | 2 -- 1 file changed, 2 deletions(-) diff --git a/app/views/layouts/_footer.html.haml b/app/views/layouts/_footer.html.haml index b5714c126..48f112224 100644 --- a/app/views/layouts/_footer.html.haml +++ b/app/views/layouts/_footer.html.haml @@ -9,8 +9,6 @@ \- = link_to 'CGU / Mentions légales', CGU_URL \- - = contact_link 'Contact' - \- = link_to 'Documentation', DOC_URL \- = link_to 'FAQ', FAQ_ADMIN_URL From 4225951a1dbb2693f32a232c20226c3ea4f5a02c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Chai=CC=88b=20Martinez?= Date: Mon, 30 Sep 2019 16:04:57 +0200 Subject: [PATCH 3/7] minor fix MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Chaïb Martinez --- app/views/layouts/_footer.html.haml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/app/views/layouts/_footer.html.haml b/app/views/layouts/_footer.html.haml index 48f112224..40a87c284 100644 --- a/app/views/layouts/_footer.html.haml +++ b/app/views/layouts/_footer.html.haml @@ -7,10 +7,10 @@ \- = link_to 'Statistiques', stats_path, data: { turbolinks: false } # Turbolinks disabled for Chartkick. See Issue #350 \- - = link_to 'CGU / Mentions légales', CGU_URL + = link_to 'CGU / Mentions légales', CGU_URL, target: '_blank' \- - = link_to 'Documentation', DOC_URL + = link_to 'Documentation', DOC_URL, target: '_blank' \- - = link_to 'FAQ', FAQ_ADMIN_URL + = link_to 'FAQ', FAQ_ADMIN_URL, target: '_blank' \- - = link_to 'Inscription ateliers en ligne', WEBINAIRE_URL + = link_to 'Inscription ateliers en ligne', WEBINAIRE_URL, target: '_blank' From 19590d9814e7e8ba4855edd075e3c7ce0e24f5ce Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Chai=CC=88b=20Martinez?= Date: Mon, 30 Sep 2019 17:24:05 +0200 Subject: [PATCH 4/7] add "sortir" link MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Chaïb Martinez --- .../_left_panel_admin_procedurescontroller_navbar.html.haml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/app/views/layouts/left_panels/_left_panel_admin_procedurescontroller_navbar.html.haml b/app/views/layouts/left_panels/_left_panel_admin_procedurescontroller_navbar.html.haml index 18d34a23d..4429e2052 100644 --- a/app/views/layouts/left_panels/_left_panel_admin_procedurescontroller_navbar.html.haml +++ b/app/views/layouts/left_panels/_left_panel_admin_procedurescontroller_navbar.html.haml @@ -62,6 +62,10 @@ .procedure-list-element{ class: ('active' if active == 'MonAvis') } MonAvis + %a#onglet-description{ href: url_for(admin_procedures_path()) } + .procedure-list-element + Sortir + .split-hr-left From d71ab9a7a835aee497e6674f0bbb61c3e9cdd614 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Chai=CC=88b=20Martinez?= Date: Mon, 30 Sep 2019 15:42:56 +0200 Subject: [PATCH 5/7] =?UTF-8?q?Add=20"continuer"=20button=20=F0=9F=91=89?= =?UTF-8?q?=20[fix=20#4369]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Chaïb Martinez --- app/views/new_administrateur/_breadcrumbs.html.haml | 1 + 1 file changed, 1 insertion(+) diff --git a/app/views/new_administrateur/_breadcrumbs.html.haml b/app/views/new_administrateur/_breadcrumbs.html.haml index cb42e5dd6..eaff46f36 100644 --- a/app/views/new_administrateur/_breadcrumbs.html.haml +++ b/app/views/new_administrateur/_breadcrumbs.html.haml @@ -5,3 +5,4 @@ %li= step - if defined?(preview) && preview = link_to "Prévisualiser le formulaire", apercu_procedure_path(@procedure), target: "_blank", rel: "noopener", class: 'button' + = link_to "Continuer >", admin_procedure_path(@procedure), title: 'Vous pourrez revenir ici par la suite', class: 'button accepted' From 49cc3d4ba5128cef6fc1f77d3298f40d511fd62d Mon Sep 17 00:00:00 2001 From: clemkeirua Date: Mon, 30 Sep 2019 17:37:26 +0200 Subject: [PATCH 6/7] =?UTF-8?q?merci:=20ne=20pas=20afficher=20qu'un=20doss?= =?UTF-8?q?ier=20peut=20=C3=AAtre=20modifi=C3=A9=20si=20pas=20possible?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/views/users/dossiers/merci.html.haml | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/app/views/users/dossiers/merci.html.haml b/app/views/users/dossiers/merci.html.haml index 4cd67b54b..d2da1ab4d 100644 --- a/app/views/users/dossiers/merci.html.haml +++ b/app/views/users/dossiers/merci.html.haml @@ -16,8 +16,9 @@ %b dossier en ligne. %p Vous pouvez - %b le modifier - et + - if !@dossier.read_only? + %b le modifier + et %b échanger avec un instructeur. .flex.column.align-center From d8bc73b972c3f0ef5f48ea63512e561fd5a27251 Mon Sep 17 00:00:00 2001 From: clemkeirua Date: Mon, 30 Sep 2019 17:49:57 +0200 Subject: [PATCH 7/7] fix wording --- app/views/invites/_dropdown.html.haml | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/app/views/invites/_dropdown.html.haml b/app/views/invites/_dropdown.html.haml index 368c359ef..7fda74dd5 100644 --- a/app/views/invites/_dropdown.html.haml +++ b/app/views/invites/_dropdown.html.haml @@ -5,7 +5,10 @@ Voir les personnes invitées %span.badge= dossier.invites.count - else - Inviter une personne à modifier ce dossier + - if dossier.read_only? + Inviter une personne à consulter ce dossier + - else + Inviter une personne à modifier ce dossier .dropdown-content.fade-in-down = render partial: "invites/form", locals: { dossier: dossier }