From 5106a5f1e344b924995a923e19562a98a6829232 Mon Sep 17 00:00:00 2001 From: Jerome Nadaud Date: Fri, 15 Nov 2013 17:25:12 +0100 Subject: [PATCH 1/7] // Fix products controller title --- controllers/admin/AdminProductsController.php | 9 --------- 1 file changed, 9 deletions(-) diff --git a/controllers/admin/AdminProductsController.php b/controllers/admin/AdminProductsController.php index d274cbec7..388a552c2 100644 --- a/controllers/admin/AdminProductsController.php +++ b/controllers/admin/AdminProductsController.php @@ -2488,15 +2488,6 @@ class AdminProductsControllerCore extends AdminController $this->context->smarty->assign('toolbar_btn', $this->toolbar_btn); } - public function initToolbarTitle() - { - parent::initToolbarTitle(); - - if ($this->display != 'list') - if (($product = $this->loadObject(true)) && Validate::isLoadedObject($product)) - $this->toolbar_title[] = Tools::htmlentitiesUTF8($product->name[$this->context->employee->id_lang]); - } - /** * renderForm contains all necessary initialization needed for all tabs * From 5ef4b8eddcfb27a94c6ebaa4963d6c755730a336 Mon Sep 17 00:00:00 2001 From: Damien Metzger Date: Mon, 18 Nov 2013 12:12:14 +0100 Subject: [PATCH 2/7] // Installer optimization --- install-dev/classes/controllerHttp.php | 5 +++- install-dev/theme/js/configure.js | 24 ++++++++++++++++++ install-dev/theme/js/database.js | 24 ++++++++++++++++++ install-dev/theme/js/install.js | 24 ++++++++++++++++++ install-dev/theme/js/license.js | 24 ++++++++++++++++++ install-dev/theme/js/process.js | 24 ++++++++++++++++++ install-dev/theme/js/welcome.js | 35 ++++++++++++++++++++------ 7 files changed, 151 insertions(+), 9 deletions(-) diff --git a/install-dev/classes/controllerHttp.php b/install-dev/classes/controllerHttp.php index 8a83a4526..53bc10f39 100644 --- a/install-dev/classes/controllerHttp.php +++ b/install-dev/classes/controllerHttp.php @@ -321,13 +321,16 @@ abstract class InstallControllerHttp */ public function getPhone() { + if (InstallSession::getInstance()->support_phone != null) + return InstallSession::getInstance()->support_phone; if ($this->phone === null) { $this->phone = $this->language->getInformation('phone', false); - if ($iframe = Tools::file_get_contents('http://api.prestashop.com/iframe/install.php?lang='.$this->language->getLanguageIso())) + if ($iframe = Tools::file_get_contents('http://api.prestashop.com/iframe/install.php?lang='.$this->language->getLanguageIso(), false, null, 3)) if (preg_match('//Ui', $iframe, $matches) && isset($matches[1])) $this->phone = $matches[1]; } + InstallSession::getInstance()->support_phone = $this->phone; return $this->phone; } diff --git a/install-dev/theme/js/configure.js b/install-dev/theme/js/configure.js index 98a647702..77b83ba14 100644 --- a/install-dev/theme/js/configure.js +++ b/install-dev/theme/js/configure.js @@ -1,3 +1,27 @@ +/* +* +* NOTICE OF LICENSE +* +* This source file is subject to the Open Software License (OSL 3.0) +* that is bundled with this package in the file LICENSE.txt. +* It is also available through the world-wide-web at this URL: +* http://opensource.org/licenses/osl-3.0.php +* If you did not receive a copy of the license and are unable to +* obtain it through the world-wide-web, please send an email +* to license@prestashop.com so we can send you a copy immediately. +* +* DISCLAIMER +* +* Do not edit or add to this file if you wish to upgrade PrestaShop to newer +* versions in the future. If you wish to customize PrestaShop for your +* needs please refer to http://www.prestashop.com for more information. +* +* @author PrestaShop SA +* @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 +*/ + $(document).ready(function() { // Change logo diff --git a/install-dev/theme/js/database.js b/install-dev/theme/js/database.js index f19e8f651..25aa056c4 100644 --- a/install-dev/theme/js/database.js +++ b/install-dev/theme/js/database.js @@ -1,3 +1,27 @@ +/* +* +* NOTICE OF LICENSE +* +* This source file is subject to the Open Software License (OSL 3.0) +* that is bundled with this package in the file LICENSE.txt. +* It is also available through the world-wide-web at this URL: +* http://opensource.org/licenses/osl-3.0.php +* If you did not receive a copy of the license and are unable to +* obtain it through the world-wide-web, please send an email +* to license@prestashop.com so we can send you a copy immediately. +* +* DISCLAIMER +* +* Do not edit or add to this file if you wish to upgrade PrestaShop to newer +* versions in the future. If you wish to customize PrestaShop for your +* needs please refer to http://www.prestashop.com for more information. +* +* @author PrestaShop SA +* @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 +*/ + $(document).ready(function() { // Check database configuration diff --git a/install-dev/theme/js/install.js b/install-dev/theme/js/install.js index e5d753eb2..1ea1114d8 100644 --- a/install-dev/theme/js/install.js +++ b/install-dev/theme/js/install.js @@ -1,3 +1,27 @@ +/* +* +* NOTICE OF LICENSE +* +* This source file is subject to the Open Software License (OSL 3.0) +* that is bundled with this package in the file LICENSE.txt. +* It is also available through the world-wide-web at this URL: +* http://opensource.org/licenses/osl-3.0.php +* If you did not receive a copy of the license and are unable to +* obtain it through the world-wide-web, please send an email +* to license@prestashop.com so we can send you a copy immediately. +* +* DISCLAIMER +* +* Do not edit or add to this file if you wish to upgrade PrestaShop to newer +* versions in the future. If you wish to customize PrestaShop for your +* needs please refer to http://www.prestashop.com for more information. +* +* @author PrestaShop SA +* @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 +*/ + $(document).ready(function() { $('#mainForm').submit(function() diff --git a/install-dev/theme/js/license.js b/install-dev/theme/js/license.js index 74371fa93..dc0b2e81c 100644 --- a/install-dev/theme/js/license.js +++ b/install-dev/theme/js/license.js @@ -1,3 +1,27 @@ +/* +* +* NOTICE OF LICENSE +* +* This source file is subject to the Open Software License (OSL 3.0) +* that is bundled with this package in the file LICENSE.txt. +* It is also available through the world-wide-web at this URL: +* http://opensource.org/licenses/osl-3.0.php +* If you did not receive a copy of the license and are unable to +* obtain it through the world-wide-web, please send an email +* to license@prestashop.com so we can send you a copy immediately. +* +* DISCLAIMER +* +* Do not edit or add to this file if you wish to upgrade PrestaShop to newer +* versions in the future. If you wish to customize PrestaShop for your +* needs please refer to http://www.prestashop.com for more information. +* +* @author PrestaShop SA +* @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 +*/ + $(document).ready(function() { // Desactivate next button if licence checkbox is not checked diff --git a/install-dev/theme/js/process.js b/install-dev/theme/js/process.js index 22d66d9c4..6e523dcfc 100644 --- a/install-dev/theme/js/process.js +++ b/install-dev/theme/js/process.js @@ -1,3 +1,27 @@ +/* +* +* NOTICE OF LICENSE +* +* This source file is subject to the Open Software License (OSL 3.0) +* that is bundled with this package in the file LICENSE.txt. +* It is also available through the world-wide-web at this URL: +* http://opensource.org/licenses/osl-3.0.php +* If you did not receive a copy of the license and are unable to +* obtain it through the world-wide-web, please send an email +* to license@prestashop.com so we can send you a copy immediately. +* +* DISCLAIMER +* +* Do not edit or add to this file if you wish to upgrade PrestaShop to newer +* versions in the future. If you wish to customize PrestaShop for your +* needs please refer to http://www.prestashop.com for more information. +* +* @author PrestaShop SA +* @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 +*/ + var is_installing = false; $(document).ready(function() { diff --git a/install-dev/theme/js/welcome.js b/install-dev/theme/js/welcome.js index 48cc69dfa..90976346b 100644 --- a/install-dev/theme/js/welcome.js +++ b/install-dev/theme/js/welcome.js @@ -1,10 +1,29 @@ -$(document).ready(function() -{ - // Submit change of language - $('#langList').change(function() - { - var form = $('#mainForm'); - form.attr('action', form.attr('action')+'#licenses-agreement'); - form.submit(); +/* +* +* NOTICE OF LICENSE +* +* This source file is subject to the Open Software License (OSL 3.0) +* that is bundled with this package in the file LICENSE.txt. +* It is also available through the world-wide-web at this URL: +* http://opensource.org/licenses/osl-3.0.php +* If you did not receive a copy of the license and are unable to +* obtain it through the world-wide-web, please send an email +* to license@prestashop.com so we can send you a copy immediately. +* +* DISCLAIMER +* +* Do not edit or add to this file if you wish to upgrade PrestaShop to newer +* versions in the future. If you wish to customize PrestaShop for your +* needs please refer to http://www.prestashop.com for more information. +* +* @author PrestaShop SA +* @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 +*/ + +$(document).ready(function() { + $('#langList').change(function() { + $('#mainForm').submit(); }); }); \ No newline at end of file From 89c65536d72c68664bae6d509bc5f1ef5d61037f Mon Sep 17 00:00:00 2001 From: Damien Metzger Date: Mon, 18 Nov 2013 12:23:50 +0100 Subject: [PATCH 3/7] // Added missing configuration vars in the installer --- install-dev/data/xml/configuration.xml | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/install-dev/data/xml/configuration.xml b/install-dev/data/xml/configuration.xml index 57ae25ae3..4e8fd7658 100644 --- a/install-dev/data/xml/configuration.xml +++ b/install-dev/data/xml/configuration.xml @@ -781,5 +781,11 @@ Country - + + 40 + + + 1 + From ebad56a800cae72c642677549e0a27420a355e03 Mon Sep 17 00:00:00 2001 From: Jerome Nadaud Date: Mon, 18 Nov 2013 14:29:32 +0100 Subject: [PATCH 4/7] // Fix small error --- modules/blockcategories/blockcategories.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/blockcategories/blockcategories.php b/modules/blockcategories/blockcategories.php index 67669e8a5..69851cd19 100644 --- a/modules/blockcategories/blockcategories.php +++ b/modules/blockcategories/blockcategories.php @@ -217,7 +217,7 @@ class BlockCategories extends Module $resultIds[$row['id_category']] = &$row; } - $blockCategTree = $this->getTree($resultParents, $resultIds, $maxdepth, ($category && (!isset($params['is_top_menu']) || !$params['is_top_menu']) ? $category->id : null)); + $blockCategTree = $this->getTree($resultParents, $resultIds, $maxdepth, ($category ? $category->id : null)); $this->smarty->assign('blockCategTree', $blockCategTree); if ($category) From 239604b70c94c226ed84b82db59a744a238b8517 Mon Sep 17 00:00:00 2001 From: Jerome Nadaud Date: Mon, 18 Nov 2013 14:35:15 +0100 Subject: [PATCH 5/7] // Missing isset on cols and rows --- 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 d9ef5e964..1cf88291c 100644 --- a/admin-dev/themes/default/template/helpers/form/form.tpl +++ b/admin-dev/themes/default/template/helpers/form/form.tpl @@ -437,7 +437,7 @@ {/foreach} {else} - + {/if} {elseif $input.type == 'checkbox'} From 867eef79ccd6d29ab40839b14b3b6328f539d447 Mon Sep 17 00:00:00 2001 From: Jerome Nadaud Date: Mon, 18 Nov 2013 14:39:46 +0100 Subject: [PATCH 6/7] // Add live configurator toolbox - Part 1 --- modules/themeconfigurator/css/index.php | 36 ++++ .../css/live_configurator.css | 183 ++++++++++++++++++ .../img/en/advertisement.png | Bin 0 -> 14749 bytes modules/themeconfigurator/img/en/index.php | 36 ++++ modules/themeconfigurator/img/index.php | 36 ++++ .../themeconfigurator/js/live_configurator.js | 36 ++++ .../themeconfigurator/themeconfigurator.php | 53 ++++- modules/themeconfigurator/views/index.php | 36 ++++ .../views/templates/hook/index.php | 36 ++++ .../templates/hook/live_configurator.tpl | 90 +++++++++ .../views/templates/index.php | 36 ++++ 11 files changed, 575 insertions(+), 3 deletions(-) create mode 100644 modules/themeconfigurator/css/index.php create mode 100644 modules/themeconfigurator/css/live_configurator.css create mode 100644 modules/themeconfigurator/img/en/advertisement.png create mode 100644 modules/themeconfigurator/img/en/index.php create mode 100644 modules/themeconfigurator/img/index.php create mode 100644 modules/themeconfigurator/js/live_configurator.js create mode 100644 modules/themeconfigurator/views/index.php create mode 100644 modules/themeconfigurator/views/templates/hook/index.php create mode 100644 modules/themeconfigurator/views/templates/hook/live_configurator.tpl create mode 100644 modules/themeconfigurator/views/templates/index.php diff --git a/modules/themeconfigurator/css/index.php b/modules/themeconfigurator/css/index.php new file mode 100644 index 000000000..69b76d92d --- /dev/null +++ b/modules/themeconfigurator/css/index.php @@ -0,0 +1,36 @@ + +* @copyright 2007-2013 PrestaShop SA + +* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) +* International Registered Trademark & Property of PrestaShop SA +*/ + +header('Expires: Mon, 26 Jul 1997 05:00:00 GMT'); +header('Last-Modified: '.gmdate('D, d M Y H:i:s').' GMT'); + +header('Cache-Control: no-store, no-cache, must-revalidate'); +header('Cache-Control: post-check=0, pre-check=0', false); +header('Pragma: no-cache'); + +header('Location: ../../../'); +exit; \ No newline at end of file diff --git a/modules/themeconfigurator/css/live_configurator.css b/modules/themeconfigurator/css/live_configurator.css new file mode 100644 index 000000000..f7cd40dc2 --- /dev/null +++ b/modules/themeconfigurator/css/live_configurator.css @@ -0,0 +1,183 @@ +/* +* 2007-2013 PrestaShop +* +* NOTICE OF LICENSE +* +* This source file is subject to the Academic Free License (AFL 3.0) +* that is bundled with this package in the file LICENSE.txt. +* It is also available through the world-wide-web at this URL: +* http://opensource.org/licenses/afl-3.0.php +* If you did not receive a copy of the license and are unable to +* obtain it through the world-wide-web, please send an email +* to license@prestashop.com so we can send you a copy immediately. +* +* DISCLAIMER +* +* Do not edit or add to this file if you wish to upgrade PrestaShop to newer +* versions in the future. If you wish to customize PrestaShop for your +* needs please refer to http://www.prestashop.com for more information. +* +* @author PrestaShop SA +* @copyright 2007-2013 PrestaShop SA +* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) +* International Registered Trademark & Property of PrestaShop SA +*/ + +#gear-right{ + background: #333333; + display: block; + height: 50px; + left: 215px; + position: fixed; + top: 90px; + width: 50px; + z-index: 20; +} + +#gear-right i{ + display: block; + padding-top: 10px; + text-align: center; +} + +#tool_customization{ + position: fixed; + left: 0; + top: 90px; + z-index: 20; + height: auto; + width: 215px; + background: #333333 +} + +#tool_customization p{ + padding: 15px; + color:#ffffff; + font-size: 13px; + text-shadow: 0.1em 0.1em 0.05em #000000 +} + +#tool_customization p span{ + color:#8d8c8c; + font-size: 11px; +} + +#tool_customization .list-tools{ + background: #484848; + border:1px solid #595959; + border-left: none; + border-right:none; + height:50px; +} + +#tool_customization .list-tools p{font-weight: bold;} + +#tool_customization .list-tools i{padding-top: 3px} + +#tool_customization #color-box{padding: 15px} + +#tool_customization #color-box ul li{ + display: inline-block; + border: 1px solid #595959; + height:27px; + width: 27px; + margin:5px 5px 5px 0; +} + +#tool_customization #color-box .color-theme1{ + display:block; + width:0px; + height:0px; + border-left-color:transparent !important; + border-top-color:transparent !important; + position: relative; + z-index: 1 +} + +#tool_customization #color-box .color-theme2{ + display:block; + width:25px; + height:25px; + position: relative; + top: -26px; +} + +#tool_customization #color-box .theme1 .color1{border:13px solid #ffffff;} +#tool_customization #color-box .theme1 .color2{background: #484848;} + +#tool_customization #color-box .theme2 .color1{border:13px solid #f6f6f6;} +#tool_customization #color-box .theme2 .color2{background: #f2404e;} + +#tool_customization #color-box .theme3 .color1{border:13px solid #333333;} +#tool_customization #color-box .theme3 .color2{background: #545454;} + +#tool_customization #color-box .theme4 .color1{border:13px solid #272727;} +#tool_customization #color-box .theme4 .color2{background: #eac22d;} + +#tool_customization #color-box .theme5 .color1{border:13px solid #ffffff;} +#tool_customization #color-box .theme5 .color2{background: #729f42;} + +#tool_customization #color-box .theme6 .color1{border:13px solid #f5f1e8;} +#tool_customization #color-box .theme6 .color2{background: #b04444;} + +#tool_customization #color-box .theme7 .color1{border:13px solid #f1f1f1;} +#tool_customization #color-box .theme7 .color2{background: #317081;} + +#tool_customization #color-box .theme8 .color1{border:13px solid #fcfcfc;} +#tool_customization #color-box .theme8 .color2{background: #43bebc;} + +#tool_customization #color-box .theme9 .color1{border:13px solid #f9f6ed;} +#tool_customization #color-box .theme9 .color2{background: #eea200;} + +#tool_customization #font-box{padding:0 15px 15px;} +#tool_customization #font-box p{ + padding:0; + margin: 15px 0 5px; + color:#9c9b9b; +} + +#tool_customization #font-box .font-list{ + background: #484848; + border:1px solid #595959; + height:30px; + width:180px; + color:#ffffff; +} + +#tool_customization #font-box .font-list li{clear:both;padding-right: 10px;} + +#tool_customization #font-box .font-list li p{ + display: inline-block; + margin: 0; + padding: 5px 15px; + color:#9c9b9b; + text-shadow: 0 0 0 transparent; +} + +#tool_customization #font-box .font-list li i{padding-top: 6px} + + +#tool_customization .btn-tools{ + background: #484848; + border:1px solid #595959; + border-left: none; + border-right:none; + height: 56px; + padding: 10px 15px; +} + +#tool_customization .btn{font-weight: bold;} + +#tool_customization .btn-1{ + background: #727171; + color: #ffffff; + text-shadow: 0.1em 0.1em 0.05em #000000 +} +#tool_customization .btn-2{ + background: #ffffff; + color: #3a3939; +} + +#tool_customization #block-advertisement{ + padding: 15px +} \ No newline at end of file diff --git a/modules/themeconfigurator/img/en/advertisement.png b/modules/themeconfigurator/img/en/advertisement.png new file mode 100644 index 0000000000000000000000000000000000000000..0fc600890da1484adfac8e0433f1ef6e955ebe1d GIT binary patch literal 14749 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 literal 0 HcmV?d00001 diff --git a/modules/themeconfigurator/img/en/index.php b/modules/themeconfigurator/img/en/index.php new file mode 100644 index 000000000..54b3024eb --- /dev/null +++ b/modules/themeconfigurator/img/en/index.php @@ -0,0 +1,36 @@ + +* @copyright 2007-2013 PrestaShop SA + +* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) +* International Registered Trademark & Property of PrestaShop SA +*/ + +header('Expires: Mon, 26 Jul 1997 05:00:00 GMT'); +header('Last-Modified: '.gmdate('D, d M Y H:i:s').' GMT'); + +header('Cache-Control: no-store, no-cache, must-revalidate'); +header('Cache-Control: post-check=0, pre-check=0', false); +header('Pragma: no-cache'); + +header('Location: ../../../../'); +exit; \ No newline at end of file diff --git a/modules/themeconfigurator/img/index.php b/modules/themeconfigurator/img/index.php new file mode 100644 index 000000000..69b76d92d --- /dev/null +++ b/modules/themeconfigurator/img/index.php @@ -0,0 +1,36 @@ + +* @copyright 2007-2013 PrestaShop SA + +* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) +* International Registered Trademark & Property of PrestaShop SA +*/ + +header('Expires: Mon, 26 Jul 1997 05:00:00 GMT'); +header('Last-Modified: '.gmdate('D, d M Y H:i:s').' GMT'); + +header('Cache-Control: no-store, no-cache, must-revalidate'); +header('Cache-Control: post-check=0, pre-check=0', false); +header('Pragma: no-cache'); + +header('Location: ../../../'); +exit; \ No newline at end of file diff --git a/modules/themeconfigurator/js/live_configurator.js b/modules/themeconfigurator/js/live_configurator.js new file mode 100644 index 000000000..83a073d80 --- /dev/null +++ b/modules/themeconfigurator/js/live_configurator.js @@ -0,0 +1,36 @@ +/* +* 2007-2013 PrestaShop +* +* NOTICE OF LICENSE +* +* This source file is subject to the Academic Free License (AFL 3.0) +* that is bundled with this package in the file LICENSE.txt. +* It is also available through the world-wide-web at this URL: +* http://opensource.org/licenses/afl-3.0.php +* If you did not receive a copy of the license and are unable to +* obtain it through the world-wide-web, please send an email +* to license@prestashop.com so we can send you a copy immediately. +* +* DISCLAIMER +* +* Do not edit or add to this file if you wish to upgrade PrestaShop to newer +* versions in the future. If you wish to customize PrestaShop for your +* needs please refer to http://www.prestashop.com for more information. +* +* @author PrestaShop SA +* @copyright 2007-2013 PrestaShop SA +* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) +* International Registered Trademark & Property of PrestaShop SA +*/ + +$(document).ready( + function () + { + $('#color-box').find('li').click( + function() + { + $('#theme').val($(this).attr('class')); + } + ); + } +); \ No newline at end of file diff --git a/modules/themeconfigurator/themeconfigurator.php b/modules/themeconfigurator/themeconfigurator.php index 97114461e..ca1f0def3 100644 --- a/modules/themeconfigurator/themeconfigurator.php +++ b/modules/themeconfigurator/themeconfigurator.php @@ -40,7 +40,55 @@ class ThemeConfigurator extends Module $this->bootstrap = true; } - + public function install() + { + $themes_colors = array('theme1', 'theme2', 'theme3', 'theme4', 'theme5', 'theme6', 'theme7', 'theme8', 'theme9'); + $themes_fonts = array( + 'Georgia, serif', + '"Palatino Linotype", "Book Antiqua", Palatino, serif', + '"Times New Roman", Times, serif', + 'Arial, Helvetica, sans-serif', + '"Arial Black", Gadget, sans-serif', + 'Impact, Charcoal, sans-serif', + '"Lucida Sans Unicode", "Lucida Grande", sans-serif', + 'Tahoma, Geneva, sans-serif', + '"Trebuchet MS", Helvetica, sans-serif', + 'Verdana, Geneva, sans-serif', + '"Courier New", Courier, monospace', + '"Lucida Console", Monaco, monospace' + ); + + return (parent::install() + && $this->registerHook('top') + && Configuration::updateValue('PS_TC_THEMES', serialize($themes_colors)) + && Configuration::updateValue('PS_TC_THEMES_FONTS', serialize($themes_fonts))); + } + + public function hookTop($params) + { + if ((int)Tools::getValue('live_configurator', 0) == 1) + { + if (Tools::isSubmit('submitLiveConfigurator')) + { + Configuration::updateValue('PS_TC_THEME', Tools::getValue('theme')); + Configuration::updateValue('PS_TC_TEXT_PAGE_FONT', Tools::getValue('text-page-font')); + Configuration::updateValue('PS_TC_TEXT_MENU_FONT', Tools::getValue('text-menu-font')); + Configuration::updateValue('PS_TC_PRODUCT_NAME_FONT', Tools::getValue('product-name-font')); + } + + $this->context->controller->addCSS($this->_path.'css/live_configurator.css'); + $this->context->controller->addJS($this->_path.'js/live_configurator.js'); + + $this->smarty->assign(array( + 'themes_colors' => unserialize(Configuration::get('PS_TC_THEMES_COLORS')), + 'themes_fonts' => unserialize(Configuration::get('PS_TC_THEMES_FONTS')), + 'advertisement_image' => $this->_path.'/img/'.$this->context->language->iso_code.'/advertisement.png', + 'advertisement_text' => $this->l('Over 500+ PrestaShop Premium Templates! Browse Now!') + )); + return $this->display(__FILE__, 'live_configurator.tpl'); + } + } + public function getContent() { if (Tools::isSubmit('submitModule')) @@ -76,7 +124,6 @@ class ThemeConfigurator extends Module public function renderForm() { - $inputs = array(); foreach ($this->getConfigurableModules() as $module) $inputs[] = array( @@ -107,7 +154,7 @@ class ThemeConfigurator extends Module 'input' => $inputs, 'submit' => array( 'title' => $this->l('Save'), - 'class' => 'btn btn-primary') + 'class' => 'btn btn-default') ), ); diff --git a/modules/themeconfigurator/views/index.php b/modules/themeconfigurator/views/index.php new file mode 100644 index 000000000..69b76d92d --- /dev/null +++ b/modules/themeconfigurator/views/index.php @@ -0,0 +1,36 @@ + +* @copyright 2007-2013 PrestaShop SA + +* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) +* International Registered Trademark & Property of PrestaShop SA +*/ + +header('Expires: Mon, 26 Jul 1997 05:00:00 GMT'); +header('Last-Modified: '.gmdate('D, d M Y H:i:s').' GMT'); + +header('Cache-Control: no-store, no-cache, must-revalidate'); +header('Cache-Control: post-check=0, pre-check=0', false); +header('Pragma: no-cache'); + +header('Location: ../../../'); +exit; \ No newline at end of file diff --git a/modules/themeconfigurator/views/templates/hook/index.php b/modules/themeconfigurator/views/templates/hook/index.php new file mode 100644 index 000000000..422fa9d45 --- /dev/null +++ b/modules/themeconfigurator/views/templates/hook/index.php @@ -0,0 +1,36 @@ + +* @copyright 2007-2013 PrestaShop SA + +* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) +* International Registered Trademark & Property of PrestaShop SA +*/ + +header('Expires: Mon, 26 Jul 1997 05:00:00 GMT'); +header('Last-Modified: '.gmdate('D, d M Y H:i:s').' GMT'); + +header('Cache-Control: no-store, no-cache, must-revalidate'); +header('Cache-Control: post-check=0, pre-check=0', false); +header('Pragma: no-cache'); + +header('Location: ../../../../../'); +exit; \ No newline at end of file diff --git a/modules/themeconfigurator/views/templates/hook/live_configurator.tpl b/modules/themeconfigurator/views/templates/hook/live_configurator.tpl new file mode 100644 index 000000000..06e8b9e63 --- /dev/null +++ b/modules/themeconfigurator/views/templates/hook/live_configurator.tpl @@ -0,0 +1,90 @@ +{* +* 2007-2013 PrestaShop +* +* NOTICE OF LICENSE +* +* This source file is subject to the Academic Free License (AFL 3.0) +* that is bundled with this package in the file LICENSE.txt. +* It is also available through the world-wide-web at this URL: +* http://opensource.org/licenses/afl-3.0.php +* If you did not receive a copy of the license and are unable to +* obtain it through the world-wide-web, please send an email +* to license@prestashop.com so we can send you a copy immediately. +* +* DISCLAIMER +* +* Do not edit or add to this file if you wish to upgrade PrestaShop to newer +* versions in the future. If you wish to customize PrestaShop for your +* needs please refer to http://www.prestashop.com for more information. +* +* @author PrestaShop SA +* @copyright 2007-2013 PrestaShop SA +* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) +* International Registered Trademark & Property of PrestaShop SA +*} + +
+ +
+
+ +
+

