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

Utilise le bon menu déroulant du DSFR

Browse source
This commit is contained in:
Kara Diaby 2024-11-19 20:17:05 +00:00
parent 1601ca7bb9
commit 99e4dfae9d
No known key found for this signature in database
GPG key ID: C4D1B0CF9F24D759
5 changed files with 57 additions and 64 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -89,21 +89,6 @@ trix-editor.fr-input {
} }
} }
} }
/* prettier-ignore */
.fr-nav__item.section-active {
position: relative;
&::after {
content: ''; // scss-lint:disable StringQuotes
position: absolute;
bottom: -2px;
left: 0;
width: 100%;
height: 2px;
background-color: var(--blue-france-sun-113-625);
transform: translateY(100%);
}
}
@keyframes popover-slide { @keyframes popover-slide {
from { from {

98
app/views/instructeurs/procedures/_header.html.haml
View file

@ -1,55 +1,59 @@
.procedure-header .procedure-header
.clipboard-container .clipboard-container
%h1.fr-h3 %h1.fr-h3.fr-mb-0
= "#{procedure_libelle procedure} (n°#{procedure.id})" = "#{procedure_libelle procedure} (n°#{procedure.id})"
%nav.flex.align-center.fr-translate.fr-nav{ role: "navigation", "aria-label"=> t('instructeurs.dossiers.header.banner.procedure_navigation') } %nav.fr-nav#navigation{ role: "navigation", "aria-label": t('instructeurs.dossiers.header.banner.procedure_navigation') }
.fr-nav__item{ class: ('section-active' if current_nav_section == 'follow_up') } %ul.fr-nav__list
= link_to instructeur_procedure_path(procedure), class: "account-btn fr-btn fr-btn--tertiary fr-btn--no-border", style: "box-shadow: none; background: none;" do %li.fr-nav__item
%span.fr-mr-1w= t('instructeurs.dossiers.header.banner.follow_up') = link_to t('instructeurs.dossiers.header.banner.follow_up'), instructeur_procedure_path(procedure), target: "_self", "aria-current": ('page' if current_nav_section == 'follow_up'), class: "fr-nav__link"
.fr-nav__item.relative{ class: ('section-active' if current_nav_section == 'procedure_management') }
%button.account-btn.fr-translate__btn.fr-btn.fr-btn--tertiary.fr-btn--no-border.fr-text--md{ "aria-controls" => "procedure-management", "aria-expanded" => "false", style: "box-shadow: none; background: none;" }
= t('instructeurs.dossiers.header.banner.procedure_management')
#procedure-management.fr-collapse.fr-menu
%ul.fr-menu__list
%li
= link_to t('instructeurs.dossiers.header.banner.administrators_list'), administrateurs_instructeur_procedure_path(procedure), class: 'fr-nav__link'
- if procedure.instructeurs_self_management_enabled?
%li
= link_to t('instructeurs.dossiers.header.banner.instructeurs'), instructeur_groupes_path(procedure), class: 'fr-nav__link'
- elsif procedure.administrateurs.exists?(id: current_administrateur&.id)
%li
= link_to t('instructeurs.dossiers.header.banner.instructeurs'), admin_procedure_groupe_instructeurs_path(procedure), class: 'fr-nav__link'
%li
= link_to t('instructeurs.dossiers.header.banner.notification_management'), email_notifications_instructeur_procedure_path(procedure), class: 'fr-nav__link'
%li
= link_to t('instructeurs.dossiers.header.banner.statistics'), stats_instructeur_procedure_path(procedure), class: 'fr-nav__link'
%li
= link_to t('views.instructeurs.dossiers.show_deleted_dossiers'), deleted_dossiers_instructeur_procedure_path(@procedure), class: 'fr-nav__link'
.fr-nav__item.relative{ class: ('section-active' if current_nav_section == 'user_support') } %li.fr-nav__item.relative
%button.account-btn.fr-translate__btn.fr-btn.fr-btn--tertiary.fr-btn--no-border.fr-text--md{ "aria-controls" => "user-support", "aria-expanded" => "false", style: "box-shadow: none; background: none;" } %button.fr-nav__btn{ 'aria-expanded': 'false', 'aria-controls': "menu-procedure", 'aria-current': ('page' if current_nav_section == 'procedure_management') }
= t('instructeurs.dossiers.header.banner.user_support') = t('instructeurs.dossiers.header.banner.procedure_management')
#user-support.fr-collapse.fr-menu #menu-procedure.fr-collapse.fr-menu
%ul.fr-menu__list %ul.fr-menu__list
%li %li
= link_to t('instructeurs.dossiers.header.banner.contact_users'), email_usagers_instructeur_procedure_path(procedure), class: 'fr-nav__link' = link_to t('instructeurs.dossiers.header.banner.administrators_list'), administrateurs_instructeur_procedure_path(procedure), class: 'fr-nav__link'
%li
= link_to t('instructeurs.dossiers.header.banner.preview'), apercu_admin_procedure_path(@procedure), target: "_blank", rel: "noopener", class: 'fr-nav__link' - if procedure.instructeurs_self_management_enabled?
%li %li
= link_to "#", class: "fr-nav__link fr-link fr-link--md fr-link--icon-left fr-icon-clipboard-line", data: {controller: "clipboard", clipboard_text_value: commencer_url(@procedure.path), action: "click->clipboard#copy" } do = link_to t('instructeurs.dossiers.header.banner.instructeurs'), instructeur_groupes_path(procedure), class: 'fr-nav__link'
= t('instructeurs.dossiers.header.banner.copy_link_button')
- elsif procedure.administrateurs.exists?(id: current_administrateur&.id)
%li
= link_to t('instructeurs.dossiers.header.banner.instructeurs'), admin_procedure_groupe_instructeurs_path(procedure), class:
%li
= link_to t('instructeurs.dossiers.header.banner.notification_management'), email_notifications_instructeur_procedure_path(procedure), class: 'fr-nav__link'
%li
= link_to t('instructeurs.dossiers.header.banner.statistics'), stats_instructeur_procedure_path(procedure), class: 'fr-nav__link'
%li
= link_to t('views.instructeurs.dossiers.show_deleted_dossiers'), deleted_dossiers_instructeur_procedure_path(@procedure), class: 'fr-nav__link'
%li.fr-nav__item.relative
%button.fr-nav__btn{ 'aria-expanded': 'false', 'aria-controls': 'menu-support', 'aria-current': ('page' if current_nav_section == 'user_support') }
= t('instructeurs.dossiers.header.banner.user_support')
#menu-support.fr-collapse.fr-menu
%ul.fr-menu__list
%li
= link_to t('instructeurs.dossiers.header.banner.contact_users'), email_usagers_instructeur_procedure_path(procedure), class: 'fr-nav__link'
%li
= link_to t('instructeurs.dossiers.header.banner.preview'), apercu_admin_procedure_path(@procedure), target: "_blank", rel: "noopener", class: 'fr-nav__link'
%li
= link_to "#", class: "fr-nav__link fr-link fr-link--md fr-link--icon-left fr-icon-clipboard-line", data: {controller: "clipboard", clipboard_text_value: commencer_url(@procedure.path), action: "click->clipboard#copy" } do
= t('instructeurs.dossiers.header.banner.copy_link_button')
%li.fr-nav__item.relative
%button.fr-nav__btn{ 'aria-expanded': 'false', 'aria-controls': 'menu-downloads', 'aria-current': ('page' if current_nav_section == 'downloads') }
= t('instructeurs.dossiers.header.banner.downloads')
#menu-downloads.fr-collapse.fr-menu
%ul.fr-menu__list
%li
= link_to t('instructeurs.dossiers.header.banner.exports_list'), exports_instructeur_procedure_path(procedure), class: 'fr-nav__link'
%li
= link_to t('instructeurs.dossiers.header.banner.archives'), instructeur_archives_path(procedure), class: 'fr-nav__link'
%li
= link_to t('instructeurs.dossiers.header.banner.exports_models'), exports_instructeur_procedure_path(procedure), class: 'fr-nav__link'
.fr-nav__item.relative{ class: ('section-active' if current_nav_section == 'downloads') }
%button.account-btn.fr-translate__btn.fr-btn.fr-btn--tertiary.fr-btn--no-border.fr-text--md{ "aria-controls" => "downloads", "aria-expanded" => "false", style: "box-shadow: none; background: none;" }
= t('instructeurs.dossiers.header.banner.downloads')
#downloads.fr-collapse.fr-menu
%ul.fr-menu__list
%li
= link_to t('instructeurs.dossiers.header.banner.exports_list'), exports_instructeur_procedure_path(procedure), class: 'fr-nav__link'
%li
= link_to t('instructeurs.dossiers.header.banner.archives'), instructeur_archives_path(procedure), class: 'fr-nav__link'
%li
= link_to t('instructeurs.dossiers.header.banner.exports_models'), exports_instructeur_procedure_path(procedure), class: 'fr-nav__link'
- if @has_export_notification - if @has_export_notification
%span.notifications{ 'aria-label': t('instructeurs.dossiers.header.banner.exports_notification_label') } %span.notifications{ 'aria-label': t('instructeurs.dossiers.header.banner.exports_notification_label') }

2
app/views/instructeurs/procedures/_tabs.html.haml
View file

@ -1,5 +1,5 @@
%nav.fr-tabs.mt-3 %nav.fr-tabs.mt-3
%ul.fr-tabs__list{ role: 'tablist' } %ul.fr-tabs__list.fr-pl-0{ role: 'tablist' }
= tab_item(t(tab_i18n_key_from_status('a-suivre')), = tab_item(t(tab_i18n_key_from_status('a-suivre')),
instructeur_procedure_path(procedure, statut: 'a-suivre'), instructeur_procedure_path(procedure, statut: 'a-suivre'),
active: statut == 'a-suivre', active: statut == 'a-suivre',

2
app/views/instructeurs/procedures/show.html.haml
View file

@ -6,7 +6,7 @@
= render partial: 'instructeurs/breadcrumbs', = render partial: 'instructeurs/breadcrumbs',
locals: { steps: [[@procedure.libelle.truncate_words(10), instructeur_procedure_path(@procedure)]] } locals: { steps: [[@procedure.libelle.truncate_words(10), instructeur_procedure_path(@procedure)]] }
= render partial: 'header', locals: { procedure: @procedure, statut: @statut } = render partial: 'header', locals: { procedure: @procedure, statut: @statut }
%hr.fr-mt-1v %hr
%h1.fr-h5.fr-mb-0= t('.file_tracking') %h1.fr-h5.fr-mb-0= t('.file_tracking')
.fr-container.flex= render partial: "tabs", locals: { procedure: @procedure, .fr-container.flex= render partial: "tabs", locals: { procedure: @procedure,

4
config/locales/views/instructeurs/header/en.yml
View file

@ -10,6 +10,8 @@ en:
en_construction: This file is pending for instruction. The maximum delay is 6 months, you can extend the duration by a month by clicking on the underneath button. en_construction: This file is pending for instruction. The maximum delay is 6 months, you can extend the duration by a month by clicking on the underneath button.
termine: This file had been processed and will soon expire. So it will be deleted soon. If you want to keep it, you can dowload a PDF file of it. termine: This file had been processed and will soon expire. So it will be deleted soon. If you want to keep it, you can dowload a PDF file of it.
button_delay_expiration: "Keep for one more month" button_delay_expiration: "Keep for one more month"
follow_up: File tracking
procedure_management: File management
notification_management: notification management notification_management: notification management
administrators_list: administrators list administrators_list: administrators list
exports_list: exports and export templates exports_list: exports and export templates
@ -17,3 +19,5 @@ en:
statistics: statistics statistics: statistics
instructeurs: instructors instructeurs: instructors
contact_users: Contact users with a draft file contact_users: Contact users with a draft file
downloads: Downloads
user_support: User support