DGNum/demarches-normaliennes
15
1
Fork 0
Code Issues 1 Pull requests Projects Releases Packages Wiki Activity

Merge pull request #7921 from mfo/US/refactor-admin-page-tile-with-dsfr-tile

Browse source 
design(page de configuration de procedure): passage de la grille au DSFR
This commit is contained in:
mfo 2022-10-27 14:05:59 +02:00 committed by GitHub
commit 9ac8c85b28
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
26 changed files with 238 additions and 291 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

63
app/assets/stylesheets/card_admin.scss
View file

@ -1,65 +1,6 @@
@import "colors"; @import "colors";
@import "constants"; @import "constants";
.card-admin { .fr-tile-subtitle {
padding-top: 10px; min-height: 7rem;
padding-bottom: 10px;
width: 236px;
height: 200px;
border-radius: 4px;
border: solid 1px $border-grey;
text-align: center;
display: flex;
flex-direction: column;
margin-bottom: 20px;
margin-right: 20px;
.card-admin-status-accept {
color: #50AA75;
}
.card-admin-status-todo {
color: $blue-france-500;
}
.card-admin-status-error {
color: $light-red;
}
.card-admin-title {
font-weight: bold;
font-size: 18px;
margin-bottom: $default-spacer;
}
.card-admin-subtitle {
font-size: 14px;
}
.card-admin-action {
margin-top: auto;
}
.button {
margin: auto auto 0 auto;
}
p {
margin-bottom: 0;
}
&:hover {
color: $blue-france-500;
.button {
color: $blue-france-500;
}
}
}
@media only screen and (max-width: 600px) {
.card-admin {
margin-left: auto;
margin-right: auto;
}
} }

15
app/assets/stylesheets/procedure_admin.scss
View file

