diff --git a/admin-dev/themes/default/css/admin.css b/admin-dev/themes/default/css/admin.css index 3f548a1eb..6af3dd8d4 100644 --- a/admin-dev/themes/default/css/admin.css +++ b/admin-dev/themes/default/css/admin.css @@ -213,6 +213,7 @@ a.module_toggle_all{color: #268CCD;} .toolbarBox .process-icon-new-url { background-image: url('../img/process-icon-new-url.png');} .toolbarBox .process-icon-new-module-addon { background-image: url('../img/process-icon-new-module-addon.png');} .toolbarBox .process-icon-save-and-preview { background-image: url('../img/process-icon-preview.png');} +.toolbarBox .process-icon-import { background-image: url('../img/process-icon-export-csv.png');} .toolbarBox .process-icon-export { background-image: url('../img/process-icon-export-csv.png');} .toolbarBox .process-icon-export-all { background-image: url('../img/process-icon-export-csv-details.png');} .toolbarBox .process-icon-export-stock-state-quantities-csv { background-image: url('../img/process-icon-export-csv.png');} diff --git a/admin-dev/themes/default/img/process-icon-import.png b/admin-dev/themes/default/img/process-icon-import.png new file mode 100644 index 000000000..4ce1583b1 Binary files /dev/null and b/admin-dev/themes/default/img/process-icon-import.png differ diff --git a/controllers/admin/AdminAddressesController.php b/controllers/admin/AdminAddressesController.php index a47a4de05..78173849c 100644 --- a/controllers/admin/AdminAddressesController.php +++ b/controllers/admin/AdminAddressesController.php @@ -62,7 +62,16 @@ class AdminAddressesControllerCore extends AdminController parent::__construct(); } - + + public function initToolbar() + { + parent::initToolbar(); + $this->toolbar_btn['import'] = array( + 'href' => $this->context->link->getAdminLink('AdminImport', true).'&import_type='.$this->table, + 'desc' => $this->l('Import') + ); + } + public function renderList() { $this->_select = 'cl.`name` as country'; diff --git a/controllers/admin/AdminCategoriesController.php b/controllers/admin/AdminCategoriesController.php index 6c5f7229b..8b6838fed 100644 --- a/controllers/admin/AdminCategoriesController.php +++ b/controllers/admin/AdminCategoriesController.php @@ -234,6 +234,10 @@ class AdminCategoriesControllerCore extends AdminController 'href' => self::$currentIndex.'&add'.$this->table.'&token='.$this->token, 'desc' => $this->l('Add new') ); + $this->toolbar_btn['import'] = array( + 'href' => $this->context->link->getAdminLink('AdminImport', true).'&import_type='.$this->table, + 'desc' => $this->l('Import') + ); } // be able to edit the Home category if (count(Category::getCategoriesWithoutParent()) == 1 && !Tools::isSubmit('id_category') diff --git a/controllers/admin/AdminCustomersController.php b/controllers/admin/AdminCustomersController.php index 6b9a8f54b..7cf5ee25b 100644 --- a/controllers/admin/AdminCustomersController.php +++ b/controllers/admin/AdminCustomersController.php @@ -184,6 +184,11 @@ class AdminCustomersControllerCore extends AdminController parent::initToolbar(); if (!$this->can_add_customer) unset($this->toolbar_btn['new']); + else + $this->toolbar_btn['import'] = array( + 'href' => $this->context->link->getAdminLink('AdminImport', true).'&import_type='.$this->table, + 'desc' => $this->l('Import') + ); } public function initProcess() diff --git a/controllers/admin/AdminManufacturersController.php b/controllers/admin/AdminManufacturersController.php index 9f87624e2..1c67e29df 100644 --- a/controllers/admin/AdminManufacturersController.php +++ b/controllers/admin/AdminManufacturersController.php @@ -557,6 +557,10 @@ class AdminManufacturersControllerCore extends AdminController default: parent::initToolbar(); + $this->toolbar_btn['import'] = array( + 'href' => $this->context->link->getAdminLink('AdminImport', true).'&import_type='.$this->table, + 'desc' => $this->l('Import') + ); } } diff --git a/controllers/admin/AdminProductsController.php b/controllers/admin/AdminProductsController.php index f826f226d..c5a4a4782 100644 --- a/controllers/admin/AdminProductsController.php +++ b/controllers/admin/AdminProductsController.php @@ -2214,6 +2214,7 @@ class AdminProductsControllerCore extends AdminController public function initToolbar() { + parent::initToolbar(); if ($this->display == 'edit' || $this->display == 'add') { if ($product = $this->loadObject(true)) @@ -2281,8 +2282,12 @@ class AdminProductsControllerCore extends AdminController } } } - - parent::initToolbar(); + else + $this->toolbar_btn['import'] = array( + 'href' => $this->context->link->getAdminLink('AdminImport', true).'&import_type='.$this->table, + 'desc' => $this->l('Import') + ); + $this->context->smarty->assign('toolbar_scroll', 1); $this->context->smarty->assign('show_toolbar', 1); $this->context->smarty->assign('toolbar_btn', $this->toolbar_btn);