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 diff --git a/themes/default-bootstrap/modules/blockbestsellers/blockbestsellers.tpl b/themes/default-bootstrap/modules/blockbestsellers/blockbestsellers.tpl index aa4e54924..feb925bf6 100644 --- a/themes/default-bootstrap/modules/blockbestsellers/blockbestsellers.tpl +++ b/themes/default-bootstrap/modules/blockbestsellers/blockbestsellers.tpl @@ -25,5 +25,5 @@ *} {if is_array($best_sellers) && count($best_sellers)} - {include file="$tpl_dir./product-list.tpl" products=$best_sellers class='blockbestsellers tab-pane'} + {include file="$tpl_dir./product-list.tpl" products=$best_sellers class='blockbestsellers tab-pane' id='blockbestsellers'} {/if} \ No newline at end of file diff --git a/themes/default-bootstrap/modules/blockbestsellers/tab.tpl b/themes/default-bootstrap/modules/blockbestsellers/tab.tpl index 9af78eed8..4b1e98e54 100644 --- a/themes/default-bootstrap/modules/blockbestsellers/tab.tpl +++ b/themes/default-bootstrap/modules/blockbestsellers/tab.tpl @@ -24,5 +24,5 @@ *} {if is_array($best_sellers) && count($best_sellers)} -
  • {l s='Best Sellers' mod='blockbestsellers'}
    • +
  • {l s='Best Sellers' mod='blockbestsellers'}
    • {/if} \ No newline at end of file diff --git a/themes/default-bootstrap/modules/blocknewproducts/blocknewproducts.tpl b/themes/default-bootstrap/modules/blocknewproducts/blocknewproducts.tpl index 7af3f7c14..6c9b1a216 100644 --- a/themes/default-bootstrap/modules/blocknewproducts/blocknewproducts.tpl +++ b/themes/default-bootstrap/modules/blocknewproducts/blocknewproducts.tpl @@ -22,4 +22,4 @@ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) * International Registered Trademark & Property of PrestaShop SA *} -{include file="$tpl_dir./product-list.tpl" products=$new_products class='blocknewproducts tab-pane active'} \ No newline at end of file +{include file="$tpl_dir./product-list.tpl" products=$new_products class='blocknewproducts tab-pane active' id='blocknewproducts'} \ No newline at end of file diff --git a/themes/default-bootstrap/modules/blocknewproducts/tab.tpl b/themes/default-bootstrap/modules/blocknewproducts/tab.tpl index df140624b..6b9f3f3fd 100644 --- a/themes/default-bootstrap/modules/blocknewproducts/tab.tpl +++ b/themes/default-bootstrap/modules/blocknewproducts/tab.tpl @@ -22,4 +22,4 @@ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) * International Registered Trademark & Property of PrestaShop SA *} -
  • {l s='New arrivals' mod='blocknewproducts'}
    • \ No newline at end of file +
  • {l s='New arrivals' mod='blocknewproducts'}
    • \ No newline at end of file diff --git a/themes/default-bootstrap/modules/homefeatured/homefeatured.tpl b/themes/default-bootstrap/modules/homefeatured/homefeatured.tpl index e92a2a6e8..ce066ef0b 100644 --- a/themes/default-bootstrap/modules/homefeatured/homefeatured.tpl +++ b/themes/default-bootstrap/modules/homefeatured/homefeatured.tpl @@ -22,4 +22,4 @@ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) * International Registered Trademark & Property of PrestaShop SA *} -{include file="$tpl_dir./product-list.tpl" class='homefeatured tab-pane'} \ No newline at end of file +{include file="$tpl_dir./product-list.tpl" class='homefeatured tab-pane' id='homefeatured'} \ No newline at end of file diff --git a/themes/default-bootstrap/modules/homefeatured/tab.tpl b/themes/default-bootstrap/modules/homefeatured/tab.tpl index d845c931f..69bb74f6d 100644 --- a/themes/default-bootstrap/modules/homefeatured/tab.tpl +++ b/themes/default-bootstrap/modules/homefeatured/tab.tpl @@ -22,4 +22,4 @@ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) * International Registered Trademark & Property of PrestaShop SA *} -
  • {l s='Popular' mod='homefeatured'}
    • \ No newline at end of file +
  • {l s='Popular' mod='homefeatured'}
    • \ No newline at end of file diff --git a/themes/default-bootstrap/product-list.tpl b/themes/default-bootstrap/product-list.tpl index 7f9377f6c..110c339f0 100644 --- a/themes/default-bootstrap/product-list.tpl +++ b/themes/default-bootstrap/product-list.tpl @@ -39,7 +39,7 @@ {math equation="nbLi/nbItemsPerLine" nbLi=$nbLi nbItemsPerLine=$nbItemsPerLine assign=nbLines} {math equation="nbLi/nbItemsPerLineTablet" nbLi=$nbLi nbItemsPerLineTablet=$nbItemsPerLineTablet assign=nbLinesTablet} -
      + {foreach from=$products item=product name=products} {math equation="(total%perLine)" total=$smarty.foreach.products.total perLine=$nbItemsPerLine assign=totModulo} {math equation="(total%perLineT)" total=$smarty.foreach.products.total perLineT=$nbItemsPerLineTablet assign=totModuloTablet}