diff --git a/config/xml/themes/default.xml b/config/xml/themes/default.xml index 369505a14..23e86e10b 100644 --- a/config/xml/themes/default.xml +++ b/config/xml/themes/default.xml @@ -69,7 +69,6 @@ - diff --git a/controllers/admin/AdminThemesController.php b/controllers/admin/AdminThemesController.php index fb566e5a8..e23a6a251 100644 --- a/controllers/admin/AdminThemesController.php +++ b/controllers/admin/AdminThemesController.php @@ -2098,7 +2098,6 @@ class AdminThemesControllerCore extends AdminController 'blockmyaccountfooter', 'blocknewsletter', 'blockpaymentlogo', - 'blockpermanentlinks', 'blocksocial', 'blockuserinfo', 'carriercompare', diff --git a/modules/blockpermanentlinks/CHANGELOG.txt b/modules/blockpermanentlinks/CHANGELOG.txt deleted file mode 100644 index 4015d4cee..000000000 --- a/modules/blockpermanentlinks/CHANGELOG.txt +++ /dev/null @@ -1,4 +0,0 @@ -2014-04-22 18:57:34 +0200 // Changelog updated -2014-03-24 11:43:28 +0100 / MO blockpermanentlinks : ps_versions_compliancy modified (1.5.6.1 => 1.6) -2014-03-24 11:03:21 +0100 / MO blockpermanentlinks : ps_versions_compliancy added -2014-03-20 14:23:25 +0100 Initial commit diff --git a/modules/blockpermanentlinks/blockpermanentlinks-footer.tpl b/modules/blockpermanentlinks/blockpermanentlinks-footer.tpl deleted file mode 100644 index fe8f1b0b5..000000000 --- a/modules/blockpermanentlinks/blockpermanentlinks-footer.tpl +++ /dev/null @@ -1,44 +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 -*} - - - - diff --git a/modules/blockpermanentlinks/blockpermanentlinks-header.tpl b/modules/blockpermanentlinks/blockpermanentlinks-header.tpl deleted file mode 100644 index 6f8fc38f0..000000000 --- a/modules/blockpermanentlinks/blockpermanentlinks-header.tpl +++ /dev/null @@ -1,34 +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 -*} - - - - diff --git a/modules/blockpermanentlinks/blockpermanentlinks.css b/modules/blockpermanentlinks/blockpermanentlinks.css deleted file mode 100644 index 7dccbbe6f..000000000 --- a/modules/blockpermanentlinks/blockpermanentlinks.css +++ /dev/null @@ -1,35 +0,0 @@ -/* block top links */ -ul#header_links { - list-style-type: none; - float: right; - margin-top:5px -} -#header_links li { - float: left; - padding: 0 8px; - border-left:1px solid #333; - line-height:11px; -} -#header_links li:first-child {border:none;} -#header_links a {text-decoration: none} -#header_links a:hover {text-decoration:underline} - -/*block permanent links right and left columns*/ -#permanent_links div {border-bottom: 1px dotted #eee} -#permanent_links div a { - display: block; - padding: 7px 11px 5px 22px; - color: #333; - background:url(img/arrow_right_2.png) no-repeat 10px 10px; -} - -/* block footer links */ -ul#footer_links{ - clear:both; - text-align: center; - padding-bottom:6px -} -ul#footer_links li{ - display: inline; - padding:0 10px -} diff --git a/modules/blockpermanentlinks/blockpermanentlinks.php b/modules/blockpermanentlinks/blockpermanentlinks.php deleted file mode 100644 index 90dcb419e..000000000 --- a/modules/blockpermanentlinks/blockpermanentlinks.php +++ /dev/null @@ -1,93 +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 BlockPermanentLinks extends Module -{ - public function __construct() - { - $this->name = 'blockpermanentlinks'; - $this->tab = 'front_office_features'; - $this->version = '0.3.1'; - $this->author = 'PrestaShop'; - $this->need_instance = 0; - - parent::__construct(); - - $this->displayName = $this->l('Permanent links block'); - $this->description = $this->l('Adds a block which displays permanent links such as sitemap, contact, etc.'); - $this->ps_versions_compliancy = array('min' => '1.6', 'max' => '1.6.99.99'); - } - - public function install() - { - return (parent::install() && $this->registerHook('top') && $this->registerHook('header')); - } - - /** - * Returns module content for header - * - * @param array $params Parameters - * @return string Content - */ - public function hookTop($params) - { - return $this->display(__FILE__, 'blockpermanentlinks-header.tpl', $this->getCacheId('blockpermanentlinks-header')); - } - - public function hookDisplayNav($params) - { - return $this->hookTop($params); - } - - /** - * Returns module content for left column - * - * @param array $params Parameters - * @return string Content - */ - public function hookLeftColumn($params) - { - return $this->display(__FILE__, 'blockpermanentlinks.tpl', $this->getCacheId()); - } - - public function hookRightColumn($params) - { - return $this->hookLeftColumn($params); - } - - public function hookFooter($params) - { - return $this->display(__FILE__, 'blockpermanentlinks-footer.tpl', $this->getCacheId('blockpermanentlinks-footer')); - } - - public function hookHeader($params) - { - $this->context->controller->addCSS(($this->_path).'blockpermanentlinks.css', 'all'); - } -} diff --git a/modules/blockpermanentlinks/blockpermanentlinks.tpl b/modules/blockpermanentlinks/blockpermanentlinks.tpl deleted file mode 100644 index 91bfab245..000000000 --- a/modules/blockpermanentlinks/blockpermanentlinks.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 -*} - - - - \ No newline at end of file diff --git a/modules/blockpermanentlinks/img/arrow_right_2.png b/modules/blockpermanentlinks/img/arrow_right_2.png deleted file mode 100644 index 6b076ee2f..000000000 Binary files a/modules/blockpermanentlinks/img/arrow_right_2.png and /dev/null differ diff --git a/modules/blockpermanentlinks/img/index.php b/modules/blockpermanentlinks/img/index.php deleted file mode 100644 index 19a328b3b..000000000 --- a/modules/blockpermanentlinks/img/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/modules/blockpermanentlinks/index.php b/modules/blockpermanentlinks/index.php deleted file mode 100644 index e5064df41..000000000 --- a/modules/blockpermanentlinks/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/modules/blockpermanentlinks/logo.gif b/modules/blockpermanentlinks/logo.gif deleted file mode 100644 index d1e8373fc..000000000 Binary files a/modules/blockpermanentlinks/logo.gif and /dev/null differ diff --git a/modules/blockpermanentlinks/logo.png b/modules/blockpermanentlinks/logo.png deleted file mode 100644 index 553eb21f5..000000000 Binary files a/modules/blockpermanentlinks/logo.png and /dev/null differ diff --git a/modules/blockpermanentlinks/translations/index.php b/modules/blockpermanentlinks/translations/index.php deleted file mode 100644 index e5064df41..000000000 --- a/modules/blockpermanentlinks/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