[MERGE] trunk mit
bzr revid: fp@tinyerp.com-20120817072348-jbp3jgtufpeme1wi
This commit is contained in:
commit
c086239c31
|
@ -70,7 +70,7 @@
|
||||||
width: 486px;
|
width: 486px;
|
||||||
}
|
}
|
||||||
|
|
||||||
.openerp div.oe_mail_msg_content li {
|
.openerp div.oe_mail_msg_content > li {
|
||||||
float: left;
|
float: left;
|
||||||
margin-right: 3px;
|
margin-right: 3px;
|
||||||
}
|
}
|
||||||
|
@ -349,6 +349,11 @@
|
||||||
color: #888;
|
color: #888;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
.openerp .oe_mail_msg_footer li {
|
||||||
|
float: left;
|
||||||
|
margin-right: 3px;
|
||||||
|
}
|
||||||
|
|
||||||
.openerp .oe_mail_msg_body {
|
.openerp .oe_mail_msg_body {
|
||||||
margin-bottom: .5em;
|
margin-bottom: .5em;
|
||||||
text-align: justify;
|
text-align: justify;
|
||||||
|
|
|
@ -851,6 +851,14 @@ openerp.mail = function(session) {
|
||||||
this.view.on("change:actual_mode", this, this._check_visibility);
|
this.view.on("change:actual_mode", this, this._check_visibility);
|
||||||
this._check_visibility();
|
this._check_visibility();
|
||||||
mail.ChatterUtils.bind_events(this);
|
mail.ChatterUtils.bind_events(this);
|
||||||
|
this.$element.find('button.oe_mail_button_followers').click(function () { self.do_toggle_followers(); });
|
||||||
|
if (! this.params.see_subscribers_options) {
|
||||||
|
this.$element.find('button.oe_mail_button_followers').hide(); }
|
||||||
|
this.$element.find('button.oe_mail_button_follow').click(function () { self.do_follow(); });
|
||||||
|
this.$element.find('button.oe_mail_button_unfollow').click(function () { self.do_unfollow(); })
|
||||||
|
.mouseover(function () { $(this).html('Unfollow').removeClass('oe_mail_button_mouseout').addClass('oe_mail_button_mouseover'); })
|
||||||
|
.mouseleave(function () { $(this).html('Following').removeClass('oe_mail_button_mouseover').addClass('oe_mail_button_mouseout'); });
|
||||||
|
this.reinit();
|
||||||
},
|
},
|
||||||
|
|
||||||
_check_visibility: function() {
|
_check_visibility: function() {
|
||||||
|
|
|
@ -61,6 +61,17 @@
|
||||||
<div class="oe_mail_recthread_main">
|
<div class="oe_mail_recthread_main">
|
||||||
<!-- contains the document thread -->
|
<!-- contains the document thread -->
|
||||||
</div>
|
</div>
|
||||||
|
<div class="oe_mail_recthread_aside">
|
||||||
|
<div class="oe_mail_recthread_actions">
|
||||||
|
<button type="button" class="oe_mail_button_follow">Follow</button>
|
||||||
|
<button type="button" class="oe_mail_button_unfollow oe_mail_button_mouseout">Following</button>
|
||||||
|
<button type="button" class="oe_mail_button_followers">Show followers</button>
|
||||||
|
</div>
|
||||||
|
<div class="oe_mail_recthread_followers">
|
||||||
|
<h4>Followers</h4>
|
||||||
|
<ul class="oe_mail_followers_display"></ul>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
<!--
|
<!--
|
||||||
|
@ -104,7 +115,7 @@
|
||||||
<!-- default layout -->
|
<!-- default layout -->
|
||||||
<li t-name="mail.thread.message" class="oe_mail oe_mail_thread_msg">
|
<li t-name="mail.thread.message" class="oe_mail oe_mail_thread_msg">
|
||||||
<div t-attf-class="oe_mail_msg_#{record.type}">
|
<div t-attf-class="oe_mail_msg_#{record.type}">
|
||||||
<img class="oe_mail_icon oe_left" t-att-src="record.mini_url"/>
|
<img class="oe_mail_icon oe_mail_frame oe_left" t-att-src="record.mini_url"/>
|
||||||
<div class="oe_mail_msg_content">
|
<div class="oe_mail_msg_content">
|
||||||
<!-- dropdown menu with message options and actions -->
|
<!-- dropdown menu with message options and actions -->
|
||||||
<span class="oe_dropdown_toggle oe_dropdown_arrow">
|
<span class="oe_dropdown_toggle oe_dropdown_arrow">
|
||||||
|
|
Loading…
Reference in New Issue