From eaa40d0c0cc8f6eaeeacca7aec3e7fae8382a1d7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20van=20der=20Essen?= Date: Mon, 22 Oct 2012 16:19:32 +0200 Subject: [PATCH] [IMP] further work on the icons bzr revid: fva@openerp.com-20121022141932-xbdorr3287748zfw --- addons/mail/static/src/css/mail.css | 8 ++------ addons/mail/static/src/js/mail.js | 9 +++++---- addons/mail/static/src/xml/mail.xml | 2 +- 3 files changed, 8 insertions(+), 11 deletions(-) diff --git a/addons/mail/static/src/css/mail.css b/addons/mail/static/src/css/mail.css index 9dd18b0fec5..d2c84f38b1a 100644 --- a/addons/mail/static/src/css/mail.css +++ b/addons/mail/static/src/css/mail.css @@ -97,7 +97,7 @@ opacity: 1; -webkit-transition: all 0.1s linear; } -.openerp .oe_mail .oe_msg:hover .oe_msg_icons .oe_star a{ +.openerp .oe_mail .oe_msg .oe_msg_icons .oe_star.oe_starred a{ color: #FFE41F; text-shadow: 0px 1px #DF6200,0px -1px #DF6200, -1px 0px #DF6200, 1px 0px #DF6200, 0px 3px 3px rgba(0,0,0,0.2); } @@ -105,11 +105,7 @@ color: #1fc0ff; text-shadow: 0px 1px #184fc5,0px -1px #184fc5, -1px 0px #184fc5, 1px 0px #184fc5, 0px 3px 3px rgba(0,0,0,0.2); } -.openerp .oe_mail .oe_msg:hover .oe_msg_icons .oe_read a{ - color: #c2ff00; - text-shadow: 0px 1px #009441,0px -1px #009441, -1px 0px #009441, 1px 0px #009441, 0px 3px 3px rgba(0,0,0,0.2); -} -.openerp .oe_mail .oe_msg:hover .oe_msg_icons .oe_unread a{ +.openerp .oe_mail .oe_msg .oe_msg_icons .oe_unread a{ color: #c2ff00; text-shadow: 0px 1px #009441,0px -1px #009441, -1px 0px #009441, 1px 0px #009441, 0px 3px 3px rgba(0,0,0,0.2); } diff --git a/addons/mail/static/src/js/mail.js b/addons/mail/static/src/js/mail.js index 2c8ab4f5b98..77cb3a1938a 100644 --- a/addons/mail/static/src/js/mail.js +++ b/addons/mail/static/src/js/mail.js @@ -669,7 +669,7 @@ openerp.mail = function(session) { // event: click on 'Vote' button this.$el.on('click', '.oe_msg_vote', this.on_vote); // event: click on 'starred/favorite' button - this.$el.on('click', '.oe_mail_starbox', this.on_star); + this.$el.on('click', '.oe_star', this.on_star); }, /** @@ -839,15 +839,16 @@ openerp.mail = function(session) { * add or remove a favorite (or starred) for a message and change class on the DOM */ on_star: function (event) { + console.log('on_star'); event.stopPropagation(); var self=this; - var button = self.$('button.oe_mail_starbox:first'); + var button = self.$('.oe_star:first'); return this.ds_message.call('favorite_toggle', [[self.id]]).pipe(function(star){ self.is_favorite=star; if(self.is_favorite){ - button.addClass('oe_stared'); + button.addClass('oe_starred'); } else { - button.removeClass('oe_stared'); + button.removeClass('oe_starred'); if( self.options.typeof_thread == 'stared' ) { self.animated_destroy({fadeTime:250}); } diff --git a/addons/mail/static/src/xml/mail.xml b/addons/mail/static/src/xml/mail.xml index 2c92aabfde5..a4fbaa71305 100644 --- a/addons/mail/static/src/xml/mail.xml +++ b/addons/mail/static/src/xml/mail.xml @@ -197,7 +197,7 @@ W W ( - 7 + 7