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

Merge pull request #725 from sgmap/improve_procedure_logo

Browse source 
Improve procedure logo
This commit is contained in:
Mathieu Magnin 2017-09-15 09:54:51 +02:00 committed by GitHub
commit 2d96a3b451
4 changed files with 69 additions and 47 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
app/assets/stylesheets/new_design/procedure-logo.scss Normal file
View file

@ -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%;
}
}

7
app/assets/stylesheets/new_design/procedure_list.scss
View file

@ -26,16 +26,15 @@
} }
.procedure-logo { .procedure-logo {
margin-right: 16px; height: 93px;
width: 40px; width: 93px;
border-bottom: 1px solid $border-grey; margin-right: 3 * $default-spacer;
} }
.procedure-title { .procedure-title {
min-height: 40px; min-height: 40px;
font-size: 20px; font-size: 20px;
margin-bottom: 16px; margin-bottom: 16px;
padding-left: $default-spacer;
} }
.procedure-status { .procedure-status {

84
app/views/new_gestionnaire/procedures/index.html.haml
View file

@ -5,46 +5,50 @@
- @procedures.each do |p| - @procedures.each do |p|
%li.procedure-item.flex.align-start %li.procedure-item.flex.align-start
= link_to(procedure_path(p)) do = link_to(procedure_path(p)) do
.procedure-details .flex
%p.procedure-title
.procedure-logo
- if p.logo.present? - if p.logo.present?
= image_tag p.logo, class: "procedure-logo" = image_tag p.logo, alt: "Logo de la procédure"
#{p.libelle}
%ul.procedure-stats.flex .procedure-details
%li %p.procedure-title
- a_suivre_count = @dossiers_a_suivre_count_per_procedure[p.id] || 0 = p.libelle
.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? %ul.procedure-stats.flex
.procedure-status %li
%span.label Archivée - 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

8
app/views/new_gestionnaire/procedures/show.html.haml
View file

@ -1,10 +1,12 @@
#procedure-show #procedure-show
.backoffice-header .backoffice-header
.container.flex .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 %h1= @procedure.libelle
%ul.tabs %ul.tabs
%li{ class: (@statut == 'a-suivre') ? 'active' : nil }> %li{ class: (@statut == 'a-suivre') ? 'active' : nil }>