From 5e3151111736247b2306d50c7c1c50f7f4102d35 Mon Sep 17 00:00:00 2001 From: Jerome Nadaud Date: Tue, 10 Dec 2013 16:18:59 +0100 Subject: [PATCH 1/3] // BlockLayered hook template backward compatibility --- modules/blocklayered/blocklayered.php | 26 +++-- .../views/templates/hook/attribute_form.tpl | 77 ++++--------- .../templates/hook/attribute_form_1.6.tpl | 82 +++++++++++++ .../templates/hook/attribute_group_form.tpl | 109 ++++++------------ .../hook/attribute_group_form_1.6.tpl | 105 +++++++++++++++++ .../views/templates/hook/feature_form.tpl | 109 ++++++------------ .../views/templates/hook/feature_form_1.6.tpl | 105 +++++++++++++++++ .../templates/hook/feature_value_form.tpl | 77 ++++--------- .../templates/hook/feature_value_form_1.6.tpl | 82 +++++++++++++ 9 files changed, 509 insertions(+), 263 deletions(-) create mode 100644 modules/blocklayered/views/templates/hook/attribute_form_1.6.tpl create mode 100644 modules/blocklayered/views/templates/hook/attribute_group_form_1.6.tpl create mode 100644 modules/blocklayered/views/templates/hook/feature_form_1.6.tpl create mode 100644 modules/blocklayered/views/templates/hook/feature_value_form_1.6.tpl diff --git a/modules/blocklayered/blocklayered.php b/modules/blocklayered/blocklayered.php index 16289c36e..3ad83464f 100644 --- a/modules/blocklayered/blocklayered.php +++ b/modules/blocklayered/blocklayered.php @@ -346,7 +346,10 @@ class BlockLayered extends Module 'is_indexable' =>(bool)$is_indexable )); - return $this->display(__FILE__, 'attribute_group_form.tpl'); + if (version_compare(_PS_VERSION_, '1.6.0', '>=') === TRUE) + return $this->display(__FILE__, 'attribute_group_form_1.6.tpl'); + else + return $this->display(__FILE__, 'attribute_group_form.tpl'); } //ATTRIBUTES @@ -421,8 +424,11 @@ class BlockLayered extends Module 'default_form_language' => (int)$this->context->controller->default_form_language, 'values' => $values )); - - return $this->display(__FILE__, 'attribute_form.tpl'); + + if (version_compare(_PS_VERSION_, '1.6.0', '>=') === TRUE) + return $this->display(__FILE__, 'attribute_form_1.6.tpl'); + else + return $this->display(__FILE__, 'attribute_form.tpl'); } //FEATURES @@ -514,8 +520,11 @@ class BlockLayered extends Module 'values' => $values, 'is_indexable' =>(bool)$is_indexable )); - - return $this->display(__FILE__, 'feature_form.tpl'); + + if (version_compare(_PS_VERSION_, '1.6.0', '>=') === TRUE) + return $this->display(__FILE__, 'feature_form_1.6.tpl'); + else + return $this->display(__FILE__, 'feature_form.tpl'); } //FEATURES VALUE @@ -591,8 +600,11 @@ class BlockLayered extends Module 'default_form_language' => (int)$this->context->controller->default_form_language, 'values' => $values )); - - return $this->display(__FILE__, 'feature_value_form.tpl'); + + if (version_compare(_PS_VERSION_, '1.6.0', '>=') === TRUE) + return $this->display(__FILE__, 'feature_value_form_1.6.tpl'); + else + return $this->display(__FILE__, 'feature_value_form.tpl'); } public function hookProductListAssign($params) diff --git a/modules/blocklayered/views/templates/hook/attribute_form.tpl b/modules/blocklayered/views/templates/hook/attribute_form.tpl index 5430bbdad..12d4f142b 100644 --- a/modules/blocklayered/views/templates/hook/attribute_form.tpl +++ b/modules/blocklayered/views/templates/hook/attribute_form.tpl @@ -22,61 +22,32 @@ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) * International Registred Trademark & Property of PrestaShop SA *} -
- -
-
- {foreach $languages as $language} -
-
- -
-
- - -
+ +
+
+ {foreach $languages as $language} +
+ +

{l s='Specific URL format in block layered generation' mod='blockfacette'}

+ {l s='Invalid characters: <>;=#{}_' mod='blockfacette'} 
- {/foreach} -
-

{l s='Specific URL format in block layered generation' mod='blockfacette'}

-
-
+ {/foreach}
-
- -
-
- {foreach $languages as $language} -
-
- -
-
- - -
+
+ +
+
+ {foreach $languages as $language} +
+ +

{l s='Specific format for meta title' mod='blockfacette'}

- {/foreach} -
-

{l s='Specific format for meta title' mod='blockfacette'}

