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

small_layout_change_in_wall

Browse Source 
bzr revid: fp@openerp.com-20120730075210-mdzu549s018i72rz
This commit is contained in:
Fabien Pinckaers
2012-07-30 09:52:10 +02:00
parent 4f15336078
commit 83f15b7363
2 changed files with 15 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files
addons/mail/static/src/js/mail.js
+4 -4
View File
@@ -521,7 +521,7 @@ openerp.mail = function(session) {
this.params.parent_id = this.params.parent_id || false;
this.params.thread_level = this.params.thread_level || 0;
this.params.is_wall = this.params.is_wall || (this.params.records != undefined) || false;
this.params.msg_more_limit = this.params.msg_more_limit || 150;
this.params.msg_more_limit = this.params.msg_more_limit || 250;
this.params.limit = this.params.limit || 100;
// this.params.limit = 3; // tmp for testing
this.params.offset = this.params.offset || 0;
@@ -758,11 +758,11 @@ openerp.mail = function(session) {
// expand feature
this.$element.find('div.oe_mail_msg_body:last').expander({
slicePoint: this.params.msg_more_limit,
expandText: 'see more',
userCollapseText: 'see less',
expandText: 'read more',
userCollapseText: '[^]',
detailClass: 'oe_mail_msg_tail',
moreClass: 'oe_mail_expand',
lesClass: 'oe_mail_reduce',
lessClass: 'oe_mail_reduce',
});
},
addons/mail/static/src/xml/mail.xml
+11 -10
View File
@@ -33,7 +33,7 @@
<!-- contains threads -->
</ul>
<div class="oe_mail_wall_more">
<button class="oe_mail_wall_button_more" type="button">See more discussions</button>
<button class="oe_mail_wall_button_more" type="button">See more...</button>
</div>
</div>
<div class="oe_mail_wall_aside">
@@ -129,7 +129,7 @@
<t t-if="display['show_delete']">
<li t-if="record.is_author"><a href="#" class="oe_mail_msg_delete" t-attf-data-id='{record.id}'>Delete</a></li>
</t>
<li t-if="display['show_hide']"><a href="#" class="oe_mail_msg_hide" t-attf-data-id='{record.id}'>Remove from Wall</a></li>
<li t-if="display['show_hide']"><a href="#" class="oe_mail_msg_hide" t-attf-data-id='{record.id}'>Hide</a></li>
<!-- Uncomment when adding subtype hiding
<li t-if="display['show_hide']">
<a href="#" class="oe_mail_msg_hide_type" t-attf-data-subtype='{record.subtype}'>Hide '<t t-esc="record.subtype"/>' for this document</a>
@@ -143,16 +143,17 @@
<h1 t-if="record.subject" class="oe_mail_msg_title">
<t t-raw="record.subject"/>
</h1>
<div t-if="params.thread_level > 0" class="oe_mail_msg_subtitle">
<a t-attf-href="#model=#{params.res_model}&amp;id=#{params.res_id}"><t t-raw="record.record_name"/></a>
</div>
<div class="oe_clear"/>
<div class="oe_mail_msg_body">
<a t-attf-href="#model=res.users&amp;id=#{record.user_id[0]}"><t t-raw="record.user_id[1]"/></a>
<div class="oe_mail_msg_record_body"><t t-raw="record.body"/></div>
<div class="oe_mail_msg_record_body">
<a t-attf-href="#model=#{params.res_model}&amp;id=#{params.res_id}" t-if="(params.thread_level > 0) &amp; (!record.subject)"><t t-raw="record.record_name"/></a>
<t t-raw="record.body"/>
</div>
</div>
<div class="oe_clear"/>
<ul class="oe_mail_msg_footer">
<li t-if="record.subject &amp; params.thread_level > 0"><a t-attf-href="#model=#{params.res_model}&amp;id=#{params.res_id}"><t t-raw="record.record_name"/></a></li>
<li><a t-attf-href="#model=res.users&amp;id=#{record.user_id[0]}"><t t-raw="record.user_id[1]"/></a></li>
<li><span t-att-title="record.date"><t t-raw="record.timerelative"/></span></li>
<li t-if="display['show_reply']"><a href="#" class="oe_mail_msg_reply">Reply</a></li>
<!-- uncomment when merging vote
@@ -160,8 +161,8 @@
-->
<li t-if="record.attachment_ids.length > 0">
<a href="#" class="oe_mail_msg_view_attachments">
<t t-if="record.attachment_ids.length == 1">Attachment</t>
<t t-if="record.attachment_ids.length > 1">Attachments (<t t-raw="record.attachment_ids.length"/>)</t>
<t t-if="record.attachment_ids.length == 1">1 Attachment</t>
<t t-if="record.attachment_ids.length > 1"><t t-raw="record.attachment_ids.length"/> Attachments</t>
</a>
</li>
</ul>