Merge pull request #9817 from demarches-simplifiees/9784-footer

ETQ admin et instructeur, j'ai un pied de page

app/views/agent_connect/agent/index.html.haml

@@ -66,7 +66,3 @@
             = t('.full_deploy_body')
         %h2.fr-h6= t('.whats_ds', application_name: APPLICATION_NAME)
         = image_tag "landing/hero/dematerialiser.svg", class: "paperless-logo", alt: ""
-
-
-- content_for :footer do
-  = render partial: 'users/dossiers/index_footer'

app/views/application/_footer.html.haml

@@ -1,4 +1,4 @@
 %footer.procedure-footer.fr-footer__bottom{ role: "contentinfo" }
   .fr-container
-    = render partial: "users/general_footer_row", locals: { dossier: nil }
+    = render partial: "general_footer_row", locals: { dossier: nil }
     = render partial: "shared/footer_copy"

app/views/application/_general_footer_row.html.haml

@@ -1,4 +1,12 @@
+- nav_bar_profile = controller.try(:nav_bar_profile) || :guest
+- is_agent = [:user, :guest].exclude?(nav_bar_profile)
+
 %ul.fr-footer__bottom-list
+  - if is_agent
+    %li.fr-footer__bottom-item
+      = link_to t("links.footer.doc.label"), DOC_URL, title: t("links.footer.doc.title"), class: "fr-footer__bottom-link", target: "_blank", rel: "noopener noreferrer"
+    %li.fr-footer__bottom-item
+      = link_to t("links.footer.vote_feature.label"), FEATURE_UPVOTE_URL, title: t("links.footer.vote_feature.title"), class: "fr-footer__bottom-link", target: "_blank", rel: "noopener noreferrer"
   %li.fr-footer__bottom-item
     = link_to t("links.footer.accessibilite.label"), ACCESSIBILITE_URL, title: t("links.footer.accessibilite.title"), class: "fr-footer__bottom-link", rel: "noopener noreferrer"
   %li.fr-footer__bottom-item

app/views/layouts/application.html.haml

@@ -59,6 +59,8 @@
 
       - if content_for?(:footer)
         = content_for(:footer)
+      - else
+        = render 'footer'
 
       - if Rails.env.development?
         = vite_typescript_tag 'axe-core'

app/views/layouts/login.html.haml

@@ -12,6 +12,6 @@
   - if procedure
     = render partial: 'users/procedure_footer', locals: { procedure: procedure, dossier: @dossier }
   - else
-    = render partial: 'users/dossiers/index_footer'
+    = render partial: 'application/footer'
 
 = render template: 'layouts/application'

app/views/root/_footer.html.haml

@@ -57,5 +57,5 @@
         = render partial: "shared/footer_content_list"
 
     .fr-footer__bottom
-      = render partial: 'users/general_footer_row'
+      = render partial: 'general_footer_row'
       = render partial: 'shared/footer_copy'

app/views/users/_procedure_footer.html.haml

@@ -70,5 +70,5 @@
 
   .fr-footer__bottom.fr-mt-0
     .fr-container
-      = render partial: 'users/general_footer_row', locals: { dossier: dossier }
+      = render partial: 'application/general_footer_row', locals: { dossier: dossier }
       = render partial: 'shared/footer_copy'

app/views/users/activate/new.html.haml

@@ -6,4 +6,4 @@
     .fr-col-12.fr-col-offset-md-2.fr-col-md-8
       = render Instructeurs::ActivateAccountFormComponent.new(user: @user)
 
-= render partial: 'users/dossiers/index_footer'
+= render partial: 'application/footer'

app/views/users/demarches/index.html.haml

@@ -1,8 +1,5 @@
 - content_for(:title, "Démarches")
 
-- content_for :footer do
-  = render partial: "users/dossiers/index_footer"
-
 #demarches-index
   .container
     %h1.page-title Démarches

app/views/users/dossiers/index.html.haml

@@ -3,9 +3,6 @@
 - else
   - content_for(:title, t(".title", scope: :metas))
 
-- content_for :footer do
-  = render partial: "users/dossiers/index_footer"
-
 .dossiers-headers.sub-header
   .fr-container
     %h1.page-title.fr-h2= t('views.users.dossiers.index.dossiers')

app/views/users/dossiers/transferer.html.haml

@@ -18,5 +18,3 @@
 
         = f.hidden_field :dossier, value: @dossier.id
         = f.submit t('.submit'), class: 'fr-btn'
-- content_for :footer do
-  = render partial: 'users/dossiers/index_footer'

app/views/users/profil/show.html.haml

@@ -85,6 +85,3 @@
               method: :delete,
               data: { confirm: t('.unlink_confirmation', full_name: fci.full_name) },
               class: 'fr-btn fr-btn--secondary fr-ml-2w'
-
-- content_for :footer do
-  = render partial: 'users/dossiers/index_footer'

config/locales/links.en.yml

@@ -25,7 +25,7 @@ en:
       link_1_url: "https://www.numerique.gouv.fr/dinum/"
       link_2_label: The source code
       description_2: is available under a free license.
-      copy_html: "Unless otherwise stated, all content on this site is %{link}"
+      copy_html: "Unless otherwise stated, all public data on this site are %{link}"
       license: "licensed under etalab 2.0"
       accessibilite:
         label: "Accessibility: partially compliant"
@@ -50,6 +50,9 @@ en:
         label: "Documentation"
         title: "Our Documentation"
         url: "https://doc.demarches-simplifiees.fr"
+      vote_feature:
+        label: "Improve the site"
+        title: "Vote for your priority improvements or share your own ideas"
       mentions_legales:
         label: "Legal notices"
         title: "Legal notices regarding our platform"

config/locales/links.fr.yml

@@ -27,7 +27,7 @@ fr:
       link_1_url: "https://www.numerique.gouv.fr/dinum/"
       link_2_label: Le code source
       description_2: est disponible en licence libre.
-      copy_html: "Sauf mention contraire, tous les contenus de ce site sont sous %{link}"
+      copy_html: "Sauf mention contraire, les données publiques de ce site sont sous %{link}"
       license: "licence etalab 2.0"
       accessibilite:
         label: "Accessibilité : partiellement conforme"
@@ -55,6 +55,9 @@ fr:
         label: "Documentation"
         title: "Documentation utilisateur"
         url: "https://doc.demarches-simplifiees.fr"
+      vote_feature:
+        label: "Améliorer le site"
+        title: "Votez pour vos améliorations prioritaires ou proposez votre propre idée"
       mentions_legales:
         label: "Mentions légales"
         title: "Consulter nos Mentions légales"