diff --git a/addons/point_of_sale/static/src/css/pos.css b/addons/point_of_sale/static/src/css/pos.css index 3769417995b..067f1368d71 100644 --- a/addons/point_of_sale/static/src/css/pos.css +++ b/addons/point_of_sale/static/src/css/pos.css @@ -510,7 +510,7 @@ body{ list-style: none; } -.point-of-sale .pos-actionbar-left-region{ +.point-of-sale .pos-actionbar-left-pane{ height: 100%; width: 434px; margin: 0px; @@ -520,7 +520,7 @@ body{ float: left; } -.point-of-sale .pos-actionbar-right-region{ +.point-of-sale .pos-actionbar-button-list{ height: 100%; margin: 0px; padding-left:3px; @@ -534,8 +534,6 @@ body{ text-align:center; margin:3px; margin-top:6px; - //line-height: 90px; - //vertical-align:center; float:left; font-size: 14px; diff --git a/addons/point_of_sale/static/src/js/pos_widgets.js b/addons/point_of_sale/static/src/js/pos_widgets.js index 2d0fad64748..899221a009a 100644 --- a/addons/point_of_sale/static/src/js/pos_widgets.js +++ b/addons/point_of_sale/static/src/js/pos_widgets.js @@ -353,8 +353,8 @@ function openerp_pos_widgets(module, instance){ //module is instance.point_of_sa }, }); - module.ActionbarWidget = instance.web.Widget.extend({ - template:'pos-actionbar', + module.ActionBarWidget = instance.web.Widget.extend({ + template:'ActionBarWidget', init: function(parent, options){ this._super(parent,options); this.button_list = []; @@ -370,7 +370,7 @@ function openerp_pos_widgets(module, instance){ //module is instance.point_of_sa if(arguments.length == 1){ var button = new module.ActionButtonWidget(this,button_options); this.button_list.push(button); - button.appendTo($('.pos-actionbar-right-region')); + button.appendTo($('.pos-actionbar-button-list')); }else{ for(var i = 0; i < arguments.length; i++){ this.add_new_button(arguments[i]); @@ -836,7 +836,7 @@ function openerp_pos_widgets(module, instance){ //module is instance.point_of_sa this.orderView.$element = $('#current-order-content'); this.orderView.start(); - this.action_bar = new module.ActionbarWidget(null); + this.action_bar = new module.ActionBarWidget(null); this.action_bar.appendTo($(".point-of-sale #content")); this.onscreen_keyboard = new module.OnscreenKeyboardWidget(null, { diff --git a/addons/point_of_sale/static/src/xml/pos.xml b/addons/point_of_sale/static/src/xml/pos.xml index e8ca9202a08..dd5412dcaf9 100644 --- a/addons/point_of_sale/static/src/xml/pos.xml +++ b/addons/point_of_sale/static/src/xml/pos.xml @@ -354,15 +354,17 @@ - +
-
    - -
- -
    +
    +
    + Help +
    +

    + Total: 1234 +

    +
    +