diff --git a/app/assets/stylesheets/new_design/new_footer.scss b/app/assets/stylesheets/new_design/new_footer.scss index 35966b2a4..502875b70 100644 --- a/app/assets/stylesheets/new_design/new_footer.scss +++ b/app/assets/stylesheets/new_design/new_footer.scss @@ -22,6 +22,7 @@ footer { .footer-columns { @extend %horizontal-list; justify-content: flex-start; + margin: 0 -20px; } .footer-column { @@ -29,7 +30,9 @@ footer { font-size: 14px; vertical-align: top; flex-grow: 1; - min-width: 320px; + min-width: 280px; + margin: 0 20px; + margin-bottom: 20px; @media (max-width: 1000px) { width: 100%; diff --git a/app/helpers/conservation_de_donnees_helper.rb b/app/helpers/conservation_de_donnees_helper.rb index ff1d9bfc5..35c15090a 100644 --- a/app/helpers/conservation_de_donnees_helper.rb +++ b/app/helpers/conservation_de_donnees_helper.rb @@ -7,13 +7,13 @@ module ConservationDeDonneesHelper def conservation_dans_ds(procedure) if procedure.duree_conservation_dossiers_dans_ds.present? - "dans demarches-simplifiees.fr #{procedure.duree_conservation_dossiers_dans_ds} mois après le début de l’instruction du dossier" + "Dans demarches-simplifiees.fr : #{procedure.duree_conservation_dossiers_dans_ds} mois" end end def conservation_hors_ds(procedure) if procedure.duree_conservation_dossiers_hors_ds.present? - "hors demarches-simplifiees.fr pendant #{procedure.duree_conservation_dossiers_hors_ds} mois" + "Par l’administration : #{procedure.duree_conservation_dossiers_hors_ds} mois" end end end diff --git a/app/views/new_user/dossiers/_footer.html.haml b/app/views/new_user/dossiers/_footer.html.haml index a012e66ea..bf760ac11 100644 --- a/app/views/new_user/dossiers/_footer.html.haml +++ b/app/views/new_user/dossiers/_footer.html.haml @@ -29,6 +29,13 @@ %p Horaires : #{ service.horaires.sub(/\S/, &:downcase) } + - politiques = politiques_conservation_de_donnees(dossier.procedure) + - if politiques.present? + %li.footer-column + %h3.footer-header Conservation des données : + - politiques.each do |politique| + %p= politique + .footer-bottom-line = link_to "Accessibilité", accessibilite_index_path, :class => "footer-link" – diff --git a/spec/helpers/conservation_de_donnees_helper_spec.rb b/spec/helpers/conservation_de_donnees_helper_spec.rb index 5303ffc1e..e15a59e56 100644 --- a/spec/helpers/conservation_de_donnees_helper_spec.rb +++ b/spec/helpers/conservation_de_donnees_helper_spec.rb @@ -10,21 +10,21 @@ RSpec.describe ConservationDeDonneesHelper, type: :helper do let(:dans_ds) { 3 } let(:hors_ds) { 6 } - it { is_expected.to eq([ "dans demarches-simplifiees.fr 3 mois après le début de l’instruction du dossier", "hors demarches-simplifiees.fr pendant 6 mois" ]) } + it { is_expected.to eq([ "Dans demarches-simplifiees.fr : 3 mois", "Par l’administration : 6 mois" ]) } end context "when only in-app retention time is set" do let(:dans_ds) { 3 } let(:hors_ds) { nil } - it { is_expected.to eq([ "dans demarches-simplifiees.fr 3 mois après le début de l’instruction du dossier" ]) } + it { is_expected.to eq([ "Dans demarches-simplifiees.fr : 3 mois" ]) } end context "when only out of app retention time is set" do let(:dans_ds) { nil } let(:hors_ds) { 6 } - it { is_expected.to eq([ "hors demarches-simplifiees.fr pendant 6 mois" ]) } + it { is_expected.to eq([ "Par l’administration : 6 mois" ]) } end context "when the retention time is not set" do