Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Amélioration de la hiérarchie de titres sur les pages de listing et suppression d'un lien vide #10393

Merged
merged 6 commits into from
May 13, 2024
+20 −23
Merged

Amélioration de la hiérarchie de titres sur les pages de listing et suppression d'un lien vide #10393

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
f0544d7
User - Improve titles on listing pages
inseo May 2, 2024
2dc6e3f
Instructor - Improve titles on listing pages
inseo May 2, 2024
4a92134
Admin - Improve titles on listing pages
inseo May 2, 2024
c518018
Admin - Add main title
inseo May 2, 2024
74f1f19
Expert : Standardize title
inseo May 2, 2024
907bc8d
Instructor : Remove empty link
inseo May 2, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 0 additions & 7 deletions app/assets/stylesheets/procedure_admin.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,14 +13,7 @@
}

.procedure-admin-listing-container {
display: flex;
justify-content: flex-end;
padding-left: 16px;
padding-right: 16px;
max-width: 1072px;
margin-left: auto;
margin-right: auto;
margin-top: 10px;
}

.container {
Expand Down
4 changes: 2 additions & 2 deletions app/views/administrateurs/procedures/_procedures_list.html.haml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
.fr-h6
%h2.fr-h6
= page_entries_info procedures

- procedures.each do |procedure|
Expand All @@ -10,7 +10,7 @@
= image_tag procedure.logo, alt: procedure.libelle, class: 'logo'

%div
.card-title
%h3.card-title
= link_to procedure.libelle, admin_procedure_path(procedure)

= link_to commencer_url(procedure.path), commencer_url(procedure.path), class: 'fr-link fr-mb-1w'
Expand Down
6 changes: 4 additions & 2 deletions app/views/administrateurs/procedures/index.html.haml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,8 @@
.sub-header
.procedure-admin-listing-container
= link_to "Nouvelle Démarche", new_from_existing_admin_procedures_path, id: 'new-procedure', class: 'fr-btn'
.flex.fr-container
%h1.fr-h3 Mes démarches
.procedure-admin-listing-container.fr-mt-1v
mfo marked this conversation as resolved.
Show resolved Hide resolved
= link_to "Nouvelle Démarche", new_from_existing_admin_procedures_path, id: 'new-procedure', class: 'fr-btn'
.fr-container

%nav.fr-tabs{ role: 'navigation', 'aria-label': t('views.users.dossiers.secondary_menu') }
Expand Down
6 changes: 4 additions & 2 deletions app/views/experts/avis/index.html.haml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,10 @@
- content_for(:title, "Avis")

.container
%h1.page-title Avis
.sub-header
.fr-container
%h1.fr-h3 Avis

.fr-container
mfo marked this conversation as resolved.
Show resolved Hide resolved
%ul.procedure-list.fr-pl-0
- @avis_by_procedure.each do |p, procedure_avis|
%li.flex.align-start.fr-my-3w.fr-p-2w{ id: dom_id(p) }
Expand Down
8 changes: 4 additions & 4 deletions app/views/instructeurs/procedures/_list.html.haml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
%li.flex.align-start.fr-mb-5w
.flex
= link_to instructeur_procedure_path(p), class: 'procedure-logo-link' do
.procedure-logo{ style: "background-image: url(#{p.logo_url})" }
.procedure-logo{ style: "background-image: url(#{p.logo_url})" }

.procedure-details
.flex.clipboard-container
%p.fr-mb-2w
.fr-mb-2w
= procedure_badge(p)
= link_to("#{p.libelle} - n°#{p.id}", instructeur_procedure_path(p), class: "fr-link fr-ml-1w")
%h3.font-weight-normal.fr-link.fr-ml-1w
= link_to("#{p.libelle} - n°#{p.id}", instructeur_procedure_path(p))
mfo marked this conversation as resolved.
Show resolved Hide resolved
= render Dsfr::CopyButtonComponent.new(title: t('instructeurs.procedures.index.copy_link_button'), text: commencer_url(p.path))

%ul.procedure-stats.flex
Expand Down
2 changes: 1 addition & 1 deletion app/views/instructeurs/procedures/_synthese.html.haml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
- if procedures.length > 1
.flex.align-center.fr-mb-2w
%h2.fr-text--sm.fr-mb-1w= t('views.instructeurs.dossiers.dossier_synthesis')
%p.font-weight-bold.fr-text--sm.fr-mb-1w= t('views.instructeurs.dossiers.dossier_synthesis')
- all_dossiers_counts.each_with_index do |(label, dossier_count)|
- if dossier_count != 0
%span.fr-badge.fr-ml-1w.fr-mb-1w= number_with_html_delimiter(dossier_count) + ' ' + label
2 changes: 1 addition & 1 deletion app/views/instructeurs/procedures/index.html.haml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@


- if collection.present?
.fr-h6
%h2.fr-h6
= page_entries_info collection
%ul.procedure-list.fr-pl-0
= render partial: 'instructeurs/procedures/list',
Expand Down
4 changes: 2 additions & 2 deletions app/views/users/dossiers/_deleted_dossiers_list.html.haml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
- if deleted_dossiers.present?
.fr-h6.fr-mb-2w
%h2.fr-h6.fr-mb-2w
= page_entries_info deleted_dossiers

- deleted_dossiers.each do |dossier|
.card
.flex.justify-between
%div
%h2.card-title
%h3.card-title
= dossier.procedure.libelle

%p.fr-icon--sm.fr-icon-delete-line.fr-mb-0
Expand Down
4 changes: 2 additions & 2 deletions app/views/users/dossiers/_dossiers_list.html.haml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
- if dossiers.present?
.fr-h6.fr-mb-2w
%h2.fr-h6.fr-mb-2w
= page_entries_info dossiers

- dossiers.each do |dossier|
.card
.flex.justify-between
%div
%h2.card-title
%h3.card-title
- if ["dossiers-transferes", "dossiers-supprimes-recemment"].exclude?(@statut)
= link_to(url_for_dossier(dossier), class: 'cell-link') do
= dossier.procedure.libelle
Expand Down
Loading