+ {l s='The customization tool allows you to make color and font changes in your theme.' mod='themeconfigurator'}

+ + {l s='Only you, as a merchant can see this tool (as you are currently logged in your Back-office), your visitors will not see this tool.' mod='themeconfigurator'} + +

+
+

+ {l s='Color theme' mod='themeconfigurator'} + +

+
+ {if isset($themes_colors)} +
+
    + {foreach $themes_colors as $theme} +
  • +
    +
    +
    • + {/foreach} +
+
+ {/if} +
+

+ {l s='Font' mod='themeconfigurator'} + +

+
+
+

{l s='Text page' mod='themeconfigurator'}

+ +

{l s='Text menu parrent normal' mod='themeconfigurator'}

+ +

{l s='Product name' mod='themeconfigurator'}

+ +
+
+ + +
+
+ {$advertisement_text} +
+
+
\ No newline at end of file diff --git a/modules/themeconfigurator/views/templates/index.php b/modules/themeconfigurator/views/templates/index.php new file mode 100644 index 000000000..54b3024eb --- /dev/null +++ b/modules/themeconfigurator/views/templates/index.php @@ -0,0 +1,36 @@ + +* @copyright 2007-2013 PrestaShop SA + +* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) +* International Registered Trademark & Property of PrestaShop SA +*/ + +header('Expires: Mon, 26 Jul 1997 05:00:00 GMT'); +header('Last-Modified: '.gmdate('D, d M Y H:i:s').' GMT'); + +header('Cache-Control: no-store, no-cache, must-revalidate'); +header('Cache-Control: post-check=0, pre-check=0', false); +header('Pragma: no-cache'); + +header('Location: ../../../../'); +exit; \ No newline at end of file From 46dc93fd7eaccf6505da116b132264fe1116f236 Mon Sep 17 00:00:00 2001 From: Jerome Nadaud Date: Mon, 18 Nov 2013 14:41:49 +0100 Subject: [PATCH 7/7] // Adding update button on to page header toolbar on module --- .../default/template/controllers/modules/configure.tpl | 8 ++++++++ controllers/admin/AdminModulesController.php | 9 ++++++++- 2 files changed, 16 insertions(+), 1 deletion(-) diff --git a/admin-dev/themes/default/template/controllers/modules/configure.tpl b/admin-dev/themes/default/template/controllers/modules/configure.tpl index fdd8b9c2f..e28cb84fb 100644 --- a/admin-dev/themes/default/template/controllers/modules/configure.tpl +++ b/admin-dev/themes/default/template/controllers/modules/configure.tpl @@ -47,6 +47,14 @@
{l s='Reset'}
+ {if isset($module_update_link)} +
  • + + +
    {l s='Update'}
    +     +
    • + {/if}
  • diff --git a/controllers/admin/AdminModulesController.php b/controllers/admin/AdminModulesController.php index a3d79b831..34ca493ff 100644 --- a/controllers/admin/AdminModulesController.php +++ b/controllers/admin/AdminModulesController.php @@ -705,6 +705,7 @@ class AdminModulesControllerCore extends AdminController $disable_link = $this->context->link->getAdminLink('AdminModules').'&module_name='.$module->name.'&enable=0&tab_module='.$module->tab; $uninstall_link = $this->context->link->getAdminLink('AdminModules').'&module_name='.$module->name.'&uninstall='.$module->name.'&tab_module='.$module->tab; $reset_link = $this->context->link->getAdminLink('AdminModules').'&module_name='.$module->name.'&reset&tab_module='.$module->tab; + $update_link = $this->context->link->getAdminLink('AdminModules').'&check_and_update='.$module->name.'&module_name='.$module->name.'&reset&tab_module='.$module->tab; $this->context->smarty->assign(array( 'module_name' => $module->name, @@ -714,6 +715,7 @@ class AdminModulesControllerCore extends AdminController 'module_disable_link' => $disable_link, 'module_uninstall_link' => $uninstall_link, 'module_reset_link' => $reset_link, + 'module_update_link' => (Module::needUpgrade($module) ? $update_link : null), 'trad_link' => $trad_link, 'module_languages' => Language::getLanguages(false), 'theme_language_dir' => _THEME_LANG_DIR_ @@ -790,8 +792,13 @@ class AdminModulesControllerCore extends AdminController Tools::redirectAdmin(self::$currentIndex.'&conf='.$return.'&token='.$this->token.'&tab_module='.$module->tab.'&module_name='.$module->name.'&anchor='.ucfirst($module->name).(isset($modules_list_save) ? '&modules_list='.$modules_list_save : '').$params); } - if (isset($_GET['update'])) + if (Tools::getValue('update')) Tools::redirectAdmin(self::$currentIndex.'&token='.$this->token.'&updated=1tab_module='.$module->tab.'&module_name='.$module->name.'&anchor='.ucfirst($module->name).(isset($modules_list_save) ? '&modules_list='.$modules_list_save : '')); + + if (Tools::getValue('check_and_update')) + { + //TODO + } } public function postProcess()