From dd42fc4a033f23910114ff584a832b90a1295fd0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20van=20der=20Essen?= Date: Wed, 18 Apr 2012 17:53:14 +0200 Subject: [PATCH] [IMP] Images for the action bar bzr revid: fva@openerp.com-20120418155314-s9i15jzid5xuv9j1 --- addons/point_of_sale/static/src/css/pos.css | 9 +++++++- .../src/img/icons/png48/face-monkey.png | Bin 0 -> 3993 bytes .../static/src/img/icons/png48/go-next.png | Bin 0 -> 2323 bytes .../src/img/icons/png48/help-browser.png | Bin 0 -> 3757 bytes addons/point_of_sale/static/src/js/pos.js | 20 ++++++++++++++++-- addons/point_of_sale/static/src/xml/pos.xml | 12 ++++++++++- 6 files changed, 37 insertions(+), 4 deletions(-) create mode 100644 addons/point_of_sale/static/src/img/icons/png48/face-monkey.png create mode 100644 addons/point_of_sale/static/src/img/icons/png48/go-next.png create mode 100644 addons/point_of_sale/static/src/img/icons/png48/help-browser.png diff --git a/addons/point_of_sale/static/src/css/pos.css b/addons/point_of_sale/static/src/css/pos.css index b3aaded127b..3769417995b 100644 --- a/addons/point_of_sale/static/src/css/pos.css +++ b/addons/point_of_sale/static/src/css/pos.css @@ -534,7 +534,8 @@ body{ text-align:center; margin:3px; margin-top:6px; - line-height: 90px; + //line-height: 90px; + //vertical-align:center; float:left; font-size: 14px; @@ -552,6 +553,12 @@ body{ background: -webkit-gradient(linear, left top, left bottom, from(#f0f0f0), to(#e2e2e2)); -webkit-box-shadow: 0px 2px 2px rgba(0,0,0, 0.3); } +.point-of-sale .pos-actionbar .button .label{ + margin-top: 37px; +} +.point-of-sale .pos-actionbar .button .icon{ + margin-top: 10px; +} .point-of-sale .pos-actionbar .button:hover { color: white; background: #7f82ac; diff --git a/addons/point_of_sale/static/src/img/icons/png48/face-monkey.png b/addons/point_of_sale/static/src/img/icons/png48/face-monkey.png new file mode 100644 index 0000000000000000000000000000000000000000..1a57c9e06962401c3aa0d3940a9cb359822e59f9 GIT binary patch literal 3993 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 literal 0 HcmV?d00001 diff --git a/addons/point_of_sale/static/src/img/icons/png48/go-next.png b/addons/point_of_sale/static/src/img/icons/png48/go-next.png new file mode 100644 index 0000000000000000000000000000000000000000..bcd343dde9432a6fb396a888e6ac4ae300579a9e GIT binary patch literal 2323 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 XbyEqQZ*wax00000NkvXXu0mjfk-@L< literal 0 HcmV?d00001 diff --git a/addons/point_of_sale/static/src/js/pos.js b/addons/point_of_sale/static/src/js/pos.js index 6fde28e0941..0c1fa6da98c 100644 --- a/addons/point_of_sale/static/src/js/pos.js +++ b/addons/point_of_sale/static/src/js/pos.js @@ -1250,6 +1250,10 @@ openerp.point_of_sale = function(session) { this._super(parent, options); this.label = options.label || 'button'; this.rightalign = options.rightalign || false; + if(options.icon){ + this.icon = options.icon; + this.template = 'pos-action-button-with-icon'; + } }, }); @@ -1605,12 +1609,24 @@ openerp.point_of_sale = function(session) { this.actionBar = new ActionbarWidget(null); this.actionBar.appendTo($(".point-of-sale #content")); - this.actionBar.addNewButton('left',{'label':'foobar'}); + this.actionBar.addNewButton('left',{ + label : 'Aide', + icon : '/point_of_sale/static/src/img/icons/png48/help-browser.png', + }); this.actionBar.addNewButton('left',{'label':'test'}); this.actionBar.addNewButton('left',{'label':'kikoo', rightalign:true}); this.actionBar.addNewButton('right',{'label':'boo'}); - this.actionBar.addNewButton('right',{'label':'bah', rightalign:true}); + this.actionBar.addNewButton('right',{ + label : 'Payer', + rightalign : true, + icon : '/point_of_sale/static/src/img/icons/png48/go-next.png', + }); + this.actionBar.addNewButton('right',{ + label : 'Ook Ook', + rightalign : true, + icon : '/point_of_sale/static/src/img/icons/png48/face-monkey.png', + }); }; //returns true if the code is a valid EAN codebar number by checking the control digit. diff --git a/addons/point_of_sale/static/src/xml/pos.xml b/addons/point_of_sale/static/src/xml/pos.xml index bd0ecb5b65a..fc8df431bef 100644 --- a/addons/point_of_sale/static/src/xml/pos.xml +++ b/addons/point_of_sale/static/src/xml/pos.xml @@ -311,7 +311,17 @@
  • - +
    + +
    +
  • +
    + +
  • +
    + +
    +