diff --git a/addons/mail/static/src/css/mail.css b/addons/mail/static/src/css/mail.css index e4e112cdfaf..fb67c77a3f2 100644 --- a/addons/mail/static/src/css/mail.css +++ b/addons/mail/static/src/css/mail.css @@ -545,7 +545,16 @@ text-align: center; width:100%; } -.openerp .oe_followers button.oe_follower.oe_following{ +.openerp .oe_followers button.oe_invite{ + margin: 0; + padding: 2px 8px; + position: relative; + top: -2px; + font-size: 12px; + text-shadow: none; +} +.openerp .oe_followers button.oe_follower.oe_following, +.openerp .oe_followers button.oe_invite{ color: white; background-color: #3465A4; background-image: -webkit-linear-gradient(top, #729FCF, #3465A4); diff --git a/addons/mail/static/src/js/mail_followers.js b/addons/mail/static/src/js/mail_followers.js index 9f88116acc7..b02f4936474 100644 --- a/addons/mail/static/src/js/mail_followers.js +++ b/addons/mail/static/src/js/mail_followers.js @@ -215,21 +215,13 @@ openerp_mail_followers = function(session, mail) { /** Display subtypes: {'name': default, followed} */ display_subtypes:function (data) { var self = this; - var subtype_list_ul = this.$('.oe_subtype_list'); - subtype_list_ul.empty(); + this.$('.oe_subtype_list').empty(); var records = data[this.view.datarecord.id || this.view.dataset.ids[0]].message_subtype_data; - var nb_subtype = 0; - _(records).each(function (record) {nb_subtype++;}); - if (nb_subtype > 1) { - this.$('hr').show(); - _(records).each(function (record, record_name) { - record.name = record_name; - record.followed = record.followed || undefined; - $(session.web.qweb.render('mail.followers.subtype', {'record': record})).appendTo( self.$('.oe_subtype_list') ); - }); - } else { - this.$('hr').hide(); - } + _(records).each(function (record, record_name) { + record.name = record_name; + record.followed = record.followed || undefined; + $(session.web.qweb.render('mail.followers.subtype', {'record': record})).appendTo( self.$('.oe_subtype_list') ); + }); }, do_follow: function () { diff --git a/addons/mail/static/src/xml/mail_followers.xml b/addons/mail/static/src/xml/mail_followers.xml index 459f13155a0..5eb9c1c0e8d 100644 --- a/addons/mail/static/src/xml/mail_followers.xml +++ b/addons/mail/static/src/xml/mail_followers.xml @@ -17,10 +17,9 @@
-

Followers

- Add others +