diff --git a/admin-dev/themes/default/template/controllers/marketing/helpers/view/view.tpl b/admin-dev/themes/default/template/controllers/marketing/helpers/view/view.tpl new file mode 100644 index 000000000..b84d55b1e --- /dev/null +++ b/admin-dev/themes/default/template/controllers/marketing/helpers/view/view.tpl @@ -0,0 +1,5 @@ +{if $show_toolbar} + {include file="toolbar.tpl" toolbar_btn=$toolbar_btn toolbar_scroll=$toolbar_scroll title=$title} +{/if} + +{$modules_list} \ No newline at end of file diff --git a/cache/class_index.php b/cache/class_index.php index d2876e362..685d2e92a 100644 --- a/cache/class_index.php +++ b/cache/class_index.php @@ -89,6 +89,8 @@ 'AdminMaintenanceControllerCore' => 'controllers/admin/AdminMaintenanceController.php', 'AdminManufacturersController' => 'override/controllers/admin/AdminManufacturersController.php', 'AdminManufacturersControllerCore' => 'controllers/admin/AdminManufacturersController.php', + 'AdminMarketingController' => 'override/controllers/admin/AdminMarketingController.php', + 'AdminMarketingControllerCore' => 'controllers/admin/AdminMarketingController.php', 'AdminMetaController' => 'override/controllers/admin/AdminMetaController.php', 'AdminMetaControllerCore' => 'controllers/admin/AdminMetaController.php', 'AdminModulesController' => 'override/controllers/admin/AdminModulesController.php', diff --git a/config/xml/modules_list.xml b/config/xml/modules_list.xml deleted file mode 100755 index 5eac71754..000000000 --- a/config/xml/modules_list.xml +++ /dev/null @@ -1,132 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/controllers/admin/AdminMarketingController.php b/controllers/admin/AdminMarketingController.php new file mode 100644 index 000000000..97f1ff3e0 --- /dev/null +++ b/controllers/admin/AdminMarketingController.php @@ -0,0 +1,54 @@ + +* @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 AdminMarketingControllerCore extends AdminController +{ + + public function initContent() + { + $this->display = 'view'; + return parent::initContent(); + } + + public function initToolbarTitle() + { + $this->toolbar_title = array_unique($this->breadcrumbs); + } + + public function initToolbar() + { + return false; + } + + public function renderView() + { + $this->tpl_view_vars = array( + 'modules_list' => $this->renderModulesList(), + ); + return parent::renderView(); + } +} + diff --git a/install-dev/data/xml/tab.xml b/install-dev/data/xml/tab.xml index 91257720c..efc6295cc 100644 --- a/install-dev/data/xml/tab.xml +++ b/install-dev/data/xml/tab.xml @@ -147,6 +147,9 @@ AdminSpecificPriceRule + + AdminMarketing + AdminShipping diff --git a/install-dev/langs/br/data/tab.xml b/install-dev/langs/br/data/tab.xml index 028949968..92b02303f 100644 --- a/install-dev/langs/br/data/tab.xml +++ b/install-dev/langs/br/data/tab.xml @@ -47,6 +47,7 @@ + diff --git a/install-dev/langs/de/data/tab.xml b/install-dev/langs/de/data/tab.xml index b1fd63aa7..bf69da7b9 100644 --- a/install-dev/langs/de/data/tab.xml +++ b/install-dev/langs/de/data/tab.xml @@ -47,6 +47,7 @@ + diff --git a/install-dev/langs/en/data/tab.xml b/install-dev/langs/en/data/tab.xml index ac952246b..e6d9c8f35 100644 --- a/install-dev/langs/en/data/tab.xml +++ b/install-dev/langs/en/data/tab.xml @@ -47,6 +47,7 @@ + diff --git a/install-dev/langs/es/data/tab.xml b/install-dev/langs/es/data/tab.xml index a7f1021cc..f5c82f32d 100644 --- a/install-dev/langs/es/data/tab.xml +++ b/install-dev/langs/es/data/tab.xml @@ -47,6 +47,7 @@ + diff --git a/install-dev/langs/fr/data/tab.xml b/install-dev/langs/fr/data/tab.xml index 789598a3d..67dc7b59d 100644 --- a/install-dev/langs/fr/data/tab.xml +++ b/install-dev/langs/fr/data/tab.xml @@ -47,6 +47,7 @@ + diff --git a/install-dev/langs/it/data/tab.xml b/install-dev/langs/it/data/tab.xml index e8e2e4d34..393512476 100644 --- a/install-dev/langs/it/data/tab.xml +++ b/install-dev/langs/it/data/tab.xml @@ -47,6 +47,7 @@ + diff --git a/install-dev/upgrade/sql/1.5.4.0.sql b/install-dev/upgrade/sql/1.5.4.0.sql index 481f951d2..30b006af1 100644 --- a/install-dev/upgrade/sql/1.5.4.0.sql +++ b/install-dev/upgrade/sql/1.5.4.0.sql @@ -29,4 +29,6 @@ CREATE TABLE `PREFIX_tab_module_preference` ( `module` varchar(255) NOT NULL, PRIMARY KEY (`id_tab_module_preference`), UNIQUE KEY `employee_module` (`id_employee`, `id_tab`, `module`) -) ENGINE=ENGINE_TYPE DEFAULT CHARSET=utf8; \ No newline at end of file +) ENGINE=ENGINE_TYPE DEFAULT CHARSET=utf8; + +/* PHP:add_new_tab(AdminMarketing, es:Marketing|it:Marketing|en:Marketing|de:Marketing|fr:Marketing, 1); */; diff --git a/override/controllers/admin/AdminMarketingController.php b/override/controllers/admin/AdminMarketingController.php new file mode 100644 index 000000000..5e423a82e --- /dev/null +++ b/override/controllers/admin/AdminMarketingController.php @@ -0,0 +1,7 @@ +