From ae7569bde398c709608920d164b99efc4d6a4552 Mon Sep 17 00:00:00 2001 From: vAugagneur Date: Mon, 10 Dec 2012 10:14:03 +0100 Subject: [PATCH] [-] BO : added import button on listing --- admin-dev/themes/default/css/admin.css | 1 + .../themes/default/img/process-icon-import.png | Bin 0 -> 1176 bytes controllers/admin/AdminAddressesController.php | 11 ++++++++++- controllers/admin/AdminCategoriesController.php | 4 ++++ controllers/admin/AdminCustomersController.php | 5 +++++ .../admin/AdminManufacturersController.php | 4 ++++ controllers/admin/AdminProductsController.php | 9 +++++++-- 7 files changed, 31 insertions(+), 3 deletions(-) create mode 100644 admin-dev/themes/default/img/process-icon-import.png 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 0000000000000000000000000000000000000000..4ce1583b18cac1bbaf37551c6809eddcc97983d7 GIT binary patch literal 1176 zcmV;J1ZVq+P)@&$RB{`#imN!p3V}%Y523O;gS}4|TtB`W?2SewjF@jQCqu-m?#Qj5dh95tt`587UTlwI?BpyB;xU4JL>D|Hj%)8TMmR? zpr!>3L^Xzd-}|?0!Rf9pu!7`tDWzW|VUpcR9w(n$9zd`KT1fz?H|B3-u)Vrk`BLWQ z7iSh{;1&%;W`O!;{`wR12h%P{ai0$~3E0C~1V2cWUYDp!YAu-ihNenPmO`dM&O8k)Jb z49G0exdGGA7v3f=kj=Sp+$^|ez|iwA6UO?r)qqAqHBB9NA7-%hf3K1(l^<8%6EK9O zNZI@*y{9Wk`u27^9W%;s{;e5$iJKu=Aj0>Q<%v)3|3cjeaswp&RRn7CU7^~~4t%b_ za*e|_Z0tL^8{VaKbCn{bVBTtFpeG-CkOJunz^PZdu=Q<*j{V*Ebo98IPp9hXyDL9p zv@P>UctIjhLan&VQI5!$dvdjB$H!q(HDudyq{iRJ2QPnu11DcVtSpWg)duG;Uy{Lh zPwmKMjM3yp{%@Jxycs*Emz(6dDG4`_b6gNC#6^>1AX5E_4o@ z!pN~3HT2+DUk^TjJLpdp`T7#>V&maTVqZQ9uOu%7 qIqNNUcC`Rj3Nq`hUZvze0t^5FA)nlop3O%90000toolbar_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);