-
-
+ {/foreach}
-
\ No newline at end of file +
+
\ No newline at end of file diff --git a/modules/blocklayered/views/templates/hook/attribute_form_1.6.tpl b/modules/blocklayered/views/templates/hook/attribute_form_1.6.tpl new file mode 100644 index 000000000..5430bbdad --- /dev/null +++ b/modules/blocklayered/views/templates/hook/attribute_form_1.6.tpl @@ -0,0 +1,82 @@ +{* +* 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 Registred Trademark & Property of PrestaShop SA +*} +
+ +
+
+ {foreach $languages as $language} +
+
+ +
+
+ + +
+
+ {/foreach} +
+

{l s='Specific URL format in block layered generation' mod='blockfacette'}

+
+
+
+
+
+ +
+
+ {foreach $languages as $language} +
+
+ +
+
+ + +
+
+ {/foreach} +
+

{l s='Specific format for meta title' mod='blockfacette'}

+
+
+
+
\ No newline at end of file diff --git a/modules/blocklayered/views/templates/hook/attribute_group_form.tpl b/modules/blocklayered/views/templates/hook/attribute_group_form.tpl index abab05d99..4abae2a7c 100644 --- a/modules/blocklayered/views/templates/hook/attribute_group_form.tpl +++ b/modules/blocklayered/views/templates/hook/attribute_group_form.tpl @@ -22,84 +22,43 @@ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) * International Registred Trademark & Property of PrestaShop SA *} -
- -
-
- {foreach $languages as $language} -
-
- -
-
- - -
+ +
+
+ {foreach $languages as $language} +
+ +

{l s='Specific URL format in block layered generation' mod='blockfacette'}

+ {l s='Invalid characters: <>;=#{}_' mod='blockfacette'} 
- {/foreach} -
-

{l s='Specific URL format in block layered generation' mod='blockfacette'}

-
-
+ {/foreach}
-
- -
-
- {foreach $languages as $language} -
-
- -
-
- - -
+
+ +
+
+ {foreach $languages as $language} +
+ +

{l s='Specific format for meta title' mod='blockfacette'}

- {/foreach} -
-

{l s='Specific format for meta title' mod='blockfacette'}

-
-
+ {/foreach}
-
- -
-
-
- - - - - - - -
-
-
-
-

{l s='Use this attribute in URL generated by the layered navigation module' mod='blockfacette'}

-
-
\ No newline at end of file +
+ +
+ + + + + + +

{l s='Use this attribute in URL generated by the layered navigation module' mod='blockfacette'}

+
+
\ No newline at end of file diff --git a/modules/blocklayered/views/templates/hook/attribute_group_form_1.6.tpl b/modules/blocklayered/views/templates/hook/attribute_group_form_1.6.tpl new file mode 100644 index 000000000..abab05d99 --- /dev/null +++ b/modules/blocklayered/views/templates/hook/attribute_group_form_1.6.tpl @@ -0,0 +1,105 @@ +{* +* 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 Registred Trademark & Property of PrestaShop SA +*} +
+ +
+
+ {foreach $languages as $language} +
+
+ +
+
+ + +
+
+ {/foreach} +
+

{l s='Specific URL format in block layered generation' mod='blockfacette'}

+
+
+
+
+
+ +
+
+ {foreach $languages as $language} +
+
+ +
+
+ + +
+
+ {/foreach} +
+

{l s='Specific format for meta title' mod='blockfacette'}

+
+
+
+
+
+ +
+
+
+ + + + + + + +
+
+
+
+

{l s='Use this attribute in URL generated by the layered navigation module' mod='blockfacette'}

+
+
\ No newline at end of file diff --git a/modules/blocklayered/views/templates/hook/feature_form.tpl b/modules/blocklayered/views/templates/hook/feature_form.tpl index 82b9d550a..4abae2a7c 100644 --- a/modules/blocklayered/views/templates/hook/feature_form.tpl +++ b/modules/blocklayered/views/templates/hook/feature_form.tpl @@ -22,84 +22,43 @@ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) * International Registred Trademark & Property of PrestaShop SA *} -
- -
-
- {foreach $languages as $language} -
-
- -
-
- - -
+ +
+
+ {foreach $languages as $language} +
+ +

{l s='Specific URL format in block layered generation' mod='blockfacette'}

+ {l s='Invalid characters: <>;=#{}_' mod='blockfacette'} 
- {/foreach} -
-

{l s='Specific URL format in block layered generation' mod='blockfacette'}

-
-
+ {/foreach}
-
- -
-
- {foreach $languages as $language} -
-
- -
-
- - -
+
+ +
+
+ {foreach $languages as $language} +
+ +

{l s='Specific format for meta title' mod='blockfacette'}

- {/foreach} -
-

{l s='Specific format for meta title' mod='blockfacette'}

-
-
+ {/foreach}
-
- -
-
-
- - - - - - - -
-
-
-
-

{l s='Use this attribute in URL generated by the layered navigation module' mod='blockfacette'}

-
-
\ No newline at end of file +
+ +
+ + + + + + +

{l s='Use this attribute in URL generated by the layered navigation module' mod='blockfacette'}

