From 20c7733a481668ee24537a588cdc53af93d92b4a Mon Sep 17 00:00:00 2001
From: gregoirenovel <log@kinko.fr>
Date: Thu, 6 Sep 2018 17:42:51 +0200
Subject: [PATCH 1/6] Display the dossier footer on all the dossier pages

---
 app/views/new_user/dossiers/demande.html.haml    | 3 +++
 app/views/new_user/dossiers/messagerie.html.haml | 3 +++
 app/views/new_user/dossiers/modifier.html.haml   | 3 +++
 app/views/new_user/dossiers/show.html.haml       | 3 +++
 4 files changed, 12 insertions(+)

diff --git a/app/views/new_user/dossiers/demande.html.haml b/app/views/new_user/dossiers/demande.html.haml
index f5be19d48..75b50b4bd 100644
--- a/app/views/new_user/dossiers/demande.html.haml
+++ b/app/views/new_user/dossiers/demande.html.haml
@@ -1,5 +1,8 @@
 - content_for(:title, "Demande · Dossier nº #{@dossier.id} (#{@dossier.procedure.libelle})")
 
+- content_for :footer do
+  = render partial: "new_user/dossiers/footer", locals: { dossier: @dossier }
+
 #dossier-show
   = render partial: 'new_user/dossiers/show/header', locals: { dossier: @dossier }
 
diff --git a/app/views/new_user/dossiers/messagerie.html.haml b/app/views/new_user/dossiers/messagerie.html.haml
index 7715042cb..2bb4a266b 100644
--- a/app/views/new_user/dossiers/messagerie.html.haml
+++ b/app/views/new_user/dossiers/messagerie.html.haml
@@ -1,5 +1,8 @@
 - content_for(:title, "Messagerie · Dossier nº #{@dossier.id} (#{@dossier.procedure.libelle})")
 
+- content_for :footer do
+  = render partial: "new_user/dossiers/footer", locals: { dossier: @dossier }
+
 #dossier-show
   = render partial: 'new_user/dossiers/show/header', locals: { dossier: @dossier }
 
diff --git a/app/views/new_user/dossiers/modifier.html.haml b/app/views/new_user/dossiers/modifier.html.haml
index 624dcaa6a..49fcfd759 100644
--- a/app/views/new_user/dossiers/modifier.html.haml
+++ b/app/views/new_user/dossiers/modifier.html.haml
@@ -1,5 +1,8 @@
 - content_for(:title, "Modifier · Dossier nº #{@dossier.id} (#{@dossier.procedure.libelle})")
 
+- content_for :footer do
+  = render partial: "new_user/dossiers/footer", locals: { dossier: @dossier }
+
 #dossier-show
   = render partial: 'new_user/dossiers/show/header', locals: { dossier: @dossier }
 
diff --git a/app/views/new_user/dossiers/show.html.haml b/app/views/new_user/dossiers/show.html.haml
index b94a0686f..2577650d3 100644
--- a/app/views/new_user/dossiers/show.html.haml
+++ b/app/views/new_user/dossiers/show.html.haml
@@ -1,5 +1,8 @@
 - content_for(:title, "Résumé · Dossier nº #{@dossier.id} (#{@dossier.procedure.libelle})")
 
+- content_for :footer do
+  = render partial: "new_user/dossiers/footer", locals: { dossier: @dossier }
+
 #dossier-show
   = render partial: 'new_user/dossiers/show/header', locals: { dossier: @dossier }
 

From 8ec27d4348488f951955cdb37717e1ff1dea2bb1 Mon Sep 17 00:00:00 2001
From: gregoirenovel <log@kinko.fr>
Date: Wed, 12 Sep 2018 13:09:44 +0200
Subject: [PATCH 2/6] Add a clearfix below the edit-form button

To avoid an overlap with the footer
---
 app/views/new_user/dossiers/demande.html.haml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/app/views/new_user/dossiers/demande.html.haml b/app/views/new_user/dossiers/demande.html.haml
index 75b50b4bd..59dbaef91 100644
--- a/app/views/new_user/dossiers/demande.html.haml
+++ b/app/views/new_user/dossiers/demande.html.haml
@@ -11,3 +11,4 @@
   .container
     - if !@dossier.read_only?
       = link_to "Modifier le dossier", modifier_dossier_path(@dossier), class: 'button primary edit-form'
+      .clearfix

