From 4ce75bb9bdfe805d479ccc25060d8bcc6b0ace01 Mon Sep 17 00:00:00 2001 From: Christophe Matthieu Date: Wed, 24 Oct 2012 16:09:10 +0200 Subject: [PATCH] [IMP] mail: preview documents (doc, pdf...) on openchatter bzr revid: chm@openerp.com-20121024140910-88gj3t5efhc7pzzi --- addons/mail/static/src/css/mail.css | 3 +++ addons/mail/static/src/js/mail.js | 7 ++++++- addons/mail/static/src/xml/mail.xml | 10 +++++++++- 3 files changed, 18 insertions(+), 2 deletions(-) diff --git a/addons/mail/static/src/css/mail.css b/addons/mail/static/src/css/mail.css index a1f2b5c4910..4b412000a54 100644 --- a/addons/mail/static/src/css/mail.css +++ b/addons/mail/static/src/css/mail.css @@ -187,6 +187,9 @@ .openerp .oe_mail .oe_msg_attachments .oe_attachment:nth-child(even){ background: #F4F5FA; } +.openerp .oe_mail .oe_msg_images { + display: block; +} .openerp .oe_mail .oe_msg_footer button{ display: inline; height: 24px; diff --git a/addons/mail/static/src/js/mail.js b/addons/mail/static/src/js/mail.js index 2fc2861c0d2..35fe012e054 100644 --- a/addons/mail/static/src/js/mail.js +++ b/addons/mail/static/src/js/mail.js @@ -636,11 +636,16 @@ openerp.mail = function(session) { } for (var l in this.attachment_ids) { var attach = this.attachment_ids[l]; + attach['url'] = mail.ChatterUtils.get_attachment_url(this.session, attach); + if((attach.filename || attach.name).match(/[.](jpg|jpg|gif|png|tif|svg)$/i)) { attach.is_image = true; } - attach['url'] = mail.ChatterUtils.get_attachment_url(this.session, attach); + if((attach.filename || attach.name).match(/[.](pdf|doc|docx|xls|xlsx|ppt|pptx|psd|tiff|dxf|svg)$/i)) { + attach.is_document = true; + attach.url_escape = escape(attach.url); + } } }, diff --git a/addons/mail/static/src/xml/mail.xml b/addons/mail/static/src/xml/mail.xml index 1e3c699e39a..59ffc93bdf4 100644 --- a/addons/mail/static/src/xml/mail.xml +++ b/addons/mail/static/src/xml/mail.xml @@ -71,7 +71,7 @@ --> - +
@@ -97,6 +97,14 @@ + + + + + + + +