diff --git a/app/components/dsfr/callout_component.rb b/app/components/dsfr/callout_component.rb index 0f5eb9af8..da0160990 100644 --- a/app/components/dsfr/callout_component.rb +++ b/app/components/dsfr/callout_component.rb @@ -1,6 +1,7 @@ # see: https://www.systeme-de-design.gouv.fr/elements-d-interface/composants/mise-en-avant class Dsfr::CalloutComponent < ApplicationComponent renders_one :body + renders_one :bottom attr_reader :title, :theme, :icon diff --git a/app/components/dsfr/callout_component/callout_component.html.haml b/app/components/dsfr/callout_component/callout_component.html.haml index 5b48a61de..f53eeb458 100644 --- a/app/components/dsfr/callout_component/callout_component.html.haml +++ b/app/components/dsfr/callout_component/callout_component.html.haml @@ -1,3 +1,4 @@ %div{ class: callout_class } %h3.fr-callout__title= title %p.fr-callout__text= body + = bottom diff --git a/app/views/root/patron.html.haml b/app/views/root/patron.html.haml index 57575c311..e274d60f3 100644 --- a/app/views/root/patron.html.haml +++ b/app/views/root/patron.html.haml @@ -305,7 +305,7 @@ .container %h1 Dsfr::CalloutComponent - = link_to "Documentation DSFR Mis en avant (callout)", "https://www.systeme-de-design.gouv.fr/elements-d-interface/composants/mise-en-avant", **external_link_attributes + %p= link_to "Documentation DSFR Mis en avant (callout)", "https://www.systeme-de-design.gouv.fr/elements-d-interface/composants/mise-en-avant", **external_link_attributes = render Dsfr::CalloutComponent.new(title: "Information minimale") do |c| - c.with_body do @@ -313,7 +313,9 @@ = render Dsfr::CalloutComponent.new(title: "Information importante ou avertissement", theme: :warning) do |c| - c.with_body do - %p Le contenu de cette description est libre. + Le contenu de cette description est libre. + - c.with_bottom do + %button.fr-btn Call to action = render Dsfr::CalloutComponent.new(title: "Titre d'une information positive", theme: :success, icon: "fr-icon-message-2-fill") do |c| - c.with_body do @@ -323,7 +325,7 @@ peut ĂȘtre utilisĂ©e. %h1 Dsfr::CardVerticalComponent - = link_to "Documentation DSFR Carte", "https://www.systeme-de-design.gouv.fr/elements-d-interface/composants/carte", **external_link_attributes + %p= link_to "Documentation DSFR Carte", "https://www.systeme-de-design.gouv.fr/elements-d-interface/composants/carte", **external_link_attributes .fr-grid-row.fr-grid-row--gutters.fr-py-5w .fr-col-md-6.fr-col-12 @@ -337,7 +339,7 @@ = button_tag "Button 2", class: "fr-btn fr-btn--secondary" %h1 Dsfr::NoticeComponent - = link_to "Documentation DSFR Bandeau d'information", "https://www.systeme-de-design.gouv.fr/elements-d-interface/composants/bandeau-d-information-importante", **external_link_attributes + %p= link_to "Documentation DSFR Bandeau d'information", "https://www.systeme-de-design.gouv.fr/elements-d-interface/composants/bandeau-d-information-importante", **external_link_attributes .my-3 = render Dsfr::NoticeComponent.new(closable: true) do |c| - c.with_title do