pengyuthon/odoo_source
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

mail define new layout blog/default

Browse Source 
bzr revid: al@openerp.com-20120612144740-gnx4z9h0tnpy6cha
This commit is contained in:
Antony Lesuisse
2012-06-12 16:47:40 +02:00
parent fcca76b487
commit 73b14dae77
2 changed files with 25 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
addons/mail/static/src/js/mail.js
+2 -1
View File
@@ -278,7 +278,8 @@ openerp.mail = function(session) {
// format date according to the user timezone
record.date = session.web.format_value(record.date, {type:"datetime"});
// render
$(session.web.qweb.render('ThreadMsg', {'record': record, 'thread': this, 'params': this.params, 'display': this.display})
// OPTIONS
$(session.web.qweb.render('mail.Thread.default', {'record': record, 'thread': this, 'params': this.params, 'display': this.display})
).appendTo(this.$element.children('div.oe_mail_thread_display:first'));
// truncated: hide full-text, show summary, add buttons
if (record.tr_body) {
addons/mail/static/src/xml/mail.xml
+23 -7
View File
@@ -57,19 +57,21 @@
</div>
</ul>
<li t-name="ThreadMsg" t-attf-class="oe_mail oe_mail_thread_msg">
<!-- default layout -->
<li t-name="mail.Thread.default" t-attf-class="oe_mail oe_mail_thread_msg">
<div t-attf-class="oe_mail_msg_#{record.type}">
<img t-if="record.type == 'email'" class="oe_email_icon oe_left" src="/mail/static/src/img/email_icon.png"/>
<img t-if="record.type == 'notification' || record.type == 'comment'" class="oe_mail_msg_image oe_left" t-att-src="record.mini_url"/>
<div class="oe_mail_msg_content">
<t t-if="record.type == 'email'"><t t-call="EmailDisplay" /></t>
<t t-if="record.type == 'notification' || record.type == 'comment'"><t t-call="NoteDisplay" /></t>
<t t-if="record.type == 'email'"><t t-call="mail.Thread.default.EmailDisplay"/></t>
<t t-if="record.type == 'notification' || record.type == 'comment'"><t t-call="mail.Thread.default.NoteDisplay" /></t>
</div>
<t t-if="record.type == 'tmp'"><t t-call="ThreadDisplay" /></t>
</div>
</li>
<t t-name="NoteDisplay">
<t t-name="mail.Thread.default.NoteDisplay">
<p class="oe_mail_msg">
<t t-if="params.thread_level > 0">
<a href="#" class="intlink oe_mail_oe_intlink" t-attf-data-res-model='{params.res_model}' t-attf-data-res-id='{params.res_id}'><t t-raw="record.record_name"/></a>
@@ -98,8 +100,8 @@
</ul>
</p>
</t>
<t t-name="EmailDisplay">
<t t-name="mail.Thread.default.EmailDisplay">
<p class="oe_mail_msg oe_mail_msg_p_email_header">
<t t-if="params.thread_level > 0">
<a href="#" class="intlink oe_mail_oe_intlink" t-attf-data-res-model='{params.res_model}' t-attf-data-res-id='{params.res_id}'><t t-raw="record.record_name"/></a>
@@ -129,4 +131,18 @@
</ul>
</t>
<!-- blog layout -->
<li t-name="mail.Thread.blogs" t-attf-class="oe_mail oe_mail_thread_msg">
<div t-attf-class="oe_mail_msg_#{record.type}">
<img t-if="record.type == 'email'" class="oe_email_icon oe_left" src="/mail/static/src/img/email_icon.png"/>
<img t-if="record.type == 'notification' || record.type == 'comment'" class="oe_mail_msg_image oe_left" t-att-src="record.mini_url"/>
<div class="oe_mail_msg_content">
<t t-if="record.type == 'email'"><t t-call="EmailDisplay" /></t>
<t t-if="record.type == 'notification' || record.type == 'comment'"><t t-call="NoteDisplay" /></t>
</div>
<t t-if="record.type == 'tmp'"><t t-call="ThreadDisplay" /></t>
</div>
</li>
</template>