diff --git a/config/xml/themes/default.xml b/config/xml/themes/default.xml index 4f87b668f..fc6b07a99 100644 --- a/config/xml/themes/default.xml +++ b/config/xml/themes/default.xml @@ -67,7 +67,6 @@ - diff --git a/controllers/admin/AdminThemesController.php b/controllers/admin/AdminThemesController.php index 22a2a7a74..08e9050b5 100644 --- a/controllers/admin/AdminThemesController.php +++ b/controllers/admin/AdminThemesController.php @@ -2095,7 +2095,6 @@ class AdminThemesControllerCore extends AdminController 'blocklayered', 'blocklink', 'blockmyaccount', - 'blockmyaccountfooter', 'blocknewsletter', 'blocksocial', 'blockuserinfo', diff --git a/modules/blockmyaccountfooter/CHANGELOG.txt b/modules/blockmyaccountfooter/CHANGELOG.txt deleted file mode 100644 index 3e6d6037b..000000000 --- a/modules/blockmyaccountfooter/CHANGELOG.txt +++ /dev/null @@ -1,4 +0,0 @@ -2014-04-22 18:57:26 +0200 // Changelog updated -2014-03-24 11:43:28 +0100 / MO blockmyaccountfooter : ps_versions_compliancy modified (1.5.6.1 => 1.6) -2014-03-24 11:02:54 +0100 / MO blockmyaccountfooter : ps_versions_compliancy added -2014-03-20 14:22:57 +0100 Initial commit diff --git a/modules/blockmyaccountfooter/blockmyaccount.css b/modules/blockmyaccountfooter/blockmyaccount.css deleted file mode 100644 index 38720d562..000000000 --- a/modules/blockmyaccountfooter/blockmyaccount.css +++ /dev/null @@ -1,31 +0,0 @@ -/* block myaccount */ -.myaccount ul {margin-bottom:10px;} -.myaccount .bullet .icon {display: none;} -.myaccount li {border-bottom: 1px solid #eee;} -.myaccount li a { - display: block; - padding: 7px 11px 5px 22px; - color: #333; - background: url("../blockcms/img/arrow_right_2.png") no-repeat 10px 10px transparent; -} -.myaccount p.logout { - padding-bottom:0; - font-weight:bold; - text-align:right; -} -/* block myaccount in footer */ -#footer .myaccount .title_block, #footer .myaccount h4 {background: none;} -#footer .myaccount .logout {display:none;} -#footer .myaccount .title_block, #footer .myaccount h4 { - padding:0 0 10px 0; - background:none; -} -#footer .myaccount ul {margin-bottom:0} -#footer .myaccount li {border-bottom:none} -#footer .myaccount li a { - display: block; - padding:0; - color: #fff; - background: none; -} -#footer .myaccount li.lnk_wishlist img {display:none;} \ No newline at end of file diff --git a/modules/blockmyaccountfooter/blockmyaccountfooter.php b/modules/blockmyaccountfooter/blockmyaccountfooter.php deleted file mode 100644 index 7159388c8..000000000 --- a/modules/blockmyaccountfooter/blockmyaccountfooter.php +++ /dev/null @@ -1,118 +0,0 @@ - -* @copyright 2007-2016 PrestaShop SA -* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) -* International Registered Trademark & Property of PrestaShop SA -*/ - -if (!defined('_PS_VERSION_')) - exit; - -class BlockMyAccountFooter extends Module -{ - public function __construct() - { - $this->name = 'blockmyaccountfooter'; - $this->tab = 'front_office_features'; - $this->version = '1.6.1'; - $this->author = 'PrestaShop'; - $this->need_instance = 0; - - parent::__construct(); - - $this->displayName = $this->l('My account block for your website\'s footer'); - $this->description = $this->l('Displays a block with links relative to user accounts.'); - $this->ps_versions_compliancy = array('min' => '1.6', 'max' => '1.6.99.99'); - } - - public function install() - { - if (!$this->addMyAccountBlockHook() - || !parent::install() - || !$this->registerHook('footer') - || !$this->registerHook('header') - || !$this->registerHook('actionModuleRegisterHookAfter') - || !$this->registerHook('actionModuleUnRegisterHookAfter') - ) - return false; - return true; - } - - public function hookActionModuleUnRegisterHookAfter($params) - { - return $this->hookActionModuleRegisterHookAfter($params); - } - - public function uninstall() - { - return parent::uninstall() && $this->removeMyAccountBlockHook(); - } - - public function hookActionModuleRegisterHookAfter($params) - { - if ($params['hook_name'] == 'displayMyAccountBlock') - $this->_clearCache('blockmyaccountfooter.tpl'); - } - - public function hookLeftColumn($params) - { - if (!$params['cookie']->isLogged()) - return false; - $this->smarty->assign(array( - 'voucherAllowed' => CartRule::isFeatureActive(), - 'returnAllowed' => (int)Configuration::get('PS_ORDER_RETURN'), - 'HOOK_BLOCK_MY_ACCOUNT' => Hook::exec('displayMyAccountBlock') - )); - return $this->display(__FILE__, $this->name.'.tpl'); - } - - public function hookRightColumn($params) - { - return $this->hookLeftColumn($params); - } - - private function addMyAccountBlockHook() - { - return Db::getInstance()->execute('INSERT IGNORE INTO `'._DB_PREFIX_.'hook` (`name`, `title`, `description`, `position`) VALUES (\'displayMyAccountBlockfooter\', \'My account block\', \'Display extra informations inside the "my account" block\', 1)'); - } - - private function removeMyAccountBlockHook() - { - return Db::getInstance()->execute('DELETE FROM `'._DB_PREFIX_.'hook` WHERE `name` = \'displayMyAccountBlockfooter\''); - } - - public function hookHeader($params) - { - $this->context->controller->addCSS(($this->_path).'blockmyaccount.css', 'all'); - } - - public function hookFooter($params) - { - if (!$this->isCached('blockmyaccountfooter.tpl', $this->getCacheId())) - $this->smarty->assign(array( - 'voucherAllowed' => CartRule::isFeatureActive(), - 'returnAllowed' => (int)Configuration::get('PS_ORDER_RETURN'), - 'HOOK_BLOCK_MY_ACCOUNT' => Hook::exec('displayMyAccountBlockfooter') - )); - return $this->display(__FILE__, 'blockmyaccountfooter.tpl', $this->getCacheId()); - } -} diff --git a/modules/blockmyaccountfooter/blockmyaccountfooter.tpl b/modules/blockmyaccountfooter/blockmyaccountfooter.tpl deleted file mode 100644 index b4195d60d..000000000 --- a/modules/blockmyaccountfooter/blockmyaccountfooter.tpl +++ /dev/null @@ -1,42 +0,0 @@ -{* -* 2007-2016 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-2016 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='My account' mod='blockmyaccountfooter'}