+
+
\ No newline at end of file diff --git a/modules/blocklayered/views/templates/hook/feature_form_1.6.tpl b/modules/blocklayered/views/templates/hook/feature_form_1.6.tpl new file mode 100644 index 000000000..82b9d550a --- /dev/null +++ b/modules/blocklayered/views/templates/hook/feature_form_1.6.tpl @@ -0,0 +1,105 @@ +{* +* 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 Registred Trademark & Property of PrestaShop SA +*} +
+ +
+
+ {foreach $languages as $language} +
+
+ +
+
+ + +
+
+ {/foreach} +
+

{l s='Specific URL format in block layered generation' mod='blockfacette'}

+
+
+
+
+
+ +
+
+ {foreach $languages as $language} +
+
+ +
+
+ + +
+
+ {/foreach} +
+

{l s='Specific format for meta title' mod='blockfacette'}

+
+
+
+
+
+ +
+
+
+ + + + + + + +
+
+
+
+

{l s='Use this attribute in URL generated by the layered navigation module' mod='blockfacette'}

+
+
\ No newline at end of file diff --git a/modules/blocklayered/views/templates/hook/feature_value_form.tpl b/modules/blocklayered/views/templates/hook/feature_value_form.tpl index 5430bbdad..12d4f142b 100644 --- a/modules/blocklayered/views/templates/hook/feature_value_form.tpl +++ b/modules/blocklayered/views/templates/hook/feature_value_form.tpl @@ -22,61 +22,32 @@ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) * International Registred Trademark & Property of PrestaShop SA *} -
- -
-
- {foreach $languages as $language} -
-
- -
-
- - -
+ +
+
+ {foreach $languages as $language} +
+ +

{l s='Specific URL format in block layered generation' mod='blockfacette'}

+ {l s='Invalid characters: <>;=#{}_' mod='blockfacette'} 
- {/foreach} -
-

{l s='Specific URL format in block layered generation' mod='blockfacette'}

-
-
+ {/foreach}
-
- -
-
- {foreach $languages as $language} -
-
- -
-
- - -
+
+ +
+
+ {foreach $languages as $language} +
+ +

{l s='Specific format for meta title' mod='blockfacette'}

- {/foreach} -
-

{l s='Specific format for meta title' mod='blockfacette'}

-
-
+ {/foreach}
-
\ No newline at end of file +
+
\ No newline at end of file diff --git a/modules/blocklayered/views/templates/hook/feature_value_form_1.6.tpl b/modules/blocklayered/views/templates/hook/feature_value_form_1.6.tpl new file mode 100644 index 000000000..5430bbdad --- /dev/null +++ b/modules/blocklayered/views/templates/hook/feature_value_form_1.6.tpl @@ -0,0 +1,82 @@ +{* +* 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 Registred Trademark & Property of PrestaShop SA +*} +
+ +
+
+ {foreach $languages as $language} +
+
+ +
+
+ + +
+
+ {/foreach} +
+

{l s='Specific URL format in block layered generation' mod='blockfacette'}

+
+
+
+
+
+ +
+
+ {foreach $languages as $language} +
+
+ +
+
+ + +
+
+ {/foreach} +
+

{l s='Specific format for meta title' mod='blockfacette'}

+
+
+
+
\ No newline at end of file From c781d8ef2d02b3c6f0f8654161d9768adbfe05af Mon Sep 17 00:00:00 2001 From: sLorenzini Date: Tue, 10 Dec 2013 16:37:25 +0100 Subject: [PATCH 2/3] // update tpl for w3c validator and code indent --- .../default-bootstrap/manufacturer-list.tpl | 129 ++++++++---- themes/default-bootstrap/manufacturer.tpl | 54 +++-- themes/default-bootstrap/pagination.tpl | 193 ++++++++++++------ themes/default-bootstrap/product-compare.tpl | 2 +- .../default-bootstrap/products-comparison.tpl | 67 ++++-- themes/default-bootstrap/search.tpl | 40 +++- themes/default-bootstrap/supplier-list.tpl | 129 ++++++------ themes/default-bootstrap/supplier.tpl | 38 ++-- 8 files changed, 423 insertions(+), 229 deletions(-) diff --git a/themes/default-bootstrap/manufacturer-list.tpl b/themes/default-bootstrap/manufacturer-list.tpl index 240940682..c41f5b3af 100644 --- a/themes/default-bootstrap/manufacturer-list.tpl +++ b/themes/default-bootstrap/manufacturer-list.tpl @@ -43,70 +43,109 @@ {if isset($errors) AND $errors} {include file="$tpl_dir./errors.tpl"} {else} - {if $nbManufacturers > 0}
{include file="./nbr-product-page.tpl"}
{include file="$tpl_dir./pagination.tpl"}
-
+
+ {assign var='nbItemsPerLine' value=3} {assign var='nbItemsPerLineTablet' value=2} {assign var='nbLi' value=$manufacturers|@count} {math equation="nbLi/nbItemsPerLine" nbLi=$nbLi nbItemsPerLine=$nbItemsPerLine assign=nbLines} {math equation="nbLi/nbItemsPerLineTablet" nbLi=$nbLi nbItemsPerLineTablet=$nbItemsPerLineTablet assign=nbLinesTablet} +
- {include file="$tpl_dir./pagination.tpl"} + {include file="$tpl_dir./pagination.tpl" paginationId='bottom'}