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 00000000000..1a57c9e0696
Binary files /dev/null and b/addons/point_of_sale/static/src/img/icons/png48/face-monkey.png differ
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 00000000000..bcd343dde94
Binary files /dev/null and b/addons/point_of_sale/static/src/img/icons/png48/go-next.png differ
diff --git a/addons/point_of_sale/static/src/img/icons/png48/help-browser.png b/addons/point_of_sale/static/src/img/icons/png48/help-browser.png
new file mode 100644
index 00000000000..8c56bd4f962
Binary files /dev/null and b/addons/point_of_sale/static/src/img/icons/png48/help-browser.png differ
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 @@
-
+
+
+
+
+
+
+
+
+
![]()
+
+