From cd4c3b6c913a42b32bd807ed5d411a7526a3430c Mon Sep 17 00:00:00 2001 From: Fabien Meghazi Date: Wed, 27 Jun 2012 16:13:52 +0200 Subject: [PATCH] [CHG] Ashes to ashes, dashes to underscores. bzr revid: fme@openerp.com-20120627141352-7a6d23iebv03rcv3 --- addons/point_of_sale/static/src/js/pos.js | 4 ++-- addons/point_of_sale/static/src/xml/pos.xml | 8 ++++---- addons/share/static/src/css/share.css | 4 ++-- addons/share/static/src/js/share.js | 18 +++++++++--------- addons/share/static/src/xml/share.xml | 8 ++++---- .../static/src/css/web_shortcuts.css | 14 +++++++------- .../static/src/js/web_shortcuts.js | 8 ++++---- .../static/src/xml/web_shortcuts.xml | 2 +- 8 files changed, 33 insertions(+), 33 deletions(-) diff --git a/addons/point_of_sale/static/src/js/pos.js b/addons/point_of_sale/static/src/js/pos.js index 8605e8cac9c..d62e56cab30 100644 --- a/addons/point_of_sale/static/src/js/pos.js +++ b/addons/point_of_sale/static/src/js/pos.js @@ -884,7 +884,7 @@ openerp.point_of_sale = function(db) { */ var CategoryWidget = db.web.OldWidget.extend({ start: function() { - this.$element.find(".oe-pos-categories-list a").click(_.bind(this.changeCategory, this)); + this.$element.find(".oe_pos_categories_list a").click(_.bind(this.changeCategory, this)); }, template_fct: qweb_template('pos-category-template'), renderElement: function() { @@ -1009,7 +1009,7 @@ openerp.point_of_sale = function(db) { }, start: function() { $('button#validate-order', this.$element).click(_.bind(this.validateCurrentOrder, this)); - $('.oe-back-to-products', this.$element).click(_.bind(this.back, this)); + $('.oe_back_to_products', this.$element).click(_.bind(this.back, this)); }, back: function() { this.shop.get('selectedOrder').set({"step": "products"}); diff --git a/addons/point_of_sale/static/src/xml/pos.xml b/addons/point_of_sale/static/src/xml/pos.xml index d24d16713d8..61990732d83 100644 --- a/addons/point_of_sale/static/src/xml/pos.xml +++ b/addons/point_of_sale/static/src/xml/pos.xml @@ -120,7 +120,7 @@
- + diff --git a/addons/web_shortcuts/static/src/css/web_shortcuts.css b/addons/web_shortcuts/static/src/css/web_shortcuts.css index e2deff8d406..e39f7870249 100644 --- a/addons/web_shortcuts/static/src/css/web_shortcuts.css +++ b/addons/web_shortcuts/static/src/css/web_shortcuts.css @@ -2,7 +2,7 @@ .oe_systray_shortcuts { margin: 3px; } -.oe-shortcut-toggle { +.oe_shortcuts_toggle { height: 20px; margin-top: 3px; padding: 0; @@ -12,10 +12,10 @@ background: url(/web/static/src/img/add-shortcut.png) no-repeat center center; float: left; } -.oe-shortcut-remove{ +.oe_shortcuts_remove{ background: url(/web/static/src/img/remove-shortcut.png) no-repeat center center; } -.oe-shortcuts { +.oe_shortcuts { position: absolute; margin: 0; padding: 6px 15px; @@ -25,7 +25,7 @@ height: 17px; line-height: 1.2; } -.oe-shortcuts ul { +.oe_shortcuts ul { display: block; overflow: hidden; list-style: none; @@ -33,7 +33,7 @@ padding: 0; margin: 0; } -.oe-shortcuts li { +.oe_shortcuts li { cursor: pointer; display: -moz-inline-stack; display: inline-block; @@ -47,10 +47,10 @@ vertical-align: top; } -.oe-shortcuts li:hover { +.oe_shortcuts li:hover { background-color: #666; } -.oe-shortcuts li:first-child { +.oe_shortcuts li:first-child { border-left: none; padding-left: 0; } diff --git a/addons/web_shortcuts/static/src/js/web_shortcuts.js b/addons/web_shortcuts/static/src/js/web_shortcuts.js index ecd07e35c72..a64675c5211 100644 --- a/addons/web_shortcuts/static/src/js/web_shortcuts.js +++ b/addons/web_shortcuts/static/src/js/web_shortcuts.js @@ -118,16 +118,16 @@ instance.web.ViewManagerAction.include({ var shortcuts_menu = instance.webclient.user_menu.shortcuts; var grandparent = this.getParent() && this.getParent().getParent(); // display shortcuts if on the first view for the action - var $shortcut_toggle = this.$element.find('.oe-shortcut-toggle'); + var $shortcut_toggle = this.$element.find('.oe_shortcuts_toggle'); if (!this.action.name || !(view.view_type === this.views_src[0].view_type && view.view_id === this.views_src[0].view_id)) { $shortcut_toggle.hide(); return; } - $shortcut_toggle.toggleClass('oe-shortcut-remove', shortcuts_menu.has(self.session.active_id)); + $shortcut_toggle.toggleClass('oe_shortcuts_remove', shortcuts_menu.has(self.session.active_id)); $shortcut_toggle.unbind("click").click(function() { - if ($shortcut_toggle.hasClass("oe-shortcut-remove")) { + if ($shortcut_toggle.hasClass("oe_shortcuts_remove")) { shortcuts_menu.trigger('remove', self.session.active_id); } else { shortcuts_menu.trigger('add', { @@ -137,7 +137,7 @@ instance.web.ViewManagerAction.include({ 'name': self.action.name }); } - $shortcut_toggle.toggleClass("oe-shortcut-remove"); + $shortcut_toggle.toggleClass("oe_shortcuts_remove"); }); } }); diff --git a/addons/web_shortcuts/static/src/xml/web_shortcuts.xml b/addons/web_shortcuts/static/src/xml/web_shortcuts.xml index 8236b43cea9..ce4d61e66bd 100644 --- a/addons/web_shortcuts/static/src/xml/web_shortcuts.xml +++ b/addons/web_shortcuts/static/src/xml/web_shortcuts.xml @@ -17,7 +17,7 @@ -