odoo
/
odoo
2
0
Fork 0
Code Pull Requests Releases Activity

[IMP] WIP about ClEditor. 

bzr revid: tde@openerp.com-20120711154737-gmg72s7vo6ssorm4
This commit is contained in:
Thibault Delavallée 2012-07-11 17:47:37 +02:00
parent fa488a48d5
commit 8a826bbb0a
2 changed files with 9 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
addons/mail/static/src/css/mail.css
View File

@ -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

7
addons/mail/static/src/js/mail.js
View File

@ -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 {