diff --git a/app/assets/stylesheets/procedure_admin.scss b/app/assets/stylesheets/procedure_admin.scss index 0227b3772..0ca1fb781 100644 --- a/app/assets/stylesheets/procedure_admin.scss +++ b/app/assets/stylesheets/procedure_admin.scss @@ -36,3 +36,13 @@ font-size: 20px; margin-bottom: 20px; } + +.admin-metadata { + margin-top: -8px; + margin-bottom: 8px; + + li { + font-size: 14px; + } + +} diff --git a/app/views/new_administrateur/_breadcrumbs.html.haml b/app/views/new_administrateur/_breadcrumbs.html.haml index b8dc5d94c..93353f9ee 100644 --- a/app/views/new_administrateur/_breadcrumbs.html.haml +++ b/app/views/new_administrateur/_breadcrumbs.html.haml @@ -1,8 +1,12 @@ .sub-header - .container.flex.justify-between.align-baseline + .container.flex.justify-between.align-baseline.column %ul.breadcrumbs - steps.each do |step| %li= step - if defined?(preview) && preview = link_to "Prévisualiser le formulaire", apercu_admin_procedure_path(@procedure), target: "_blank", rel: "noopener", class: 'button' = link_to "Continuer >", admin_procedure_path(@procedure), title: 'Vous pourrez revenir ici par la suite', class: 'button accepted' + - if defined?(metadatas) + %ul.admin-metadata + - metadatas.each do |metadata| + %li= metadata diff --git a/app/views/new_administrateur/procedures/_procedures_list.html.haml b/app/views/new_administrateur/procedures/_procedures_list.html.haml index 4f2678533..b01e0944f 100644 --- a/app/views/new_administrateur/procedures/_procedures_list.html.haml +++ b/app/views/new_administrateur/procedures/_procedures_list.html.haml @@ -6,7 +6,7 @@ .flex.column.ml-1 .card-title = link_to procedure.libelle, admin_procedure_path(procedure), style: 'color: black;' - = link_to(procedure_lien(procedure), procedure_lien(procedure), class: 'procedure-lien mb-1') + = link_to(procedure_lien(procedure), procedure_lien(procedure), class: 'mb-1') .admin-procedures-list-timestamps %p.notice N° #{procedure.id} diff --git a/app/views/new_administrateur/procedures/show.html.haml b/app/views/new_administrateur/procedures/show.html.haml index 25efba6bf..169a9ca30 100644 --- a/app/views/new_administrateur/procedures/show.html.haml +++ b/app/views/new_administrateur/procedures/show.html.haml @@ -1,6 +1,7 @@ = render partial: 'new_administrateur/breadcrumbs', locals: { steps: [link_to('Démarches', admin_procedures_path), - "#{@procedure.libelle} (crée le #{@procedure.created_at.strftime('%d/%m/%Y')})", "#{@procedure.close? ? "Close" : @procedure.locked? ? "Publiée" : "Brouillon"}"] } + "#{@procedure.libelle}", ], + metadatas: ["Créée le #{@procedure.created_at.strftime('%d/%m/%Y')} - n° #{@procedure.id}", "#{@procedure.close? ? "Close le #{@procedure.closed_at.strftime('%d/%m/%Y')}" : @procedure.locked? ? "Publiée - #{procedure_lien(@procedure)}" : "Brouillon"}"] } .container.procedure-admin-container = link_to apercu_admin_procedure_path(@procedure), class: 'button', id: "preview-procedure" do