From 00155d584ec6d4682d096622cb9e7ff723d28205 Mon Sep 17 00:00:00 2001 From: Jerome Nadaud Date: Wed, 28 Aug 2013 09:23:29 +0200 Subject: [PATCH 1/4] // Fix language bug --- admin-dev/themes/default/template/helpers/form/form.tpl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/admin-dev/themes/default/template/helpers/form/form.tpl b/admin-dev/themes/default/template/helpers/form/form.tpl index 08bf0773d..e3ad4d705 100644 --- a/admin-dev/themes/default/template/helpers/form/form.tpl +++ b/admin-dev/themes/default/template/helpers/form/form.tpl @@ -430,7 +430,7 @@
Date: Wed, 28 Aug 2013 09:24:16 +0200 Subject: [PATCH 2/4] [+] BO : Page header toolbar --- .../admin/AdminOrderMessageController.php | 11 +++++++++++ controllers/admin/AdminOrdersController.php | 12 ++++++++++++ controllers/admin/AdminSlipController.php | 12 ++++++++++++ controllers/admin/AdminStatusesController.php | 17 +++++++++++++++++ 4 files changed, 52 insertions(+) diff --git a/controllers/admin/AdminOrderMessageController.php b/controllers/admin/AdminOrderMessageController.php index 9ed6b6c41..f0203e214 100644 --- a/controllers/admin/AdminOrderMessageController.php +++ b/controllers/admin/AdminOrderMessageController.php @@ -88,6 +88,17 @@ class AdminOrderMessageControllerCore extends AdminController parent::__construct(); } + public function initPageHeaderToolbar() + { + $this->page_header_toolbar_title = $this->l('Order messages'); + $this->page_header_toolbar_btn['new_order_message'] = array( + 'href' => self::$currentIndex.'&addorder_message&token='.$this->token, + 'desc' => $this->l('Add new order message'), + 'icon' => 'process-icon-new' + ); + + parent::initPageHeaderToolbar(); + } } diff --git a/controllers/admin/AdminOrdersController.php b/controllers/admin/AdminOrdersController.php index ab3f3ac5e..855356e84 100755 --- a/controllers/admin/AdminOrdersController.php +++ b/controllers/admin/AdminOrdersController.php @@ -138,6 +138,18 @@ class AdminOrdersControllerCore extends AdminController parent::__construct(); } + public function initPageHeaderToolbar() + { + $this->page_header_toolbar_title = $this->l('Orders'); + $this->page_header_toolbar_btn['new_order'] = array( + 'href' => self::$currentIndex.'&addorder&token='.$this->token, + 'desc' => $this->l('Add new order'), + 'icon' => 'process-icon-new' + ); + + parent::initPageHeaderToolbar(); + } + public function renderForm() { if (Context::getContext()->shop->getContext() != Shop::CONTEXT_SHOP && Shop::isFeatureActive()) diff --git a/controllers/admin/AdminSlipController.php b/controllers/admin/AdminSlipController.php index dd462b111..f78b6a186 100644 --- a/controllers/admin/AdminSlipController.php +++ b/controllers/admin/AdminSlipController.php @@ -75,6 +75,18 @@ class AdminSlipControllerCore extends AdminController parent::__construct(); } + public function initPageHeaderToolbar() + { + $this->page_header_toolbar_title = $this->l('Slips'); + $this->page_header_toolbar_btn['generate_pdf'] = array( + 'href' => self::$currentIndex.'&token='.$this->token, + 'desc' => $this->l('Generate PDF'), + 'icon' => 'process-icon-save-date' + ); + + parent::initPageHeaderToolbar(); + } + public function renderForm() { $this->fields_form = array( diff --git a/controllers/admin/AdminStatusesController.php b/controllers/admin/AdminStatusesController.php index ffb47b720..a622792d6 100644 --- a/controllers/admin/AdminStatusesController.php +++ b/controllers/admin/AdminStatusesController.php @@ -185,6 +185,23 @@ class AdminStatusesControllerCore extends AdminController $helper->title = $this->l('Edit Order Status'); return $helper; } + + public function initPageHeaderToolbar() + { + $this->page_header_toolbar_title = $this->l('States'); + $this->page_header_toolbar_btn['new_order_state'] = array( + 'href' => self::$currentIndex.'&addorder_state&token='.$this->token, + 'desc' => $this->l('Add new order state'), + 'icon' => 'process-icon-new' + ); + $this->page_header_toolbar_btn['new_order_return_state'] = array( + 'href' => self::$currentIndex.'&addorder_return_state&token='.$this->token, + 'desc' => $this->l('Add new order return state'), + 'icon' => 'process-icon-new' + ); + + parent::initPageHeaderToolbar(); + } /** * Function used to render the list to display for this controller From 967fc9869320471df1b41ee3925c208746d14597 Mon Sep 17 00:00:00 2001 From: Jerome Nadaud Date: Wed, 28 Aug 2013 09:37:49 +0200 Subject: [PATCH 3/4] [+] BO : Page header toolbar --- controllers/admin/AdminAddressesController.php | 14 ++++++++++++++ controllers/admin/AdminCartsController.php | 12 ++++++++++++ controllers/admin/AdminContactsController.php | 11 +++++++++++ controllers/admin/AdminCustomersController.php | 12 ++++++++++++ controllers/admin/AdminGendersController.php | 12 ++++++++++++ controllers/admin/AdminGroupsController.php | 12 ++++++++++++ 6 files changed, 73 insertions(+) diff --git a/controllers/admin/AdminAddressesController.php b/controllers/admin/AdminAddressesController.php index 054583a23..daa424f61 100644 --- a/controllers/admin/AdminAddressesController.php +++ b/controllers/admin/AdminAddressesController.php @@ -83,6 +83,18 @@ class AdminAddressesControllerCore extends AdminController ); } + public function initPageHeaderToolbar() + { + $this->page_header_toolbar_title = $this->l('Addresses'); + $this->page_header_toolbar_btn['new_address'] = array( + 'href' => self::$currentIndex.'&addaddress&token='.$this->token, + 'desc' => $this->l('Add new address'), + 'icon' => 'process-icon-new' + ); + + parent::initPageHeaderToolbar(); + } + public function renderForm() { $this->fields_form = array( @@ -130,6 +142,8 @@ class AdminAddressesControllerCore extends AdminController 'label' => $this->l('Other'), 'name' => 'other', 'required' => false, + 'cols' => 15, + 'rows' => 3, 'hint' => $this->l('Forbidden characters:').' <>;=#{}' ), ), diff --git a/controllers/admin/AdminCartsController.php b/controllers/admin/AdminCartsController.php index 23961b198..38f90fd3a 100755 --- a/controllers/admin/AdminCartsController.php +++ b/controllers/admin/AdminCartsController.php @@ -93,6 +93,18 @@ class AdminCartsControllerCore extends AdminController parent::__construct(); } + public function initPageHeaderToolbar() + { + $this->page_header_toolbar_title = $this->l('Carts'); + $this->page_header_toolbar_btn['export_cart'] = array( + 'href' => self::$currentIndex.'&exportcart&token='.$this->token, + 'desc' => $this->l('Export carts'), + 'icon' => 'process-icon-export' + ); + + parent::initPageHeaderToolbar(); + } + public function renderView() { if (!($cart = $this->loadObject(true))) diff --git a/controllers/admin/AdminContactsController.php b/controllers/admin/AdminContactsController.php index 431a4e1d0..3fd9900c5 100644 --- a/controllers/admin/AdminContactsController.php +++ b/controllers/admin/AdminContactsController.php @@ -117,6 +117,17 @@ class AdminContactsControllerCore extends AdminController return parent::renderForm(); } + public function initPageHeaderToolbar() + { + $this->page_header_toolbar_title = $this->l('Contacts'); + $this->page_header_toolbar_btn['new_contact'] = array( + 'href' => self::$currentIndex.'&addcontact&token='.$this->token, + 'desc' => $this->l('Add new contact'), + 'icon' => 'process-icon-new' + ); + + parent::initPageHeaderToolbar(); + } } diff --git a/controllers/admin/AdminCustomersController.php b/controllers/admin/AdminCustomersController.php index 9e6dc528a..925fe8f8b 100644 --- a/controllers/admin/AdminCustomersController.php +++ b/controllers/admin/AdminCustomersController.php @@ -185,6 +185,18 @@ class AdminCustomersControllerCore extends AdminController } } + public function initPageHeaderToolbar() + { + $this->page_header_toolbar_title = $this->l('Customers'); + $this->page_header_toolbar_btn['new_customer'] = array( + 'href' => self::$currentIndex.'&addcustomer&token='.$this->token, + 'desc' => $this->l('Add new customer'), + 'icon' => 'process-icon-new' + ); + + parent::initPageHeaderToolbar(); + } + public function initProcess() { parent::initProcess(); diff --git a/controllers/admin/AdminGendersController.php b/controllers/admin/AdminGendersController.php index bb2fddf41..f924f2f82 100644 --- a/controllers/admin/AdminGendersController.php +++ b/controllers/admin/AdminGendersController.php @@ -84,6 +84,18 @@ class AdminGendersControllerCore extends AdminController parent::__construct(); } + public function initPageHeaderToolbar() + { + $this->page_header_toolbar_title = $this->l('Genders'); + $this->page_header_toolbar_btn['new_gender'] = array( + 'href' => self::$currentIndex.'&addgender&token='.$this->token, + 'desc' => $this->l('Add new gender'), + 'icon' => 'process-icon-new' + ); + + parent::initPageHeaderToolbar(); + } + public function renderForm() { $this->fields_form = array( diff --git a/controllers/admin/AdminGroupsController.php b/controllers/admin/AdminGroupsController.php index 7a5ce0395..4fa1614a8 100644 --- a/controllers/admin/AdminGroupsController.php +++ b/controllers/admin/AdminGroupsController.php @@ -142,6 +142,18 @@ class AdminGroupsControllerCore extends AdminController parent::initToolbar(); } + public function initPageHeaderToolbar() + { + $this->page_header_toolbar_title = $this->l('Groups'); + $this->page_header_toolbar_btn['new_group'] = array( + 'href' => self::$currentIndex.'&addgroup&token='.$this->token, + 'desc' => $this->l('Add new group'), + 'icon' => 'process-icon-new' + ); + + parent::initPageHeaderToolbar(); + } + public function initProcess() { $this->id_object = Tools::getValue('id_'.$this->table); From 0019426e81ccd984b24b8df0a5acf73b8a0c7fb5 Mon Sep 17 00:00:00 2001 From: Vincent Augagneur Date: Wed, 28 Aug 2013 10:04:28 +0200 Subject: [PATCH 4/4] //added dashboard controller --- .../dashboard/helpers/view/view.tpl | 0 .../admin/AdminDashboardController.php | 34 +++++++++++++++++++ install-dev/data/xml/access.xml | 1 + install-dev/data/xml/tab.xml | 3 ++ install-dev/langs/fr/data/tab.xml | 1 + 5 files changed, 39 insertions(+) create mode 100644 admin-dev/themes/default/template/controllers/dashboard/helpers/view/view.tpl create mode 100644 controllers/admin/AdminDashboardController.php diff --git a/admin-dev/themes/default/template/controllers/dashboard/helpers/view/view.tpl b/admin-dev/themes/default/template/controllers/dashboard/helpers/view/view.tpl new file mode 100644 index 000000000..e69de29bb diff --git a/controllers/admin/AdminDashboardController.php b/controllers/admin/AdminDashboardController.php new file mode 100644 index 000000000..a9272056a --- /dev/null +++ b/controllers/admin/AdminDashboardController.php @@ -0,0 +1,34 @@ + +* @copyright 2007-2013 PrestaShop SA +* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) +* International Registered Trademark & Property of PrestaShop SA +*/ + +class AdminDashboardControllerCore extends AdminController +{ + public function __construct() + { + $this->display = 'view'; + parent::__construct(); + } +} \ No newline at end of file diff --git a/install-dev/data/xml/access.xml b/install-dev/data/xml/access.xml index 9b71e93fc..8f6587d85 100644 --- a/install-dev/data/xml/access.xml +++ b/install-dev/data/xml/access.xml @@ -98,5 +98,6 @@ + diff --git a/install-dev/data/xml/tab.xml b/install-dev/data/xml/tab.xml index 477d81b3d..dd992ca4d 100644 --- a/install-dev/data/xml/tab.xml +++ b/install-dev/data/xml/tab.xml @@ -9,6 +9,9 @@ AdminHome + + AdminDashboard + AdminCms diff --git a/install-dev/langs/fr/data/tab.xml b/install-dev/langs/fr/data/tab.xml index 81b51d5fc..4af2a16b7 100644 --- a/install-dev/langs/fr/data/tab.xml +++ b/install-dev/langs/fr/data/tab.xml @@ -1,6 +1,7 @@ +