Merge pull request #2553 from betagouv/dossier-footer

Dossier footer

app/assets/stylesheets/new_design/dossier_show.scss

@@ -2,6 +2,8 @@
 @import "constants";
 
 #dossier-show {
+  margin-bottom: 30px;
+
   .sub-header {
     .label {
       float: right;

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 }

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

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 }

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

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/dossier_footer", locals: { dossier: @dossier }
+
 #dossier-show
   = render partial: 'new_user/dossiers/show/header', locals: { dossier: @dossier }
 
@@ -8,3 +11,4 @@
   .container
     - if !@dossier.read_only?
       = link_to "Modifier le dossier", modifier_dossier_path(@dossier), class: 'button primary edit-form'
+      .clearfix

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

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"

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/dossier_footer", locals: { dossier: @dossier }
+
 #dossier-show
   = render partial: 'new_user/dossiers/show/header', locals: { dossier: @dossier }
 

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/dossier_footer", locals: { dossier: @dossier }
+
 #dossier-show
   = render partial: 'new_user/dossiers/show/header', locals: { dossier: @dossier }
 

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/dossier_footer", locals: { dossier: @dossier }
+
 #dossier-show
   = render partial: 'new_user/dossiers/show/header', locals: { dossier: @dossier }
 

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)