From 8a826bbb0a6a9f143cb43a70dcfa076e5e21f3b7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Thibault=20Delavall=C3=A9e?= Date: Wed, 11 Jul 2012 17:47:37 +0200 Subject: [PATCH] [IMP] WIP about ClEditor. bzr revid: tde@openerp.com-20120711154737-gmg72s7vo6ssorm4 --- addons/mail/static/src/css/mail.css | 9 +++++++-- addons/mail/static/src/js/mail.js | 7 ++----- 2 files changed, 9 insertions(+), 7 deletions(-) diff --git a/addons/mail/static/src/css/mail.css b/addons/mail/static/src/css/mail.css index 874a0e87a11..2a2c70d804c 100644 --- a/addons/mail/static/src/css/mail.css +++ b/addons/mail/static/src/css/mail.css @@ -311,11 +311,16 @@ } /* body_html: cleditor */ -div.cleditorMain { +/*.openerp div.cleditorMain { width: 468px !important; - height: 100px !important; + height: 115px !important; } +.openerp div.cleditorMain iframe { + width: 468px !important; + height: 90px !important; +}*/ + /* ------------------------------------------------------------ */ /* Messages layout diff --git a/addons/mail/static/src/js/mail.js b/addons/mail/static/src/js/mail.js index 1ec18343fb9..6288a27b837 100644 --- a/addons/mail/static/src/js/mail.js +++ b/addons/mail/static/src/js/mail.js @@ -589,12 +589,8 @@ openerp.mail = function(session) { display_comments: function (records) { var self = this; + // sort comments mail.ChatterUtils.sort_comments(this.comments_structure, records, this.params.parent_id); - - /* WIP: map matched regexp -> records to browse with name */ - //_(records).each(function (record) { - //self.do_check_internal_links(record.body_text); - //}); //build attachments download urls and compute time-relative from dates for (var k in records) { @@ -635,6 +631,7 @@ openerp.mail = function(session) { /** Displays a record, performs text/link formatting */ display_comment: function (record) { record.body = mail.ChatterUtils.do_text_nl2br(record.body, true); + // if (record.type == 'email' && record.state == 'received') { if (record.type == 'email') { record.mini_url = ('/mail/static/src/img/email_icon.png'); } else {