-
- -

{l s='Sign out' mod='blockmyaccountfooter'}

-
-
- diff --git a/modules/blockmyaccountfooter/index.php b/modules/blockmyaccountfooter/index.php deleted file mode 100644 index e69de29bb..000000000 diff --git a/modules/blockmyaccountfooter/logo.gif b/modules/blockmyaccountfooter/logo.gif deleted file mode 100644 index bd22d009b..000000000 Binary files a/modules/blockmyaccountfooter/logo.gif and /dev/null differ diff --git a/modules/blockmyaccountfooter/logo.png b/modules/blockmyaccountfooter/logo.png deleted file mode 100644 index c435b44aa..000000000 Binary files a/modules/blockmyaccountfooter/logo.png and /dev/null differ diff --git a/modules/blockmyaccountfooter/translations/index.php b/modules/blockmyaccountfooter/translations/index.php deleted file mode 100644 index e5064df41..000000000 --- a/modules/blockmyaccountfooter/translations/index.php +++ /dev/null @@ -1,35 +0,0 @@ - -* @copyright 2007-2016 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/themes/hotel-reservation-theme/css/modules/blockmyaccountfooter/blockmyaccount.css b/themes/hotel-reservation-theme/css/modules/blockmyaccountfooter/blockmyaccount.css deleted file mode 100644 index a8c712f56..000000000 --- a/themes/hotel-reservation-theme/css/modules/blockmyaccountfooter/blockmyaccount.css +++ /dev/null @@ -1,3 +0,0 @@ - - -/*# sourceMappingURL=blockmyaccount.css.map */ diff --git a/themes/hotel-reservation-theme/css/modules/blockmyaccountfooter/index.php b/themes/hotel-reservation-theme/css/modules/blockmyaccountfooter/index.php deleted file mode 100644 index 9a99a8662..000000000 --- a/themes/hotel-reservation-theme/css/modules/blockmyaccountfooter/index.php +++ /dev/null @@ -1,35 +0,0 @@ - -* @copyright 2007-2017 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; diff --git a/themes/hotel-reservation-theme/modules/blockmyaccountfooter/blockmyaccountfooter.tpl b/themes/hotel-reservation-theme/modules/blockmyaccountfooter/blockmyaccountfooter.tpl deleted file mode 100644 index 41f6d42e6..000000000 --- a/themes/hotel-reservation-theme/modules/blockmyaccountfooter/blockmyaccountfooter.tpl +++ /dev/null @@ -1,42 +0,0 @@ -{* -* 2007-2017 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-2017 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='My account' mod='blockmyaccountfooter'}

-
- -
-
- diff --git a/themes/hotel-reservation-theme/modules/blockmyaccountfooter/index.php b/themes/hotel-reservation-theme/modules/blockmyaccountfooter/index.php deleted file mode 100644 index 9a99a8662..000000000 --- a/themes/hotel-reservation-theme/modules/blockmyaccountfooter/index.php +++ /dev/null @@ -1,35 +0,0 @@ - -* @copyright 2007-2017 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;