@ -1,12 +1,3 @@
.procedure-grid {
display: flex;
flex-wrap: wrap;
> a { // TODO, re-use DSFR https://github.com/betagouv/demarches-simplifiees.fr/issues/7884
background-image: none; // remove DSFR underline
}
}
.procedure-admin-container { .procedure-admin-container {
display: flex; display: flex;
justify-content: flex-end; justify-content: flex-end;
@ -38,12 +29,6 @@
} }
} }
.procedure-admin-explanation {
font-weight: bold;
font-size: 20px;
margin-bottom: 20px;
}
.admin-metadata { .admin-metadata {
margin-top: -8px; margin-top: -8px;
margin-bottom: 8px; margin-bottom: 8px;

22
app/components/procedure/card/administrateurs_component/administrateurs_component.html.haml
View file

@ -1,10 +1,12 @@
= link_to admin_procedure_administrateurs_path(@procedure), id: 'administrateurs', class: 'card-admin' do = link_to admin_procedure_administrateurs_path(@procedure), id: 'administrateurs', class: 'fr-tile fr-enlarge-link' do
%div .fr-tile__body.flex.justify-between
%span.icon.accept %div
%p.card-admin-status-accept Validé %span.icon.accept
%div %p.fr-tile-status-accept Validé
%p.card-admin-title %div
%span.badge.baseline= @procedure.administrateurs.size .line-count.fr-my-1w
= t('.title', count: @procedure.administrateurs.size) %p.fr-tag= @procedure.administrateurs.size
%p.card-admin-subtitle Gestion de la démarche %h3.fr-h6
%p.button= t('views.shared.actions.edit') = t('.title', count: @procedure.administrateurs.size)
%p.fr-tile-subtitle Gestion de la démarche
%p.fr-btn.fr-btn--tertiary= t('views.shared.actions.edit')

38
app/components/procedure/card/annotations_component/annotations_component.html.haml
View file

@ -1,19 +1,21 @@
= link_to annotations_admin_procedure_path(@procedure), class: 'card-admin', title: error_messages do = link_to annotations_admin_procedure_path(@procedure), class: 'fr-tile fr-enlarge-link', title: error_messages do
- if error_messages.present? .fr-tile__body.flex.justify-between
- if error_messages.present?
%div
%span.icon.refuse
%p.fr-tile-status-error À modifier
- elsif @count == 0
%div
%span.icon.clock
%p.fr-tile-status-todo À configurer
- else
%div
%span.icon.accept
%p.fr-tile-status-accept Validé
%div %div
%span.icon.refuse .line-count.fr-my-1w
%p.card-admin-status-error À modifier %p.fr-tag= @count
- elsif @count == 0 %h3.fr-h6
%div = t('.title')
%span.icon.clock %p.fr-tile-subtitle Champs à remplir par l’administration
%p.card-admin-status-todo À configurer %p.fr-btn.fr-btn--tertiary= t('views.shared.actions.edit')
- else
%div
%span.icon.accept
%p.card-admin-status-accept Validé
%div
%p.card-admin-title
%span.badge.baseline= @count
= t('.title')
%p.card-admin-subtitle Champs à remplir par l’administration
%p.button= t('views.shared.actions.edit')

25
app/components/procedure/card/api_entreprise_component/api_entreprise_component.html.haml
View file

@ -1,13 +1,14 @@
= link_to jeton_admin_procedure_path(@procedure), class: 'card-admin' do = link_to jeton_admin_procedure_path(@procedure), class: 'fr-tile fr-enlarge-link' do
- if @procedure.api_entreprise_token.present? .fr-tile__body.flex.justify-between
- if @procedure.api_entreprise_token.present?
%div
%span.icon.accept
%p.fr-tile-status-accept Validé
- else
%div
%span.icon.clock
%p.fr-tile-status-todo À configurer
%div %div
%span.icon.accept %h3.fr-h6.fr-mt-10v= t('.title')
%p.card-admin-status-accept Validé %p.fr-tile-subtitle Configurer le jeton API entreprise
- else %p.fr-btn.fr-btn--tertiary= t('views.shared.actions.edit')
%div
%span.icon.clock
%p.card-admin-status-todo À configurer
%div
%p.card-admin-title= t('.title')
%p.card-admin-subtitle Configurer le jeton API entreprise
%p.button= t('views.shared.actions.edit')

25
app/components/procedure/card/api_particulier_component/api_particulier_component.html.haml
View file

@ -1,13 +1,14 @@
= link_to admin_procedure_api_particulier_path(@procedure), class: 'card-admin', id: 'api-particulier' do = link_to admin_procedure_api_particulier_path(@procedure), class: 'fr-tile fr-enlarge-link', id: 'api-particulier' do
- if @procedure.api_particulier_token.present? .fr-tile__body.flex.justify-between
- if @procedure.api_particulier_token.present?
%div
%span.icon.accept
%p.fr-tile-status-accept= t('.ready')
- else
%div
%span.icon.clock
%p.fr-tile-status-todo= t('.needs_configuration')
%div %div
%span.icon.accept %h3.fr-h6.fr-mt-10v= Procedure.human_attribute_name(:api_particulier_token)
%p.card-admin-status-accept= t('.ready') %p.fr-tile-subtitle= t('.configure_api_particulier_token')
- else %p.fr-btn.fr-btn--tertiary= t('views.shared.actions.edit')
%div
%span.icon.clock
%p.card-admin-status-todo= t('.needs_configuration')
%div
%p.card-admin-title= Procedure.human_attribute_name(:api_particulier_token)
%p.card-admin-subtitle= t('.configure_api_particulier_token')
%p.button= t('views.shared.actions.edit')

25
app/components/procedure/card/attestation_component/attestation_component.html.haml
View file

@ -1,13 +1,14 @@
= link_to edit_admin_procedure_attestation_template_path(@procedure), class: 'card-admin' do = link_to edit_admin_procedure_attestation_template_path(@procedure), class: 'fr-tile fr-enlarge-link' do
- if @procedure.draft_attestation_template&.activated? .fr-tile__body.flex.justify-between
- if @procedure.draft_attestation_template&.activated?
%div
%span.icon.accept
%p.fr-tile-status-accept Activée
- else
%div
%span.icon.clock
%p.fr-tile-status-todo Désactivée
%div %div
%span.icon.accept %h3.fr-h6.fr-mt-10v= t('.title')
%p.card-admin-status-accept Activée %p.fr-tile-subtitle Délivrance automatique pour les dossiers acceptés
- else %p.fr-btn.fr-btn--tertiary= t('views.shared.actions.edit')
%div
%span.icon.clock
%p.card-admin-status-todo Désactivée
%div
%p.card-admin-title= t('.title')
%p.card-admin-subtitle Délivrance automatique pour les dossiers acceptés
%p.button= t('views.shared.actions.edit')

39
app/components/procedure/card/champs_component/champs_component.html.haml
View file

@ -1,19 +1,22 @@
= link_to champs_admin_procedure_path(@procedure), class: 'card-admin', title: error_messages do = link_to champs_admin_procedure_path(@procedure), class: 'fr-tile fr-enlarge-link', title: error_messages do
- if error_messages.present? .fr-tile__body.flex.justify-between
- if error_messages.present?
%div
%span.icon.refuse
%p.fr-tile-status-error À modifier
- elsif @count == 0
%div
%span.icon.clock
%p.fr-tile-status-todo À faire
- else
%div
%span.icon.accept
%p.fr-tile-status-accept Validé
%div %div
%span.icon.refuse .line-count.fr-my-1w
%p.card-admin-status-error À modifier %p.fr-tag= @count
- elsif @count == 0
%div %h3.fr-h6
%span.icon.clock = t('.title')
%p.card-admin-status-todo À faire %p.fr-tile-subtitle À remplir par les usagers
- else %p.fr-btn.fr-btn--tertiary= t('views.shared.actions.edit')
%div
%span.icon.accept
%p.card-admin-status-accept Validé
%div
%p.card-admin-title
%span.badge.baseline= @count
= t('.title')
%p.card-admin-subtitle À remplir par les usagers
%p.button= t('views.shared.actions.edit')

25
app/components/procedure/card/dossier_submitted_message_component/dossier_submitted_message_component.html.haml
View file

@ -1,13 +1,14 @@
= link_to edit_admin_procedure_dossier_submitted_message_path(@procedure), class: 'card-admin' do = link_to edit_admin_procedure_dossier_submitted_message_path(@procedure), class: 'fr-tile fr-enlarge-link' do
- if @procedure.active_dossier_submitted_message.present? .fr-tile__body.flex.justify-between
- if @procedure.active_dossier_submitted_message.present?
%div
%span.icon.accept
%p.fr-tile-status-accept Validé
- else
%div
%span.icon.clock
%p.fr-tile-status-todo À configurer
%div %div
%span.icon.accept %h3.fr-h6.fr-mt-10v= t('.title')
%p.card-admin-status-accept Validé %p.fr-tile-subtitle Orienter l'usager suite à l'envoi de son dossier
- else %p.fr-btn.fr-btn--tertiary= t('views.shared.actions.edit')
%div
%span.icon.clock
%p.card-admin-status-todo À configurer
%div
%p.card-admin-title= t('.title')
%p.card-admin-subtitle Orienter l'usager suite à l'envoi de son dossier
%p.button= t('views.shared.actions.edit')

17
app/components/procedure/card/emails_component/emails_component.html.haml
View file

@ -1,8 +1,9 @@
= link_to admin_procedure_mail_templates_path(@procedure), class: 'card-admin' do = link_to admin_procedure_mail_templates_path(@procedure), class: 'fr-tile fr-enlarge-link' do
%div .fr-tile__body.flex.justify-between
%span.icon.clock %div
%p.card-admin-status-todo À configurer %span.icon.clock
%div %p.fr-tile-status-todo À configurer
%p.card-admin-title= t('.title') %div
%p.card-admin-subtitle Notifications automatiques %h3.fr-h6.fr-mt-10v= t('.title')
%p.button= t('views.shared.actions.edit') %p.fr-tile-subtitle Notifications automatiques
%p.fr-btn.fr-btn--tertiary= t('views.shared.actions.edit')

17
app/components/procedure/card/experts_component/experts_component.html.haml
View file

@ -1,8 +1,9 @@
= link_to admin_procedure_experts_path(@procedure), class: 'card-admin' do = link_to admin_procedure_experts_path(@procedure), class: 'fr-tile fr-enlarge-link' do
%div .fr-tile__body.flex.justify-between
%span.icon.preview %div
%p.card-admin-status-todo À configurer %span.icon.preview
%div %p.fr-tile-status-todo À configurer
%p.card-admin-title= t('.title') %div
%p.card-admin-subtitle Gérer les avis des experts invités %h3.fr-h6.fr-mt-10v= t('.title')
%p.button= t('views.shared.actions.edit') %p.fr-tile-subtitle Gérer les avis des experts invités
%p.fr-btn.fr-btn--tertiary= t('views.shared.actions.edit')

36
app/components/procedure/card/instructeurs_component/instructeurs_component.html.haml
View file

@ -1,19 +1,21 @@
= link_to admin_procedure_groupe_instructeurs_path(@procedure), id: 'groupe-instructeurs', class: 'card-admin' do = link_to admin_procedure_groupe_instructeurs_path(@procedure), id: 'groupe-instructeurs', class: 'fr-tile fr-enlarge-link' do
- if @procedure.routee? || @procedure.instructeurs.size > 1 .fr-tile__body.flex.justify-between
- if @procedure.routee? || @procedure.instructeurs.size > 1
%div
%span.icon.accept
%p.fr-tile-status-accept Validé
- else
%div
%span.icon.clock
%p.fr-tile-status-todo À faire
%div %div
%span.icon.accept .line-count.fr-my-1w
%p.card-admin-status-accept Validé - if @procedure.routee?
- else %p.fr-tag= @procedure.groupe_instructeurs.size
%div - else
%span.icon.clock %p.fr-tag= @procedure.instructeurs.size
%p.card-admin-status-todo À faire
%div
%p.card-admin-title
- if @procedure.routee?
%span.badge.baseline= @procedure.groupe_instructeurs.size
- else
%span.badge.baseline= @procedure.instructeurs.size
= @procedure.routee? ? t('.routee.title', count: @procedure.groupe_instructeurs.size) : t('.title', count: @procedure.instructeurs.size) %h3.fr-h6
%p.card-admin-subtitle Suivi des dossiers = @procedure.routee? ? t('.routee.title', count: @procedure.groupe_instructeurs.size) : t('.title', count: @procedure.instructeurs.size)
%p.button= t('views.shared.actions.edit') %p.fr-tile-subtitle Suivi des dossiers
%p.fr-btn.fr-btn--tertiary= t('views.shared.actions.edit')

21
app/components/procedure/card/modifications_component/modifications_component.html.haml
View file

@ -1,11 +1,12 @@
= link_to modifications_admin_procedure_path(@procedure), id: 'modifications', class: 'card-admin' do = link_to modifications_admin_procedure_path(@procedure), id: 'modifications', class: 'fr-tile fr-enlarge-link' do
%div .fr-tile__body.flex.justify-between
%span.icon.accept %div
%p.card-admin-status-accept Activée %span.icon.accept
%div %p.fr-tile-status-accept Activée
%p.card-admin-title %div
%span.badge.baseline= @procedure.revisions_count %h3.fr-h6.fr-mt-10v
= t('.title', count: @procedure.revisions_count) %p.fr-tag= @procedure.revisions_count
= t('.title', count: @procedure.revisions_count)
%p.card-admin-subtitle Historique des modifications du formulaire %p.fr-tile-subtitle Historique des modifications du formulaire
%p.button Voir %p.fr-btn.fr-btn--tertiary Voir

25
app/components/procedure/card/mon_avis_component/mon_avis_component.html.haml
View file

@ -1,13 +1,14 @@
= link_to monavis_admin_procedure_path(@procedure), class: 'card-admin' do = link_to monavis_admin_procedure_path(@procedure), class: 'fr-tile fr-enlarge-link' do
- if @procedure.monavis_embed.present? .fr-tile__body.flex.justify-between
- if @procedure.monavis_embed.present?
%div
%span.icon.accept
%p.fr-tile-status-accept Validé
- else
%div
%span.icon.clock
%p.fr-tile-status-todo À configurer
%div %div
%span.icon.accept %h3.fr-h6.fr-mt-10v= t('.title')
%p.card-admin-status-accept Validé %p.fr-tile-subtitle Avis des usagers sur votre démarche
- else %p.fr-btn.fr-btn--tertiary= t('views.shared.actions.edit')
%div
%span.icon.clock
%p.card-admin-status-todo À configurer
%div
%p.card-admin-title= t('.title')
%p.card-admin-subtitle Avis des usagers sur votre démarche
%p.button= t('views.shared.actions.edit')

17
app/components/procedure/card/presentation_component/presentation_component.html.haml
View file

@ -1,8 +1,9 @@
= link_to edit_admin_procedure_path(@procedure), id: 'presentation', class: 'card-admin' do = link_to edit_admin_procedure_path(@procedure), id: 'presentation', class: 'fr-tile fr-enlarge-link' do
%div .fr-tile__body.flex.justify-between
%span.icon.accept %div
%p.card-admin-status-accept Validé %span.icon.accept
%div %p.fr-tile-status-accept Validé
%p.card-admin-title= t('.title') %div
%p.card-admin-subtitle Logo, nom, description %h3.fr-h6.fr-mt-10v= t('.title')
%p.button= t('views.shared.actions.edit') %p.fr-tile-subtitle Logo, nom, description
%p.fr-btn.fr-btn--tertiary= t('views.shared.actions.edit')

33
app/components/procedure/card/service_component/service_component.html.haml
View file

@ -1,17 +1,18 @@
= link_to service_link, class: 'card-admin', id: 'service' do = link_to service_link, class: 'fr-tile fr-enlarge-link', id: 'service' do
- if @procedure.service_id.present? .fr-tile__body.flex.justify-between
- if @procedure.service_id.present?
%div
%span.icon.accept
%p.fr-tile-status-accept Validé
- else
%div
%span.icon.clock
%p.fr-tile-status-todo À faire
%div %div
%span.icon.accept %h3.fr-h6.fr-mt-10v= t('.title')
%p.card-admin-status-accept Validé %p.fr-tile-subtitle
- else - if @procedure.service_id.present?
%div = @procedure.service.nom
%span.icon.clock - else
%p.card-admin-status-todo À faire Choix du service administratif
%div %p.fr-btn.fr-btn--tertiary= service_button_text
%p.card-admin-title= t('.title')
%p.card-admin-subtitle
- if @procedure.service_id.present?
= @procedure.service.nom
- else
Choix du service administratif
%p.button= service_button_text

25
app/components/procedure/card/zones_component/zones_component.html.haml
View file

@ -1,13 +1,14 @@
= link_to zones_admin_procedure_path(@procedure), id: 'zones', class: 'card-admin' do = link_to zones_admin_procedure_path(@procedure), id: 'zones', class: 'fr-tile fr-enlarge-link' do
- if @procedure.zones.size >= 1 .fr-tile__body.flex.justify-between
- if @procedure.zones.size >= 1
%div
%span.icon.accept
%p.fr-tile-status-accept Validé
- else
%div
%span.icon.clock
%p.fr-tile-status-todo À faire
%div %div
%span.icon.accept %h3.fr-h6.fr-mt-10v= t('.title')
%p.card-admin-status-accept Validé %p.fr-tile-subtitle= t('.subtitle')
- else %p.fr-btn.fr-btn--tertiary= t('views.shared.actions.edit')
%div
%span.icon.clock
%p.card-admin-status-todo À faire
%div
%p.card-admin-title= t('.title')
%p.card-admin-subtitle= t('.subtitle')
%p.button= t('views.shared.actions.edit')

1
app/javascript/entrypoints/main.css
View file

@ -21,6 +21,7 @@
@import '@gouvfr/dsfr/dist/component/navigation/navigation.css'; @import '@gouvfr/dsfr/dist/component/navigation/navigation.css';
@import '@gouvfr/dsfr/dist/component/notice/notice.css'; @import '@gouvfr/dsfr/dist/component/notice/notice.css';
@import '@gouvfr/dsfr/dist/component/table/table.css'; @import '@gouvfr/dsfr/dist/component/table/table.css';
@import '@gouvfr/dsfr/dist/component/tile/tile.css';
@import '@gouvfr/dsfr/dist/component/tag/tag.css'; @import '@gouvfr/dsfr/dist/component/tag/tag.css';
@import '@gouvfr/dsfr/dist/component/card/card.css'; @import '@gouvfr/dsfr/dist/component/card/card.css';
@import '@gouvfr/dsfr/dist/component/header/header.css'; @import '@gouvfr/dsfr/dist/component/header/header.css';

2
app/views/administrateurs/_breadcrumbs.html.haml
View file

@ -22,7 +22,7 @@
- if defined?(metadatas) - if defined?(metadatas)
.metadatas.pb-3 .metadatas.pb-3
%p.fr-h1.fr-mb-0= t('created_at', scope: [:layouts, :breadcrumb], number: @procedure.id, date: @procedure.created_at.strftime('%d/%m/%Y')) %h1.fr-h6.fr-mb-0= t('created_at', scope: [:layouts, :breadcrumb], number: @procedure.id, date: @procedure.created_at.strftime('%d/%m/%Y'))
- if @procedure.close? - if @procedure.close?
%p.fr-h2= t('closed_at', scope: [:layouts, :breadcrumb], date: @procedure.closed_at.strftime('%d/%m/%Y')) %p.fr-h2= t('closed_at', scope: [:layouts, :breadcrumb], date: @procedure.closed_at.strftime('%d/%m/%Y'))
%p %p

10
app/views/administrateurs/jeton_particulier/api_particulier.html.haml
View file

@ -9,13 +9,13 @@
- if @procedure.api_particulier_token.blank? - if @procedure.api_particulier_token.blank?
%div %div
%span.icon.clock %span.icon.clock
%p.card-admin-status-todo= t('.needs_configuration') %p.fr-text-default--info= t('.needs_configuration')
- else - else
%div %div
%span.icon.accept %span.icon.accept
%p.card-admin-status-accept= t('.already_configured') %p.fr-text-default--success= t('.already_configured')
%div %div
%p.card-admin-title %h3.fr-h6
= Procedure.human_attribute_name(:jeton_api_particulier) = Procedure.human_attribute_name(:jeton_api_particulier)
%p.button= t('views.shared.actions.edit') %p.button= t('views.shared.actions.edit')
@ -24,11 +24,11 @@
- if @procedure.api_particulier_token.blank? - if @procedure.api_particulier_token.blank?
%div %div
%span.icon.clock %span.icon.clock
%p.card-admin-status-todo= t('.needs_configuration') %p.fr-text-default--info= t('.needs_configuration')
- else - else
%div %div
%span.icon.accept %span.icon.accept
%p.card-admin-status-accept= t('.already_configured') %p.fr-text-default--success= t('.already_configured')
%div %div
%p.card-admin-title= t('administrateurs.sources_particulier.show.data_sources') %p.card-admin-title= t('administrateurs.sources_particulier.show.data_sources')
%p.button= t('views.shared.actions.edit') %p.button= t('views.shared.actions.edit')

38
app/views/administrateurs/procedures/show.html.haml
View file

@ -55,24 +55,24 @@
- if !@procedure.procedure_expires_when_termine_enabled? - if !@procedure.procedure_expires_when_termine_enabled?
= render partial: 'administrateurs/procedures/suggest_expires_when_termine', locals: { procedure: @procedure } = render partial: 'administrateurs/procedures/suggest_expires_when_termine', locals: { procedure: @procedure }
.container .container
%h2.procedure-admin-explanation Indispensable avant publication %h2.fr-mt-5w.fr-mb-3w.fr-h1 Indispensable avant publication
.procedure-grid .fr-grid-row.fr-grid-row--gutters
= render Procedure::Card::PresentationComponent.new(procedure: @procedure) .fr-col-6.fr-col-md-4.fr-col-lg-3= render Procedure::Card::PresentationComponent.new(procedure: @procedure)
= render Procedure::Card::ZonesComponent.new(procedure: @procedure) if @procedure.feature_enabled?(:zonage) .fr-col-6.fr-col-md-4.fr-col-lg-3= render Procedure::Card::ZonesComponent.new(procedure: @procedure) if @procedure.feature_enabled?(:zonage)
= render Procedure::Card::ChampsComponent.new(procedure: @procedure) .fr-col-6.fr-col-md-4.fr-col-lg-3= render Procedure::Card::ChampsComponent.new(procedure: @procedure)
= render Procedure::Card::ServiceComponent.new(procedure: @procedure, administrateur: current_administrateur) .fr-col-6.fr-col-md-4.fr-col-lg-3= render Procedure::Card::ServiceComponent.new(procedure: @procedure, administrateur: current_administrateur)
= render Procedure::Card::AdministrateursComponent.new(procedure: @procedure) .fr-col-6.fr-col-md-4.fr-col-lg-3= render Procedure::Card::AdministrateursComponent.new(procedure: @procedure)
= render Procedure::Card::InstructeursComponent.new(procedure: @procedure) .fr-col-6.fr-col-md-4.fr-col-lg-3= render Procedure::Card::InstructeursComponent.new(procedure: @procedure)
= render Procedure::Card::ModificationsComponent.new(procedure: @procedure) .fr-col-6.fr-col-md-4.fr-col-lg-3= render Procedure::Card::ModificationsComponent.new(procedure: @procedure)
%h2.procedure-admin-explanation Pour aller plus loin %h2.fr-mt-5w.fr-mb-3w.fr-h1 Pour aller plus loin
.procedure-grid .fr-grid-row.fr-grid-row--gutters
= render Procedure::Card::AttestationComponent.new(procedure: @procedure) .fr-col-6.fr-col-md-4.fr-col-lg-3= render Procedure::Card::AttestationComponent.new(procedure: @procedure)
= render Procedure::Card::ExpertsComponent.new(procedure: @procedure) .fr-col-6.fr-col-md-4.fr-col-lg-3= render Procedure::Card::ExpertsComponent.new(procedure: @procedure)
= render Procedure::Card::EmailsComponent.new(procedure: @procedure) .fr-col-6.fr-col-md-4.fr-col-lg-3= render Procedure::Card::EmailsComponent.new(procedure: @procedure)
= render Procedure::Card::AnnotationsComponent.new(procedure: @procedure) .fr-col-6.fr-col-md-4.fr-col-lg-3= render Procedure::Card::AnnotationsComponent.new(procedure: @procedure)
= render Procedure::Card::APIEntrepriseComponent.new(procedure: @procedure) .fr-col-6.fr-col-md-4.fr-col-lg-3= render Procedure::Card::APIEntrepriseComponent.new(procedure: @procedure)
= render Procedure::Card::APIParticulierComponent.new(procedure: @procedure) .fr-col-6.fr-col-md-4.fr-col-lg-3= render Procedure::Card::APIParticulierComponent.new(procedure: @procedure)
= render Procedure::Card::MonAvisComponent.new(procedure: @procedure) .fr-col-6.fr-col-md-4.fr-col-lg-3= render Procedure::Card::MonAvisComponent.new(procedure: @procedure)
= render Procedure::Card::DossierSubmittedMessageComponent.new(procedure: @procedure) .fr-col-6.fr-col-md-4.fr-col-lg-3= render Procedure::Card::DossierSubmittedMessageComponent.new(procedure: @procedure)

2
config/locales/views/layouts/_breadcrumb.en.yml
View file

@ -7,7 +7,7 @@ en:
preview: "Preview the form" preview: "Preview the form"
continue: "Continue" continue: "Continue"
continue_title: "You can comeback using this link" continue_title: "You can comeback using this link"
created_at: "Created at %{date} - n° %{number}" created_at: "Procedure n° %{number} created at %{date}"
closed_at: "Closed at %{date}" closed_at: "Closed at %{date}"
published: "Published" published: "Published"
draft: "Draft" draft: "Draft"

2
config/locales/views/layouts/_breadcrumb.fr.yml
View file

@ -7,7 +7,7 @@ fr:
preview: "Prévisualiser le formulaire" preview: "Prévisualiser le formulaire"
continue: "Continuer" continue: "Continuer"
continue_title: "Vous pourrez revenir ici par la suite" continue_title: "Vous pourrez revenir ici par la suite"
created_at: "Créée le %{date} - n° %{number}" created_at: "Démarche n° %{number}, créée le %{date}"
closed_at: "Close le %{date}" closed_at: "Close le %{date}"
published: "Publiée – " published: "Publiée – "
draft: "Brouillon" draft: "Brouillon"

2
spec/system/administrateurs/procedure_attestation_template_spec.rb
View file

@ -15,7 +15,7 @@ describe 'As an administrateur, I want to manage the procedure’s attestation',
def find_attestation_card(with_nested_selector: nil) def find_attestation_card(with_nested_selector: nil)
full_selector = [ full_selector = [
".card-admin[href=\"#{edit_admin_procedure_attestation_template_path(procedure)}\"]", "a[href=\"#{edit_admin_procedure_attestation_template_path(procedure)}\"]",
with_nested_selector with_nested_selector
].compact.join(" ") ].compact.join(" ")
page.find(full_selector) page.find(full_selector)

2
spec/system/administrateurs/procedure_cloning_spec.rb
View file

@ -26,7 +26,7 @@ describe 'As an administrateur I wanna clone a procedure', js: true do
expect(page).to have_current_path(admin_procedure_path(id: Procedure.last)) expect(page).to have_current_path(admin_procedure_path(id: Procedure.last))
# select service # select service
find("#service .button").click find("#service .fr-btn").click
click_on "Assigner" click_on "Assigner"
# then publish # then publish

2
spec/system/administrateurs/procedure_creation_spec.rb
View file

@ -64,7 +64,7 @@ describe 'Creating a new procedure', js: true do
click_link procedure.libelle click_link procedure.libelle
expect(page).to have_current_path(admin_procedure_path(procedure)) expect(page).to have_current_path(admin_procedure_path(procedure))
champs_card = find('.card-admin', text: 'Champs du formulaire') champs_card = find('.fr-tile', text: 'Champs du formulaire')
expect(champs_card).to have_selector('.icon.refuse') expect(champs_card).to have_selector('.icon.refuse')
expect(champs_card).to have_content('À modifier') expect(champs_card).to have_content('À modifier')
end end