From 9e6940eb4e3e0ad61914e116e77d2fea7b7b3c5a Mon Sep 17 00:00:00 2001 From: lLefevre Date: Mon, 5 Dec 2011 11:15:21 +0000 Subject: [PATCH] // adding button in toolbar for AdminProductsController git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10903 b9a71923-0436-4b27-9f14-aed3839534dd --- admin-dev/themes/default/admin.css | 6 +- .../products/combinaison/list_footer.tpl | 3 + .../themes/template/products/combinations.tpl | 6 +- admin-dev/themes/template/products/form.tpl | 5 + admin-dev/themes/template/toolbar.tpl | 14 +- .../admin/AdminAttributesGroupsController.php | 3 +- controllers/admin/AdminProductsController.php | 152 +- js/admin-products.js | 41 +- js/attributesBack.js | 14 +- translations/fr/admin.php | 1389 ++++++++--------- 10 files changed, 805 insertions(+), 828 deletions(-) diff --git a/admin-dev/themes/default/admin.css b/admin-dev/themes/default/admin.css index ea4e1abbf..d722da447 100644 --- a/admin-dev/themes/default/admin.css +++ b/admin-dev/themes/default/admin.css @@ -165,9 +165,9 @@ a.module_toggle_all{color: #268CCD;} .toolbarBox .process-icon-duplicate { background-image: url(process-icon-duplicate.png);} .toolbarBox .process-icon-preview { background-image: url(process-icon-preview.png);} .toolbarBox .process-icon-stats { background-image: url(process-icon-stats.png);} -.toolbarBox .process-icon-cancel { background-image: url(process-icon-cancel.png);} -.toolbarBox .process-icon-new, .toolbarBox .process-icon-newAttributes{ background-image: url(process-icon-new.png);} -.toolbarBox .process-icon-save, .toolbarBox .process-icon-save-settings { background-image: url(process-icon-save.png);} +.toolbarBox .process-icon-cancel, .toolbarBox .toolbar-cancel { background-image: url(process-icon-cancel.png);} +.toolbarBox .process-icon-new, .toolbarBox .toolbar-new{ background-image: url(process-icon-new.png);} +.toolbarBox .process-icon-save { background-image: url(process-icon-save.png);} .toolbarBox .process-icon-save-and-stay { background-image: url(process-icon-save-and-stay.png);} .toolbarBox .process-icon-edit { background-image: url(process-icon-edit.png);} .toolbarBox .process-icon-back { background-image: url(process-icon-back.png);} diff --git a/admin-dev/themes/template/products/combinaison/list_footer.tpl b/admin-dev/themes/template/products/combinaison/list_footer.tpl index b6a245335..3691d5e65 100644 --- a/admin-dev/themes/template/products/combinaison/list_footer.tpl +++ b/admin-dev/themes/template/products/combinaison/list_footer.tpl @@ -44,6 +44,9 @@ var s_impact = $('#span_impact'); var s_impact2 = $('#span_weight_impact'); + $('#desc-product-newCombinaison').attr('add', '{l s='Add a new combination'}'); + $('#desc-product-newCombinaison').attr('cancel', '{l s='Cancel the combination'}'); + init_elems(); diff --git a/admin-dev/themes/template/products/combinations.tpl b/admin-dev/themes/template/products/combinations.tpl index cde362f4e..7b24ab249 100644 --- a/admin-dev/themes/template/products/combinations.tpl +++ b/admin-dev/themes/template/products/combinations.tpl @@ -73,11 +73,9 @@
{l s='or go to'}  combinations_generator{l s='Product combinations generator'}
- - {l s='Add a new combination'} -