From ca0dfc9da63dc75377a16a9133edae7ac2f7f724 Mon Sep 17 00:00:00 2001 From: Christophe Robillard Date: Fri, 18 Nov 2022 06:50:45 +0100 Subject: [PATCH] fix missing header for all demarches layout --- app/views/layouts/all.html.haml | 125 ++++++++++++++++---------------- 1 file changed, 63 insertions(+), 62 deletions(-) diff --git a/app/views/layouts/all.html.haml b/app/views/layouts/all.html.haml index 4ab1c89fa..6ff9abcd5 100644 --- a/app/views/layouts/all.html.haml +++ b/app/views/layouts/all.html.haml @@ -1,68 +1,69 @@ -= render 'main_menu' -.fr-container - %h1.fr-my-4w Toutes les démarches +- content_for :content do + = render 'main_menu' + .fr-container + %h1.fr-my-4w Toutes les démarches - .fr-container--fluid - .fr-grid-row.fr-grid-row--gutters - .fr-col-8 - .fr-highlight.fr-mb-4w - %p Ce tableau de bord permet de consulter les informations sur les démarches simplifiées pour toutes les zones. Filtrez par zone et statut. Consultez la liste des démarches et cliquez sur une démarche pour voir la zone et quels sont les administrateurs. + .fr-container--fluid + .fr-grid-row.fr-grid-row--gutters + .fr-col-8 + .fr-highlight.fr-mb-4w + %p Ce tableau de bord permet de consulter les informations sur les démarches simplifiées pour toutes les zones. Filtrez par zone et statut. Consultez la liste des démarches et cliquez sur une démarche pour voir la zone et quels sont les administrateurs. - .fr-container--fluid{ 'data-turbo': 'true', 'data-controller': 'autosubmit' } - .fr-grid-row.fr-grid-row--gutters - .fr-col-3 - = form_with(url: all_admin_procedures_path, method: :get, html: {'data-autosubmit-target': 'form'}) do |f| + .fr-container--fluid{ 'data-turbo': 'true', 'data-controller': 'autosubmit' } + .fr-grid-row.fr-grid-row--gutters + .fr-col-3 + = form_with(url: all_admin_procedures_path, method: :get, html: {'data-autosubmit-target': 'form'}) do |f| - %fieldset.sidebar-filter - %legend - .title.font-weight-bold.fr-pl-2w - %span.fr-icon-filter-fill.fr-icon--sm.fr-mr-1w{ 'aria-hidden': 'true' } - Filtrer - .reinit - = link_to all_admin_procedures_path(zone_ids: current_administrateur.zones) do - %span.fr-icon-arrow-go-back-line Réinitialiser - %ul - %li.fr-py-2w.fr-pl-2w{ 'data-controller': "expand" } - .fr-mb-1w - %button{ 'data-action': 'expand#toggle' } - %span.fr-icon-add-line.fr-icon--sm.fr-mr-1w.fr-text-action-high--blue-france{ 'aria-hidden': 'true', 'data-expand-target': 'icon' } - Mes zones - .fr-ml-1w{ 'data-expand-target': 'content' } - = f.collection_check_boxes :zone_ids, @filter.admin_zones, :id, :current_label, include_hidden: false do |b| - .fr-checkbox-group.fr-ml-2w.fr-py-1w - = b.check_box(checked: @filter.zone_filtered?(b.value), 'data-action': 'autosubmit#submit') - = b.label(class: 'fr-label') { b.text } - %li.fr-py-2w.fr-pl-2w{ 'data-controller': "expand" } - .fr-mb-1w - %button{ 'data-action': 'expand#toggle' } - %span.fr-icon-add-line.fr-icon--sm.fr-mr-1w.fr-text-action-high--blue-france{ 'aria-hidden': 'true', 'data-expand-target': 'icon' } - Autres zones - .fr-ml-1w.hidden{ 'data-expand-target': 'content' } - = f.collection_check_boxes :zone_ids, @filter.other_zones, :id, :current_label, include_hidden: false do |b| - .fr-checkbox-group.fr-ml-2w.fr-py-1w - = b.check_box(checked: @filter.zone_filtered?(b.value), 'data-action': 'autosubmit#submit') - = b.label(class: 'fr-label') { b.text } - %li.fr-py-2w{ 'data-controller': "expand" } - .fr-mb-1w.fr-pl-2w - %button{ 'data-action': 'click->expand#toggle' } - %span.fr-icon-add-line.fr-icon--sm.fr-mr-1w.fr-text-action-high--blue-france{ 'aria-hidden': 'true', 'data-expand-target': 'icon' } - Date de publication - .fr-input-group.hidden{ 'data-expand-target': 'content' } - = f.label 'from_publication_date', 'Depuis', class: 'fr-label' - .fr-input-wrap.fr-fi-calendar-line - = f.date_field 'from_publication_date', value: @filter.from_publication_date, class: 'fr-input', 'data-action': 'blur->autosubmit#submit change->autosubmit#debouncedSubmit' + %fieldset.sidebar-filter + %legend + .title.font-weight-bold.fr-pl-2w + %span.fr-icon-filter-fill.fr-icon--sm.fr-mr-1w{ 'aria-hidden': 'true' } + Filtrer + .reinit + = link_to all_admin_procedures_path(zone_ids: current_administrateur.zones) do + %span.fr-icon-arrow-go-back-line Réinitialiser + %ul + %li.fr-py-2w.fr-pl-2w{ 'data-controller': "expand" } + .fr-mb-1w + %button{ 'data-action': 'expand#toggle' } + %span.fr-icon-add-line.fr-icon--sm.fr-mr-1w.fr-text-action-high--blue-france{ 'aria-hidden': 'true', 'data-expand-target': 'icon' } + Mes zones + .fr-ml-1w{ 'data-expand-target': 'content' } + = f.collection_check_boxes :zone_ids, @filter.admin_zones, :id, :current_label, include_hidden: false do |b| + .fr-checkbox-group.fr-ml-2w.fr-py-1w + = b.check_box(checked: @filter.zone_filtered?(b.value), 'data-action': 'autosubmit#submit') + = b.label(class: 'fr-label') { b.text } + %li.fr-py-2w.fr-pl-2w{ 'data-controller': "expand" } + .fr-mb-1w + %button{ 'data-action': 'expand#toggle' } + %span.fr-icon-add-line.fr-icon--sm.fr-mr-1w.fr-text-action-high--blue-france{ 'aria-hidden': 'true', 'data-expand-target': 'icon' } + Autres zones + .fr-ml-1w.hidden{ 'data-expand-target': 'content' } + = f.collection_check_boxes :zone_ids, @filter.other_zones, :id, :current_label, include_hidden: false do |b| + .fr-checkbox-group.fr-ml-2w.fr-py-1w + = b.check_box(checked: @filter.zone_filtered?(b.value), 'data-action': 'autosubmit#submit') + = b.label(class: 'fr-label') { b.text } + %li.fr-py-2w{ 'data-controller': "expand" } + .fr-mb-1w.fr-pl-2w + %button{ 'data-action': 'click->expand#toggle' } + %span.fr-icon-add-line.fr-icon--sm.fr-mr-1w.fr-text-action-high--blue-france{ 'aria-hidden': 'true', 'data-expand-target': 'icon' } + Date de publication + .fr-input-group.hidden{ 'data-expand-target': 'content' } + = f.label 'from_publication_date', 'Depuis', class: 'fr-label' + .fr-input-wrap.fr-fi-calendar-line + = f.date_field 'from_publication_date', value: @filter.from_publication_date, class: 'fr-input', 'data-action': 'blur->autosubmit#submit change->autosubmit#debouncedSubmit' - %li.fr-py-2w.fr-pl-2w{ 'data-controller': "expand" } - .fr-mb-1w - %button{ 'data-action': 'expand#toggle' } - %span.fr-icon-add-line.fr-icon--sm.fr-mr-1w.fr-text-action-high--blue-france{ 'aria-hidden': 'true', 'data-expand-target': 'icon' } - Statut - .fr-ml-1w.hidden{ 'data-expand-target': 'content' } - = f.collection_check_boxes :statuses, ['publiee', 'close'], :to_s, :to_s, include_hidden: false do |b| - .fr-checkbox-group.fr-ml-2w.fr-py-1w - = b.check_box(checked: @filter.status_filtered?(b.value), 'data-action': 'autosubmit#submit') - = b.label(class: 'fr-label') { t b.text, scope: 'activerecord.attributes.procedure.aasm_state' } + %li.fr-py-2w.fr-pl-2w{ 'data-controller': "expand" } + .fr-mb-1w + %button{ 'data-action': 'expand#toggle' } + %span.fr-icon-add-line.fr-icon--sm.fr-mr-1w.fr-text-action-high--blue-france{ 'aria-hidden': 'true', 'data-expand-target': 'icon' } + Statut + .fr-ml-1w.hidden{ 'data-expand-target': 'content' } + = f.collection_check_boxes :statuses, ['publiee', 'close'], :to_s, :to_s, include_hidden: false do |b| + .fr-checkbox-group.fr-ml-2w.fr-py-1w + = b.check_box(checked: @filter.status_filtered?(b.value), 'data-action': 'autosubmit#submit') + = b.label(class: 'fr-label') { t b.text, scope: 'activerecord.attributes.procedure.aasm_state' } - .fr-col-9 - = yield(:results) + .fr-col-9 + = yield(:results) = render template: 'layouts/application'