From b0c8e312d8f1fa3bc2373df33dd9778de032866d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20van=20der=20Essen?= Date: Tue, 5 Nov 2013 15:58:44 +0100 Subject: [PATCH] [IMP] point_of_sale: use placeholder + remove obsolete css rules bzr revid: fva@openerp.com-20131105145844-69o6j8ynkn90fz23 --- addons/point_of_sale/static/src/css/pos.css | 16 ---------------- addons/point_of_sale/static/src/js/widgets.js | 4 ++-- addons/point_of_sale/static/src/xml/pos.xml | 3 +++ 3 files changed, 5 insertions(+), 18 deletions(-) diff --git a/addons/point_of_sale/static/src/css/pos.css b/addons/point_of_sale/static/src/css/pos.css index 8e2234b6e8c..6532a3436e5 100644 --- a/addons/point_of_sale/static/src/css/pos.css +++ b/addons/point_of_sale/static/src/css/pos.css @@ -44,22 +44,6 @@ list-style-type: none; } -.point-of-sale .shadow-top{ - position: absolute; - top:0; - left:0; - right:0; - height:10px; -} - -.point-of-sale .darker-shadow-top{ - position: absolute; - top:0; - left:0; - right:0; - height:10px; -} - /* ********* The black loading screen ********* */ .point-of-sale .loader{ diff --git a/addons/point_of_sale/static/src/js/widgets.js b/addons/point_of_sale/static/src/js/widgets.js index 39fa858171c..c98e760641a 100644 --- a/addons/point_of_sale/static/src/js/widgets.js +++ b/addons/point_of_sale/static/src/js/widgets.js @@ -947,7 +947,7 @@ function openerp_pos_widgets(instance, module){ //module is instance.point_of_sa this.action_bar.appendTo(this.$(".pos-rightpane")); this.left_action_bar = new module.ActionBarWidget(this); - this.left_action_bar.appendTo(this.$(".pos-leftpane")); + this.left_action_bar.replace(this.$('.placeholder-LeftActionBar')); this.paypad = new module.PaypadWidget(this, {}); this.paypad.replace(this.$('.placeholder-PaypadWidget')); @@ -961,7 +961,7 @@ function openerp_pos_widgets(instance, module){ //module is instance.point_of_sa this.onscreen_keyboard = new module.OnscreenKeyboardWidget(this, { 'keyboard_model': 'simple' }); - this.onscreen_keyboard.appendTo(this.$(".pos-content")); + this.onscreen_keyboard.replace(this.$('.placeholder-OnscreenKeyboardWidget')); this.close_button = new module.HeaderButtonWidget(this,{ label: _t('Close'), diff --git a/addons/point_of_sale/static/src/xml/pos.xml b/addons/point_of_sale/static/src/xml/pos.xml index 3d3f921f07c..363c475151c 100644 --- a/addons/point_of_sale/static/src/xml/pos.xml +++ b/addons/point_of_sale/static/src/xml/pos.xml @@ -27,9 +27,12 @@
+
+ +