diff --git a/admin-dev/themes/default/css/admin-theme.css b/admin-dev/themes/default/css/admin-theme.css index 553c66408..dac2ac276 100644 --- a/admin-dev/themes/default/css/admin-theme.css +++ b/admin-dev/themes/default/css/admin-theme.css @@ -3944,10 +3944,10 @@ a .icon-flip-vertical:before { .icon-chevron-right:before { content: "\f054"; } -.icon-plus-sign:before, .process-icon-newCombination:before { +.icon-plus-sign:before, .toolbar-new:before { content: "\f055"; } -.icon-minus-sign:before { +.icon-minus-sign:before, .toolbar-cancel:before { content: "\f056"; } .icon-remove-sign:before { diff --git a/admin-dev/themes/default/template/controllers/products/combinations.tpl b/admin-dev/themes/default/template/controllers/products/combinations.tpl index 7f5d829a3..64789c92e 100644 --- a/admin-dev/themes/default/template/controllers/products/combinations.tpl +++ b/admin-dev/themes/default/template/controllers/products/combinations.tpl @@ -28,6 +28,7 @@ var msg_combination_2 = '{l s='Please choose a value.'}'; var msg_combination_3 = '{l s='You can only add one combination per attribute type.'}'; var msg_new_combination = '{l s='New combination'}'; + var msg_cancel_combination = '{l s='Cancel combination'}'; {if isset($product->id) && !$product->is_virtual} diff --git a/js/admin-products.js b/js/admin-products.js index ef33ae927..b25974a75 100644 --- a/js/admin-products.js +++ b/js/admin-products.js @@ -195,7 +195,7 @@ product_tabs['Combinations'] = new function(){ $('#add_new_combination').show(); $('.process-icon-newCombination').removeClass('toolbar-new'); $('.process-icon-newCombination').addClass('toolbar-cancel'); - $('#desc-product-newCombination div').html($('#ResetBtn').val()); + $('#desc-product-newCombination div').html(msg_cancel_combination); $('id_product_attribute').val(0); self.init_elems(); };