From 6745b67dc4f76270afb00ef4390ce5f6bd3843ba Mon Sep 17 00:00:00 2001
From: gregoirenovel <log@kinko.fr>
Date: Wed, 12 Sep 2018 13:10:20 +0200
Subject: [PATCH 3/6] Add some space before the footer on the dossier pages

---
 app/assets/stylesheets/new_design/dossier_show.scss | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/app/assets/stylesheets/new_design/dossier_show.scss b/app/assets/stylesheets/new_design/dossier_show.scss
index be12db19e..e85c5d10c 100644
--- a/app/assets/stylesheets/new_design/dossier_show.scss
+++ b/app/assets/stylesheets/new_design/dossier_show.scss
@@ -2,6 +2,8 @@
 @import "constants";
 
 #dossier-show {
+  margin-bottom: 30px;
+
   .sub-header {
     .label {
       float: right;

From cedf1ba427de670257961d655e56c2273b812133 Mon Sep 17 00:00:00 2001
From: gregoirenovel <log@kinko.fr>
Date: Wed, 12 Sep 2018 13:24:14 +0200
Subject: [PATCH 4/6] =?UTF-8?q?footer=20=E2=86=92=20dossier=5Ffooter?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../dossiers/{_footer.html.haml => _dossier_footer.html.haml} | 0
 app/views/new_user/dossiers/brouillon.html.haml               | 2 +-
 app/views/new_user/dossiers/demande.html.haml                 | 2 +-
 app/views/new_user/dossiers/identite.html.haml                | 2 +-
 app/views/new_user/dossiers/messagerie.html.haml              | 2 +-
 app/views/new_user/dossiers/modifier.html.haml                | 2 +-
 app/views/new_user/dossiers/show.html.haml                    | 2 +-
 ...er.html.haml_spec.rb => _dossier_footer.html.haml_spec.rb} | 4 ++--
 8 files changed, 8 insertions(+), 8 deletions(-)
 rename app/views/new_user/dossiers/{_footer.html.haml => _dossier_footer.html.haml} (100%)
 rename spec/views/new_user/dossiers/{_footer.html.haml_spec.rb => _dossier_footer.html.haml_spec.rb} (83%)

diff --git a/app/views/new_user/dossiers/_footer.html.haml b/app/views/new_user/dossiers/_dossier_footer.html.haml
similarity index 100%
rename from app/views/new_user/dossiers/_footer.html.haml
rename to app/views/new_user/dossiers/_dossier_footer.html.haml
diff --git a/app/views/new_user/dossiers/brouillon.html.haml b/app/views/new_user/dossiers/brouillon.html.haml
index 81f264954..77dec858b 100644
--- a/app/views/new_user/dossiers/brouillon.html.haml
+++ b/app/views/new_user/dossiers/brouillon.html.haml
@@ -1,7 +1,7 @@
 - content_for(:title, "Modification du brouillon nº #{@dossier.id} (#{@dossier.procedure.libelle})")
 
 - content_for :footer do
-  = render partial: "new_user/dossiers/footer", locals: { dossier: @dossier }
+  = render partial: "new_user/dossiers/dossier_footer", locals: { dossier: @dossier }
 
 .dossier-edit
   .dossier-header.sub-header
diff --git a/app/views/new_user/dossiers/demande.html.haml b/app/views/new_user/dossiers/demande.html.haml
index 59dbaef91..623a8ac54 100644
--- a/app/views/new_user/dossiers/demande.html.haml
+++ b/app/views/new_user/dossiers/demande.html.haml
@@ -1,7 +1,7 @@
 - content_for(:title, "Demande · Dossier nº #{@dossier.id} (#{@dossier.procedure.libelle})")
 
 - content_for :footer do
-  = render partial: "new_user/dossiers/footer", locals: { dossier: @dossier }
+  = render partial: "new_user/dossiers/dossier_footer", locals: { dossier: @dossier }
 
 #dossier-show
   = render partial: 'new_user/dossiers/show/header', locals: { dossier: @dossier }
diff --git a/app/views/new_user/dossiers/identite.html.haml b/app/views/new_user/dossiers/identite.html.haml
index 920184db9..e4a5cc412 100644
--- a/app/views/new_user/dossiers/identite.html.haml
+++ b/app/views/new_user/dossiers/identite.html.haml
@@ -1,7 +1,7 @@
 - content_for(:title, "Nouveau dossier (#{@dossier.procedure.libelle})")
 
 - content_for :footer do
-  = render partial: "new_user/dossiers/footer", locals: { dossier: @dossier }
+  = render partial: "new_user/dossiers/dossier_footer", locals: { dossier: @dossier }
 
 .two-columns
   .columns-container
diff --git a/app/views/new_user/dossiers/messagerie.html.haml b/app/views/new_user/dossiers/messagerie.html.haml
index 2bb4a266b..9cac5fe77 100644
--- a/app/views/new_user/dossiers/messagerie.html.haml
+++ b/app/views/new_user/dossiers/messagerie.html.haml
@@ -1,7 +1,7 @@
 - content_for(:title, "Messagerie · Dossier nº #{@dossier.id} (#{@dossier.procedure.libelle})")
 
 - content_for :footer do
-  = render partial: "new_user/dossiers/footer", locals: { dossier: @dossier }
+  = render partial: "new_user/dossiers/dossier_footer", locals: { dossier: @dossier }
 
 #dossier-show
   = render partial: 'new_user/dossiers/show/header', locals: { dossier: @dossier }
diff --git a/app/views/new_user/dossiers/modifier.html.haml b/app/views/new_user/dossiers/modifier.html.haml
index 49fcfd759..7341db4fd 100644
--- a/app/views/new_user/dossiers/modifier.html.haml
+++ b/app/views/new_user/dossiers/modifier.html.haml
@@ -1,7 +1,7 @@
 - content_for(:title, "Modifier · Dossier nº #{@dossier.id} (#{@dossier.procedure.libelle})")
 
 - content_for :footer do
-  = render partial: "new_user/dossiers/footer", locals: { dossier: @dossier }
+  = render partial: "new_user/dossiers/dossier_footer", locals: { dossier: @dossier }
 
 #dossier-show
   = render partial: 'new_user/dossiers/show/header', locals: { dossier: @dossier }
diff --git a/app/views/new_user/dossiers/show.html.haml b/app/views/new_user/dossiers/show.html.haml
index 2577650d3..d87e4dd0c 100644
--- a/app/views/new_user/dossiers/show.html.haml
+++ b/app/views/new_user/dossiers/show.html.haml
@@ -1,7 +1,7 @@
 - content_for(:title, "Résumé · Dossier nº #{@dossier.id} (#{@dossier.procedure.libelle})")
 
 - content_for :footer do
-  = render partial: "new_user/dossiers/footer", locals: { dossier: @dossier }
+  = render partial: "new_user/dossiers/dossier_footer", locals: { dossier: @dossier }
 
 #dossier-show
   = render partial: 'new_user/dossiers/show/header', locals: { dossier: @dossier }
diff --git a/spec/views/new_user/dossiers/_footer.html.haml_spec.rb b/spec/views/new_user/dossiers/_dossier_footer.html.haml_spec.rb
similarity index 83%
rename from spec/views/new_user/dossiers/_footer.html.haml_spec.rb
rename to spec/views/new_user/dossiers/_dossier_footer.html.haml_spec.rb
index d840c876e..21ef07687 100644
--- a/spec/views/new_user/dossiers/_footer.html.haml_spec.rb
+++ b/spec/views/new_user/dossiers/_dossier_footer.html.haml_spec.rb
@@ -1,4 +1,4 @@
-describe 'new_user/dossiers/_footer.html.haml', type: :view do
+describe 'new_user/dossiers/_dossier_footer.html.haml', type: :view do
   let(:service) { create(:service) }
   let(:dossier) {
     dossier = create(:dossier)
@@ -6,7 +6,7 @@ describe 'new_user/dossiers/_footer.html.haml', type: :view do
     return dossier
   }
 
-  subject { render 'new_user/dossiers/footer.html.haml', dossier: dossier }
+  subject { render 'new_user/dossiers/dossier_footer.html.haml', dossier: dossier }
 
   it "affiche les informations de contact" do
     expect(subject).to have_text(service.nom)

From 5166b791677251b3ac9bcc183873795b17c29161 Mon Sep 17 00:00:00 2001
From: gregoirenovel <log@kinko.fr>
Date: Wed, 12 Sep 2018 13:27:42 +0200
Subject: [PATCH 5/6] Extract the general footer row in a partial

---
 app/views/new_user/dossiers/_dossier_footer.html.haml     | 8 +-------
 app/views/new_user/dossiers/_general_footer_row.html.haml | 7 +++++++
 2 files changed, 8 insertions(+), 7 deletions(-)
 create mode 100644 app/views/new_user/dossiers/_general_footer_row.html.haml

diff --git a/app/views/new_user/dossiers/_dossier_footer.html.haml b/app/views/new_user/dossiers/_dossier_footer.html.haml
index 95c0aa129..b4fce7631 100644
--- a/app/views/new_user/dossiers/_dossier_footer.html.haml
+++ b/app/views/new_user/dossiers/_dossier_footer.html.haml
@@ -36,10 +36,4 @@
               %p= politique
 
     .footer-row.footer-bottom-line
-      = link_to "Accessibilité", accessibilite_index_path, :class => "footer-link"
-      –
-      = link_to "CGU", CGU_URL, :class => "footer-link", :target => "_blank", rel: "noopener noreferrer"
-      –
-      = link_to "Mentions légales", MENTIONS_LEGALES_URL, :class => "footer-link", :target => "_blank", rel: "noopener noreferrer"
-      –
-      = contact_link "Contact technique", class: "footer-link", dossier_id: dossier.id
+      = render partial: "new_user/dossiers/general_footer_row", locals: { dossier: @dossier }
diff --git a/app/views/new_user/dossiers/_general_footer_row.html.haml b/app/views/new_user/dossiers/_general_footer_row.html.haml
new file mode 100644
index 000000000..351e87ba4
--- /dev/null
+++ b/app/views/new_user/dossiers/_general_footer_row.html.haml
@@ -0,0 +1,7 @@
+= link_to "Accessibilité", accessibilite_index_path, :class => "footer-link"
+–
+= link_to "CGU", CGU_URL, :class => "footer-link", :target => "_blank", rel: "noopener noreferrer"
+–
+= link_to "Mentions légales", MENTIONS_LEGALES_URL, :class => "footer-link", :target => "_blank", rel: "noopener noreferrer"
+–
+= contact_link "Contact technique", class: "footer-link", dossier_id: dossier.id

From 1f6870cd5e371d53b51cd83becbd5e62b1004a2b Mon Sep 17 00:00:00 2001
From: gregoirenovel <log@kinko.fr>
Date: Wed, 12 Sep 2018 13:29:15 +0200
Subject: [PATCH 6/6] Display a footer in the dossiers index page

---
 app/views/new_user/dossiers/_general_footer_row.html.haml | 2 +-
 app/views/new_user/dossiers/_index_footer.html.haml       | 4 ++++
 app/views/new_user/dossiers/index.html.haml               | 3 +++
 3 files changed, 8 insertions(+), 1 deletion(-)
 create mode 100644 app/views/new_user/dossiers/_index_footer.html.haml

diff --git a/app/views/new_user/dossiers/_general_footer_row.html.haml b/app/views/new_user/dossiers/_general_footer_row.html.haml
index 351e87ba4..de46e2cc4 100644
--- a/app/views/new_user/dossiers/_general_footer_row.html.haml
+++ b/app/views/new_user/dossiers/_general_footer_row.html.haml
@@ -4,4 +4,4 @@
 –
 = link_to "Mentions légales", MENTIONS_LEGALES_URL, :class => "footer-link", :target => "_blank", rel: "noopener noreferrer"
 –
-= contact_link "Contact technique", class: "footer-link", dossier_id: dossier.id
+= contact_link "Contact technique", class: "footer-link", dossier_id: dossier&.id
diff --git a/app/views/new_user/dossiers/_index_footer.html.haml b/app/views/new_user/dossiers/_index_footer.html.haml
new file mode 100644
index 000000000..241ba25d7
--- /dev/null
+++ b/app/views/new_user/dossiers/_index_footer.html.haml
@@ -0,0 +1,4 @@
+%footer.dossier-footer
+  .container
+    .footer-row.footer-bottom-line
+      = render partial: "new_user/dossiers/general_footer_row", locals: { dossier: nil }
diff --git a/app/views/new_user/dossiers/index.html.haml b/app/views/new_user/dossiers/index.html.haml
index e37d78286..c625952a7 100644
--- a/app/views/new_user/dossiers/index.html.haml
+++ b/app/views/new_user/dossiers/index.html.haml
@@ -1,5 +1,8 @@
 - content_for(:title, "Dossiers")
 
+- content_for :footer do
+  = render partial: "new_user/dossiers/index_footer"
+
 .dossiers-headers.sub-header
   .container
     = link_to "Commencer une nouvelle démarche", new_demarche_url, class: "button secondary new-demarche"