diff options
| author | Raphael Collet <rco@openerp.com> | 2012-06-28 15:12:10 +0200 |
|---|---|---|
| committer | Raphael Collet <rco@openerp.com> | 2012-06-28 15:12:10 +0200 |
| commit | 1debe0efcd00a294fa436a8a13416ccb1de0e919 (patch) | |
| tree | a9a7209823affdaedb129f6f1cd1c0173fa11a6e /addons/share/static | |
| parent | 083deae5a4845cb9578b318ec08bd2d62b79a755 (diff) | |
| parent | a6e3d4bf0029d879e008414090d54499ffe358f4 (diff) | |
[MERGE] from trunk
bzr revid: rco@openerp.com-20120628131210-hyx2t1lqbl5hwm9g
Diffstat (limited to 'addons/share/static')
| -rw-r--r-- | addons/share/static/src/css/share.css | 4 | ||||
| -rw-r--r-- | addons/share/static/src/js/share.js | 18 | ||||
| -rw-r--r-- | addons/share/static/src/xml/share.xml | 8 |
3 files changed, 15 insertions, 15 deletions
diff --git a/addons/share/static/src/css/share.css b/addons/share/static/src/css/share.css index 2cab9c6d2f2..997c070fe54 100644 --- a/addons/share/static/src/css/share.css +++ b/addons/share/static/src/css/share.css @@ -1,7 +1,7 @@ -button.oe-share-mail { +button.oe_share_mail { display: none; } -a.oe-share_link, a.oe-share { +a.oe_share_link, a.oe_share { display: none; } diff --git a/addons/share/static/src/js/share.js b/addons/share/static/src/js/share.js index 3563a4bb859..e88616546a3 100644 --- a/addons/share/static/src/js/share.js +++ b/addons/share/static/src/js/share.js @@ -58,7 +58,7 @@ openerp.share = function(session) { self.add_items('other', [{ label: 'Share', callback: self.on_sidebar_click_share, - classname: 'oe-share', + classname: 'oe_share', }]); }); }, @@ -72,7 +72,7 @@ openerp.share = function(session) { start: function() { start_res = this._super.apply(this, arguments); if (has_action_id) { - this.$element.find('button.oe-share-mail').show(); + this.$element.find('button.oe_share_mail').show(); } return start_res; } @@ -83,12 +83,12 @@ openerp.share = function(session) { var self = this; this.check_if_action_is_defined(); has_share(function() { - self.$element.find('a.oe-share_link').click(self.on_click_share_link); - self.$element.find('a.oe-share').click(self.on_click_share); - self.$element.delegate('button.oe-share-mail', 'click', self.on_click_share_mail); + self.$element.find('a.oe_share_link').click(self.on_click_share_link); + self.$element.find('a.oe_share').click(self.on_click_share); + self.$element.delegate('button.oe_share_mail', 'click', self.on_click_share_mail); }, function() { - self.$element.find('a.oe-share_link').remove(); - self.$element.find('a.oe-share').remove(); + self.$element.find('a.oe_share_link').remove(); + self.$element.find('a.oe_share').remove(); }); return this._super.apply(this, arguments); }, @@ -96,8 +96,8 @@ openerp.share = function(session) { check_if_action_is_defined: function() { if (this.action && this.action.id) { has_action_id = true; - this.$element.find('a.oe-share_link').show(); - this.$element.find('a.oe-share').show(); + this.$element.find('a.oe_share_link').show(); + this.$element.find('a.oe_share').show(); } else { has_action_id = false; diff --git a/addons/share/static/src/xml/share.xml b/addons/share/static/src/xml/share.xml index df9cb165c36..e51dc135c0b 100644 --- a/addons/share/static/src/xml/share.xml +++ b/addons/share/static/src/xml/share.xml @@ -4,15 +4,15 @@ <templates id="template" xml:space="preserve"> <t t-extend="ViewManagerAction"> - <t t-jquery=".oe-shortcut-toggle" t-operation="after"> - <a class="oe-share_link" href="#share_link" title="Link or embed..."><img t-att-src='_s + "/share/static/src/img/share.png"'/></a> - <a class="oe-share" href="#share" title="Share with..."><img t-att-src='_s + "/share/static/src/img/share.png"'/></a> + <t t-jquery=".oe_shortcuts_toggle" t-operation="after"> + <a class="oe_share_link" href="#share_link" title="Link or embed..."><img t-att-src='_s + "/share/static/src/img/share.png"'/></a> + <a class="oe_share" href="#share" title="Share with..."><img t-att-src='_s + "/share/static/src/img/share.png"'/></a> </t> </t> <t t-extend="RecordThread"> <t t-jquery="button.oe_mail_button_unfollow" t-operation="after"> - <button type="button" class="oe-share-mail oe_mail_button_mouseout">Invite</button> + <button type="button" class="oe_share_mail oe_mail_button_mouseout">Invite</button> </t> </t> |