Merge pull request #1004 from sgmap/fix_1002

[Fix #1002] Use partial in print view, and style messagerie in print …
This commit is contained in:
Mathieu Magnin 2017-12-01 12:47:37 +01:00 committed by GitHub
commit 479a7ca0d0
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 25 additions and 14 deletions

View file

@ -37,3 +37,23 @@ th {
font-size: 1.2em;
}
}
.messagerie {
.messages-list {
list-style: none;
padding-left: 0;
max-height: none;
li {
margin-bottom: 40px;
}
h2 {
font-size: 110%;
}
.person-icon {
display: none;
}
}
}

View file

@ -87,20 +87,11 @@
%h2 Messagerie
%table
- @dossier.commentaires.each do |commentaire|
%tr
%th
= render partial: 'new_gestionnaire/shared/commentaires/commentaire_issuer', locals: { commentaire: commentaire, current_gestionnaire: current_gestionnaire }
- if ![current_gestionnaire.email, @dossier.user.email, 'contact@tps.apientreprise.fr'].include?(commentaire.email)
(invité)
%br
= I18n.l(commentaire.created_at.localtime, format: 'le %d/%m/%Y à %H:%M')
%td
%p= sanitize(commentaire.body)
- if file = commentaire.piece_justificative
%br
= file.original_filename
.messagerie
%ul.messages-list
- @dossier.commentaires.each do |commentaire|
%li
= render partial: "new_gestionnaire/shared/commentaires/commentaire", locals: { commentaire: commentaire }
%script{ type: "text/javascript" }
window.print();