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

[IMP] mail.followers widget: invite is now a link after 'Followers' h4 title. Removed the button. The behavior is the same as before. 

bzr revid: tde@openerp.com-20120918142318-glwj47jx7xyvj26d
This commit is contained in:
Thibault Delavallée 2012-09-18 16:23:18 +02:00
parent bbae9cdc00
commit a8798fc9c0
3 changed files with 13 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -124,6 +124,14 @@
}
/* ------------------------------------------------------------ */
/* Followers
/* ------------------------------------------------------------ */
.openerp div.oe_mail_recthread_aside h4 {
display: inline-block;
}
/* ------------------------------------------------------------ */
/* Thread
/* ------------------------------------------------------------ */
@ -226,7 +234,7 @@
clear: both;
}
.openerp .oe_mail_msg_content a {
.openerp .oe_chatter a {
cursor: pointer;
}

6
addons/mail/static/src/js/mail_followers.js
View File

@ -53,7 +53,7 @@ openerp_mail_followers = function(session, mail) {
.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.$el.on('click', 'button.oe_mail_button_follow', function () { self.do_follow(); });
this.$el.on('click', 'button.oe_mail_button_invite', function(event) {
this.$el.on('click', 'a.oe_mail_invite', function(event) {
action = {
type: 'ir.actions.act_window',
res_model: 'mail.wizard.invite',
@ -126,9 +126,9 @@ openerp_mail_followers = function(session, mail) {
display_buttons: function () {
this.$('button.oe_mail_button_follow').hide();
this.$('button.oe_mail_button_unfollow').hide();
this.$('button.oe_mail_button_invite').hide();
this.$('span.oe_mail_invite_wrapper').hide();
if (! this.view.is_action_enabled('edit')) return;
this.$('button.oe_mail_button_invite').show();
this.$('span.oe_mail_invite_wrapper').show();
if (this.message_is_follower) { this.$('button.oe_mail_button_unfollow').show(); }
else if (this.message_is_follower == false) { this.$('button.oe_mail_button_follow').show(); }
},

3
addons/mail/static/src/xml/mail_followers.xml
View File

@ -9,11 +9,10 @@
<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_invite">Invite</button>
</div>
<div class="oe_mail_recthread_followers">
<t t-if="widget.options.title">
<h4><t t-raw="widget.options.title"/></h4>
<h4><t t-raw="widget.options.title"/></h4><span class="oe_mail_invite_wrapper"> · <a class="oe_mail_invite" >Invite partners</a></span>
</t>
<ul class="oe_mail_followers_display"></ul>
</div>