diff --git a/app/assets/stylesheets/new_design/procedure-logo.scss b/app/assets/stylesheets/new_design/procedure-logo.scss new file mode 100644 index 000000000..e6de617d9 --- /dev/null +++ b/app/assets/stylesheets/new_design/procedure-logo.scss @@ -0,0 +1,17 @@ +@import "colors"; +@import "constants"; + +.procedure-logo { + display: flex; + background: #FFFFFF; + border: 1px solid $border-grey; + height: 84px; + width: 84px; + margin-right: 2 * $default-spacer; + + img { + margin: auto; + max-width: 80%; + max-height: 80%; + } +} diff --git a/app/assets/stylesheets/new_design/procedure_list.scss b/app/assets/stylesheets/new_design/procedure_list.scss index 09db9808e..16579bd74 100644 --- a/app/assets/stylesheets/new_design/procedure_list.scss +++ b/app/assets/stylesheets/new_design/procedure_list.scss @@ -26,16 +26,15 @@ } .procedure-logo { - margin-right: 16px; - width: 40px; - border-bottom: 1px solid $border-grey; + height: 93px; + width: 93px; + margin-right: 3 * $default-spacer; } .procedure-title { min-height: 40px; font-size: 20px; margin-bottom: 16px; - padding-left: $default-spacer; } .procedure-status { diff --git a/app/views/new_gestionnaire/procedures/index.html.haml b/app/views/new_gestionnaire/procedures/index.html.haml index 8477051c3..ab074836d 100644 --- a/app/views/new_gestionnaire/procedures/index.html.haml +++ b/app/views/new_gestionnaire/procedures/index.html.haml @@ -5,46 +5,50 @@ - @procedures.each do |p| %li.procedure-item.flex.align-start = link_to(procedure_path(p)) do - .procedure-details - %p.procedure-title + .flex + + .procedure-logo - if p.logo.present? - = image_tag p.logo, class: "procedure-logo" - #{p.libelle} + = image_tag p.logo, alt: "Logo de la procédure" - %ul.procedure-stats.flex - %li - - a_suivre_count = @dossiers_a_suivre_count_per_procedure[p.id] || 0 - .stats-number - = a_suivre_count - .stats-legend - à suivre - %li - - if @notifications_count_per_procedure[p.id].present? - %span.notifications{ 'aria-label': "notifications" } - - followed_count = @followed_dossiers_count_per_procedure[p.id] || 0 - .stats-number - = followed_count - .stats-legend - = t('pluralize.followed', count: followed_count) - %li - - termines_count = @dossiers_termines_count_per_procedure[p.id] || 0 - .stats-number - = termines_count - .stats-legend - = t('pluralize.processed', count: termines_count) - %li - - dossier_count = @dossiers_count_per_procedure[p.id] || 0 - .stats-number - = dossier_count - .stats-legend - = t('pluralize.case', count: dossier_count) - %li - - archived_count = @dossiers_archived_count_per_procedure[p.id] || 0 - .stats-number - = archived_count - .stats-legend - = t('pluralize.archived', count: archived_count) + .procedure-details + %p.procedure-title + = p.libelle - - if p.archivee? - .procedure-status - %span.label Archivée + %ul.procedure-stats.flex + %li + - a_suivre_count = @dossiers_a_suivre_count_per_procedure[p.id] || 0 + .stats-number + = a_suivre_count + .stats-legend + à suivre + %li + - if @notifications_count_per_procedure[p.id].present? + %span.notifications{ 'aria-label': "notifications" } + - followed_count = @followed_dossiers_count_per_procedure[p.id] || 0 + .stats-number + = followed_count + .stats-legend + = t('pluralize.followed', count: followed_count) + %li + - termines_count = @dossiers_termines_count_per_procedure[p.id] || 0 + .stats-number + = termines_count + .stats-legend + = t('pluralize.processed', count: termines_count) + %li + - dossier_count = @dossiers_count_per_procedure[p.id] || 0 + .stats-number + = dossier_count + .stats-legend + = t('pluralize.case', count: dossier_count) + %li + - archived_count = @dossiers_archived_count_per_procedure[p.id] || 0 + .stats-number + = archived_count + .stats-legend + = t('pluralize.archived', count: archived_count) + + - if p.archivee? + .procedure-status + %span.label Archivée diff --git a/app/views/new_gestionnaire/procedures/show.html.haml b/app/views/new_gestionnaire/procedures/show.html.haml index c3ecf838b..69df7ab10 100644 --- a/app/views/new_gestionnaire/procedures/show.html.haml +++ b/app/views/new_gestionnaire/procedures/show.html.haml @@ -1,10 +1,12 @@ #procedure-show .backoffice-header .container.flex - - if @procedure.logo.present? - = image_tag @procedure.logo, height: 40, class: 'procedure-logo' - .width-100 + .procedure-logo + - if @procedure.logo.present? + = image_tag @procedure.logo, alt: "Logo de la procédure" + + .procedure-header %h1= @procedure.libelle %ul.tabs %li{ class: (@statut == 'a-suivre') ? 'active' : nil }>