Merge pull request #6135 from betagouv/small_style_fixes

Instructeur : petites améliorations de l'interface du tableau de bord d'une démarche (#6135)
This commit is contained in:
Pierre de La Morinerie 2021-05-06 09:22:13 +02:00 committed by GitHub
commit 225fadbdf8
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
5 changed files with 11 additions and 12 deletions

View file

@ -46,8 +46,6 @@
}
.notification-col {
width: 45px;
a {
font-size: 16px;
}

View file

@ -1,8 +1,9 @@
%th{ class: classname }
= link_to update_sort_instructeur_procedure_path(@procedure, table: field['table'], column: field['column']) do
= field['label']
- if @procedure_presentation.sort['table'] == field['table'] && @procedure_presentation.sort['column'] == field['column']
- if @procedure_presentation.sort['order'] == 'asc'
%img.caret-icon{ src: image_url("table/up_caret.svg"), width: 10, height: 6, loading: 'lazy' }
#{field['label']} ↑
- else
%img.caret-icon{ src: image_url("table/down_caret.svg"), width: 10, height: 6, loading: 'lazy' }
#{field['label']} ↓
- else
#{field['label']}

View file

@ -38,7 +38,7 @@
badge: number_with_html_delimiter(@traites_count),
notification: @has_termine_notifications)
= tab_item('tous les dossiers',
= tab_item('au total',
instructeur_procedure_path(@procedure, statut: 'tous'),
active: @statut == 'tous',
badge: number_with_html_delimiter(@tous_count))

View file

@ -2,6 +2,6 @@
- if notification
%span.notifications{ 'aria-label': 'notifications' }
= link_to(url) do
= label
- if badge.present?
%span.badge= badge
= label

View file

@ -216,11 +216,11 @@ feature 'Instructing a dossier:', js: true do
def test_statut_bar(a_suivre: 0, suivi: 0, traite: 0, tous_les_dossiers: 0, archive: 0)
texts = [
"à suivre #{a_suivre}",
"suivi #{suivi}",
"traité #{traite}",
"tous les dossiers #{tous_les_dossiers}",
"archivé #{archive}"
"#{a_suivre} à suivre",
"#{suivi} suivi",
"#{traite} traité",
"#{tous_les_dossiers} au total",
"#{archive} archivé"
]
texts.each { |text| expect(page).to have_text(text) }