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; diff --git a/app/views/new_user/dossiers/_footer.html.haml b/app/views/new_user/dossiers/_dossier_footer.html.haml similarity index 73% rename from app/views/new_user/dossiers/_footer.html.haml rename to app/views/new_user/dossiers/_dossier_footer.html.haml index 95c0aa129..b4fce7631 100644 --- a/app/views/new_user/dossiers/_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..de46e2cc4 --- /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 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/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 f5be19d48..623a8ac54 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/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 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/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" diff --git a/app/views/new_user/dossiers/messagerie.html.haml b/app/views/new_user/dossiers/messagerie.html.haml index 7715042cb..9cac5fe77 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/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 624dcaa6a..7341db4fd 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/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 b94a0686f..d87e4dd0c 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/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)