diff --git a/addons/point_of_sale/static/src/css/pos.css b/addons/point_of_sale/static/src/css/pos.css index 75ed054fb6d..f2e4d0525b5 100644 --- a/addons/point_of_sale/static/src/css/pos.css +++ b/addons/point_of_sale/static/src/css/pos.css @@ -76,7 +76,7 @@ background: -moz-linear-gradient(#b2b3d7, #7f82ac); background: -webkit-gradient(linear, left top, left bottom, from(#b2b3d7), to(#7f82ac)); } -.point-of-sale #branding, .point-of-sale #steps, .point-of-sale #rightheader { +.point-of-sale #branding, .point-of-sale #rightheader { float: left; overflow: hidden; height: 35px; @@ -84,48 +84,17 @@ } .point-of-sale #rightheader { float: none; + margin-left: 440px; } .point-of-sale #branding { border-right: 1px solid #373737; - text-align: center; + text-align: left; + width: 419px; } .point-of-sale #branding img { height: 32px; width: 116px; -} -.point-of-sale #steps { - padding: 10px 17px; - border-right: solid 1px #3b3b3b; - vertical-align: top; -} -.point-of-sale #steps label { - width: 80px; - color: #A5A5A5; - font-weight: bold; - border-color: #454545; - background-color: #454545; - background-image: none; - border-bottom: solid 1px #5c5c5c; - border-top: solid 1px #373737; - vertical-align: top; -} -.point-of-sale #steps label:first-child { - border-left: solid 1px #373737; -} -.point-of-sale #steps label:last-child { - border-right: solid 1px #373737; -} -.point-of-sale #steps span { - padding: 2px 6px; -} -.point-of-sale #steps img { - height: 32px; -} -.point-of-sale #steps .ui-button, .point-of-sale #steps .ui-button-text-only { - padding-top: 4px; - height: 26px; - margin: 0 -4px; -} +} .point-of-sale #neworder-button { width: 32px; padding: 4px 10px; diff --git a/addons/point_of_sale/static/src/js/pos.js b/addons/point_of_sale/static/src/js/pos.js index 57678d65031..b47ca2ab4a2 100644 --- a/addons/point_of_sale/static/src/js/pos.js +++ b/addons/point_of_sale/static/src/js/pos.js @@ -709,7 +709,7 @@ openerp.point_of_sale = function(db) { It should be possible to go back to any step as long as step 3 hasn't been completed. Modifying an order after validation shouldn't be allowed. */ - var StepsWidget = db.web.Widget.extend({ + var StepSwitcher = db.web.Widget.extend({ init: function(parent, options) { this._super(parent); this.shop = options.shop; @@ -1188,9 +1188,7 @@ openerp.point_of_sale = function(db) { shop: this.shop, }); this.receiptView.replace($('#receipt-screen')); - this.stepsView = new StepsWidget(null, {shop: this.shop}); - this.stepsView.$element = $('#steps'); - this.stepsView.start(); + this.stepSwitcher = new StepSwitcher(this, {shop: this.shop}); this.shop.bind('change:selectedOrder', this.changedSelectedOrder, this); this.changedSelectedOrder(); }, @@ -1326,8 +1324,6 @@ openerp.point_of_sale = function(db) { this.$element.find("#loggedas button").click(function() { self.try_close(); }); - - this.$element.find('#steps').buttonset(); pos.app = new App(self.$element); $('.oe_toggle_secondary_menu').hide(); diff --git a/addons/point_of_sale/static/src/xml/pos.xml b/addons/point_of_sale/static/src/xml/pos.xml index 9e975ed5158..8e065fe6aad 100644 --- a/addons/point_of_sale/static/src/xml/pos.xml +++ b/addons/point_of_sale/static/src/xml/pos.xml @@ -8,16 +8,6 @@
-
- - - - - - - - -