diff options
| author | Thibault Delavallée <tde@openerp.com> | 2012-02-07 18:07:46 +0100 |
|---|---|---|
| committer | Thibault Delavallée <tde@openerp.com> | 2012-02-07 18:07:46 +0100 |
| commit | 74255533e141ea35b9780a3b63fcaf91e896c2db (patch) | |
| tree | 99824e45a6cbb8c7efe261b17261cc871e474608 /addons/mail/static/src | |
| parent | 7a4f8ea0a1c1b50a701e8d6a8bc75663e545b5a7 (diff) | |
[IMP] Moved code for views in correct files; some improvements in mail.thread; work on threadview widget
bzr revid: tde@openerp.com-20120207170746-m3ptbzotrafa9wvq
Diffstat (limited to 'addons/mail/static/src')
| -rw-r--r-- | addons/mail/static/src/css/mail.css | 2 | ||||
| -rw-r--r-- | addons/mail/static/src/js/mail.js | 3 | ||||
| -rw-r--r-- | addons/mail/static/src/xml/mail.xml | 23 |
3 files changed, 10 insertions, 18 deletions
diff --git a/addons/mail/static/src/css/mail.css b/addons/mail/static/src/css/mail.css index b98913f841e..874e22624f5 100644 --- a/addons/mail/static/src/css/mail.css +++ b/addons/mail/static/src/css/mail.css @@ -39,4 +39,6 @@ .oe_mail_msg_p { padding: 0; margin: 0; + width: 25%; + word-wrap: break-word; } diff --git a/addons/mail/static/src/js/mail.js b/addons/mail/static/src/js/mail.js index 1fce3061f9e..c5498d97dd9 100644 --- a/addons/mail/static/src/js/mail.js +++ b/addons/mail/static/src/js/mail.js @@ -70,9 +70,6 @@ openerp.mail = function(session) { 'record': record, }); $('<div>').html(render_res).appendTo(self.$element); -// $('<div>').text(record.user_id[1]).appendTo(self.$element); -// $('<div>').text(record.date).appendTo(self.$element); -// $('<div>').text(record.body_text).appendTo(self.$element); }); // this.timeout = setTimeout(this.proxy('fetch_messages'), 5000); }, diff --git a/addons/mail/static/src/xml/mail.xml b/addons/mail/static/src/xml/mail.xml index 9ca0f5eb890..35eefe53f16 100644 --- a/addons/mail/static/src/xml/mail.xml +++ b/addons/mail/static/src/xml/mail.xml @@ -10,28 +10,21 @@ <textarea rows="3" cols="15">Type your comment</textarea><br /> <button type="button" class="oe_mail_action_comment">Post comment</button> </div> - <div> - <p> - <t t-if="follow_state == 0">00000000</t> - <t t-if="follow_state == 1">11111111</t> - <t t-if="follow_state == '0'">00000000</t> - <t t-if="follow_state == '1'">11111111</t> - <t t-if="this.follow_state == 0">00000000</t> - <t t-if="this.follow_state == 1">11111111</t> - <t t-if="this.follow_state == '0'">00000000</t> - <t t-if="this.follow_state == '1'">11111111</t> - </p> - </div> </div> <div t-name="ThreadMsgView"> <div class="oe_mail_msg"> +<!-- <p style="border: 3px solid #332299;"> --> + zmeofizepofinzepfoiznepfoizpfozeinfpzoeinfpoznf zfe zef zef ze fz efz efz ef zef ze fz efznf zfe zef zef ze fz efz efz ef zef ze fz efznf zfe zef zef ze fz efz efz ef zef ze fz ef +<!-- </p> --> <div class="oe_mail_msg_image">Image</div> <div class="oe_mail_msg_content"> <p class="oe_mail_msg_p"> - <span class="oe_mail_msg_body"><t t-esc="record.body_text"/></span><br /> - <span class="oe_mail_msg_author"><t t-esc="record.user_id[1]"/></span><br /> - <span class="oe_mail_msg_date"><t t-esc="record.date"/></span> + zmeofizepofinzepfoiznepfoizpfozeinfpzoeinfpoznf zfe zef zef ze fz efz efz ef zef ze fz efznf zfe zef zef ze fz efz efz ef zef ze fz efznf zfe zef zef ze fz efz efz ef zef ze fz ef +<!-- <t t-raw="record.body_text"/> --> +<!-- <span class="oe_mail_msg_body"><t t-raw="record.body_text"/></span><br /> --> +<!-- <span class="oe_mail_msg_author"><t t-raw="record.user_id[1]"/></span><br /> --> +<!-- <span class="oe_mail_msg_date"><t t-raw="record.date"/></span> --> </p> </div> </div> |