[IMP] stock_picking_ui: made the labels more clear + fix disabled buttons on browser without gradient support

bzr revid: fva@openerp.com-20131114144354-zalo6viq0dmnrl75
This commit is contained in:
Frédéric van der Essen
2013-11-14 15:43:54 +01:00
parent b0a013f699
commit d6e81b1a92
3 changed files with 25 additions and 7 deletions
+6 -1
View File
@@ -67,6 +67,7 @@
}
.oe_pick_widget .oe_pick_button.oe_disabled {
cursor: default;
background-color: #5A5A5A;
background: linear-gradient(#666666, #474747);
border: solid 1px rgb(44, 44, 44);
color: rgb(53, 53, 53);
@@ -104,7 +105,11 @@
background: rgb(255, 226, 226);
color: rgb(168, 6, 6);
}
.oe_pick_widget .oe_pick_app_header{
font-size: 24px;
margin-left: 5px;
margin-bottom: 10px;
}
.oe_pick_widget .oe_pick_app_title{
font-size: 20px;
margin-top: 0px;
+12 -4
View File
@@ -10,10 +10,6 @@ function openerp_picking_widgets(instance){
init: function(parent,options){
this._super(parent,options);
},
get_header: function(){
var model = this.getParent();
return 'Picking: '+model.picking.name;
},
get_rows: function(){
var model = this.getParent();
var rows = [];
@@ -397,6 +393,8 @@ function openerp_picking_widgets(instance){
self.$('.js_pick_next').removeClass('oe_disabled');
}
self.$('.oe_pick_app_header').text(self.get_header());
});
@@ -411,6 +409,7 @@ function openerp_picking_widgets(instance){
self.picking_editor.renderElement();
self.package_editor.renderElement();
self.package_selector.renderElement();
if( self.picking.id === self.pickings[0]){
self.$('.js_pick_prev').addClass('oe_disabled');
}else{
@@ -422,8 +421,17 @@ function openerp_picking_widgets(instance){
}else{
self.$('.js_pick_next').removeClass('oe_disabled');
}
self.$('.oe_pick_app_header').text(self.get_header());
});
},
get_header: function(){
if(this.picking){
return _t('Picking:') +' '+this.picking.name;
}else{
return _t('Picking:');
}
},
menu: function(){
this.do_action({
type: 'ir.actions.client',
+7 -2
View File
@@ -48,7 +48,9 @@
<t t-name='PickingEditorWidget'>
<div class='oe_pick_list'>
<div class='oe_pick_list_header'><t t-esc="widget.get_header()" /></div>
<div class='oe_pick_list_header'>
Operations To Process
</div>
<table class='oe_pick_list_table'>
<colgroup>
@@ -123,7 +125,7 @@
<t t-name='PackageSelectorWidget'>
<div class='oe_pick_list'>
<div class='oe_pick_list_header'> <t t-esc="widget.get_header()" /> </div>
<div class='oe_pick_list_header'><t t-esc="widget.get_header()" /></div>
<table class='oe_pick_list_table'>
<colgroup>
@@ -251,6 +253,9 @@
<td class='oe_pick_body_cont'>
<div class='oe_pick_body'>
<div class='oe_pick_app'>
<div class='oe_pick_app_header'>
<t t-esc='widget.get_header()' />
</div>
<div class='oe_placeholder_picking_editor'></div>
<div class='oe_placeholder_package_editor'></div>