diff --git a/admin-dev/themes/default/template/controllers/carrier_wizard/helpers/form/form.tpl b/admin-dev/themes/default/template/controllers/carrier_wizard/helpers/form/form.tpl index 7daee2ae5..0bd07f0ba 100644 --- a/admin-dev/themes/default/template/controllers/carrier_wizard/helpers/form/form.tpl +++ b/admin-dev/themes/default/template/controllers/carrier_wizard/helpers/form/form.tpl @@ -46,7 +46,7 @@
- +
- {/if} {$smarty.block.parent} {/block} diff --git a/admin-dev/themes/default/template/controllers/products/virtualproduct.tpl b/admin-dev/themes/default/template/controllers/products/virtualproduct.tpl index 0ffbb2fc2..c21a67e9d 100644 --- a/admin-dev/themes/default/template/controllers/products/virtualproduct.tpl +++ b/admin-dev/themes/default/template/controllers/products/virtualproduct.tpl @@ -48,193 +48,193 @@ var fileName = data.getAttribute("filename"); if (result == "error") { - $("#upload-confirmation").hide(); - $("#upload-error td").html('
{l s='Error:'} ' + msg + '
'); - $("#upload-error").show(); + $("#upload-confirmation").closest('.form-group.').hide(); + $("#upload-error").html('{l s='Error:'} ' + msg); + $("#upload-error").closest('.form-group.').show(); } else { - $('#upload-error').hide(); - $('#file_missing').hide(); + $('#upload-error').closest('.form-group.').hide(); + $('#file_missing').closest('.form-group.').hide(); $('#virtual_product_name').attr('value', fileName); $("#upload-confirmation .error").remove(); - $('#upload-confirmation div').find('span').remove(); - $('#upload-confirmation div').prepend('{l s='The file'} "'+fileName+'" {l s='has successfully been uploaded'}' + + $('#upload-confirmation').find('span').remove(); + $('#upload-confirmation').prepend('{l s='The file'} "'+fileName+'" {l s='has successfully been uploaded'} ' + ''); - $("#upload-confirmation").show(); + $("#upload-confirmation").closest('.form-group.').show(); } } } ); } - function uploadFile2() - { - var link = ''; - $.ajaxFileUpload ( + $(document).ready(function(){ + $('#virtual_product_file-selectbutton').click(function(e) { + $('#virtual_product_file').trigger('click'); + }); + + $('#virtual_product_file-name').click(function(e) { + $('#virtual_product_file').trigger('click'); + }); + + $('#virtual_product_file').change(function(e) { + if ($(this)[0].files !== undefined) { - url:'./uploadProductFileAttribute.php', - secureuri:false, - fileElementId:'virtual_product_file_attribute', - dataType: 'xml', - success: function (data, status) - { - data = data.getElementsByTagName('return')[0]; - var result = data.getAttribute("result"); - var msg = data.getAttribute("msg"); - var fileName = data.getAttribute("filename"); - if(result == "error") - $("#upload-confirmation2").html('

error: ' + msg + '

'); - else - { - $('#virtual_product_file_attribute').remove(); - $('#virtual_product_file_label').hide(); - $('#file_missing').hide(); - $('#delete_downloadable_product_attribute').show(); - $('#upload-confirmation2').html( - '{l s='The file'} "' + fileName + '" {l s='has successfully been uploaded'}' + - ''); - $('#virtual_product_name_attribute').attr('value', fileName); + var files = $(this)[0].files; + var name = ''; - link = $("#delete_downloadable_product_attribute").attr('href'); - $("#delete_downloadable_product_attribute").attr('href', link+"&file="+msg); - } - } + $.each(files, function(index, value) { + name += value.name+', '; + }); + + $('#virtual_product_file-name').val(name.slice(0, -2)); } - ); - } + else // Internet Explorer 9 Compatibility + { + var name = $(this).val().split(/[\\/]/); + $('#virtual_product_file-name').val(name[name.length-1]); + } + + uploadFile(); + }); + }); - - -

{l s='Virtual Product (services, booking or downloadable products)'}

-
-
-
- is_virtual && $product->productDownload->active}checked="checked"{/if} /> - -
- {* [begin] virtual product *} -
productDownload->id || $product->productDownload->active}style="display:none"{/if} > -
- - - -

-
- {if $download_product_file_missing} -

- {$download_product_file_missing} :
- {$smarty.const._PS_DOWNLOAD_DIR_}/{$product->productDownload->filename} -

- {/if} - - \ No newline at end of file diff --git a/js/admin-products.js b/js/admin-products.js index 2a5bfff9a..a167b4201 100644 --- a/js/admin-products.js +++ b/js/admin-products.js @@ -1332,33 +1332,20 @@ product_tabs['VirtualProduct'] = new function(){ if ($('#is_virtual_good').prop('checked')) { $('#virtual_good').show(); - $('#virtual_good_more').show(); } $('.is_virtual_good').hide(); if ( $('input[name=is_virtual_file]:checked').val() == 1) - { - $('#virtual_good_more').show(); $('#is_virtual_file_product').show(); - } else - { - $('#virtual_good_more').hide(); $('#is_virtual_file_product').hide(); - } $('input[name=is_virtual_file]').live('change', function(e) { - if($(this).val() == '1') - { - $('#virtual_good_more').show(); + if($(this).prop('checked')) $('#is_virtual_file_product').show(); - } else - { - $('#virtual_good_more').hide(); $('#is_virtual_file_product').hide(); - } }); // Bind file deletion diff --git a/js/admin_carrier_wizard.js b/js/admin_carrier_wizard.js index de4a24403..081cd7eff 100644 --- a/js/admin_carrier_wizard.js +++ b/js/admin_carrier_wizard.js @@ -31,6 +31,33 @@ $(document).ready(function() { if (parseInt($('input[name="is_free"]:checked').val())) is_freeClick($('input[name="is_free"]:checked')); displayRangeType(); + + $('#attachement_fileselectbutton').click(function(e) { + $('#carrier_logo_input').trigger('click'); + }); + + $('#attachement_filename').click(function(e) { + $('#carrier_logo_input').trigger('click'); + }); + + $('#carrier_logo_input').change(function(e) { + if ($(this)[0].files !== undefined) + { + var files = $(this)[0].files; + var name = ''; + + $.each(files, function(index, value) { + name += value.name+', '; + }); + + $('#attachement_filename').val(name.slice(0, -2)); + } + else // Internet Explorer 9 Compatibility + { + var name = $(this).val().split(/[\\/]/); + $('#attachement_filename').val(name[name.length-1]); + } + }); }); function initCarrierWizard() diff --git a/modules/blockcms/blockcms.php b/modules/blockcms/blockcms.php index 0c1a8abc4..82e232210 100755 --- a/modules/blockcms/blockcms.php +++ b/modules/blockcms/blockcms.php @@ -39,7 +39,7 @@ class BlockCms extends Module { $this->name = 'blockcms'; $this->tab = 'front_office_features'; - $this->version = '1.3'; + $this->version = '1.4'; $this->author = 'PrestaShop'; $this->need_instance = 0; @@ -61,6 +61,7 @@ class BlockCms extends Module || !$this->registerHook('actionObjectCmsUpdateAfter') || !$this->registerHook('actionObjectCmsDeleteAfter') || !$this->registerHook('actionShopDataDuplication') + || !$this->registerHook('actionAdminStoresControllerUpdate_optionsAfter') || !BlockCMSModel::createTables() || !Configuration::updateValue('FOOTER_CMS', '') || !Configuration::updateValue('FOOTER_BLOCK_ACTIVATION', 1) @@ -684,6 +685,12 @@ class BlockCms extends Module return parent::getCacheId('blockcms|'.$name); } + public function hookActionAdminStoresControllerUpdate_optionsAfter() + { + if (Tools::getIsset('PS_STORES_DISPLAY_FOOTER')) + $this->_clearCache('blockcms.tpl'); + } + public function hookActionObjectCmsUpdateAfter() { $this->_clearCache('blockcms.tpl'); diff --git a/modules/blockcms/config.xml b/modules/blockcms/config.xml index b8683e704..40900e5de 100755 --- a/modules/blockcms/config.xml +++ b/modules/blockcms/config.xml @@ -2,7 +2,7 @@ blockcms - + diff --git a/modules/blockcms/upgrade/install-1.4.php b/modules/blockcms/upgrade/install-1.4.php new file mode 100644 index 000000000..9702660d9 --- /dev/null +++ b/modules/blockcms/upgrade/install-1.4.php @@ -0,0 +1,9 @@ +registerHook('actionAdminStoresControllerUpdate_optionsAfter')); +} 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/admin/add.tpl b/modules/blocklayered/views/templates/admin/add.tpl index 2f0900d81..0fe0e3170 100644 --- a/modules/blocklayered/views/templates/admin/add.tpl +++ b/modules/blocklayered/views/templates/admin/add.tpl @@ -3,7 +3,6 @@ {l s='Configuration' mod='blocklayered'} {l s='New filters template' mod='blocklayered'}
- diff --git a/modules/blocklayered/views/templates/admin/add_1.6.tpl b/modules/blocklayered/views/templates/admin/add_1.6.tpl index 11708cab8..02465728f 100644 --- a/modules/blocklayered/views/templates/admin/add_1.6.tpl +++ b/modules/blocklayered/views/templates/admin/add_1.6.tpl @@ -3,7 +3,6 @@

{l s='New filters template' mod='blocklayered'}

-
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/modules/homefeatured/homefeatured.php b/modules/homefeatured/homefeatured.php index 62747320e..b3beec05e 100644 --- a/modules/homefeatured/homefeatured.php +++ b/modules/homefeatured/homefeatured.php @@ -97,7 +97,6 @@ class HomeFeatured extends Module public function hookHeader($params) { $this->context->controller->addCSS(($this->_path).'homefeatured.css', 'all'); - $this->context->controller->addJS(($this->_path).'js/homefeatured.js'); } public function hookDisplayHomeTab($params) diff --git a/modules/homefeatured/js/homefeatured.js b/modules/homefeatured/js/homefeatured.js deleted file mode 100644 index e10f00e41..000000000 --- a/modules/homefeatured/js/homefeatured.js +++ /dev/null @@ -1,36 +0,0 @@ -/* -* 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() -{ - $('.home_tab li a').click(function(){ - var button = $(this); - $('.home_tab li').removeClass('active'); - button.parent('li').addClass('active'); - $('.home_tab_content .product_list').hide(0, function(){ - $('.home_tab_content .' + button.prop('class')).show(0).addClass('active').removeClass('hidden'); - }); - }); -}); \ No newline at end of file diff --git a/themes/default-bootstrap/js/modules/homefeatured/js/homefeatured.js b/themes/default-bootstrap/js/modules/homefeatured/js/homefeatured.js deleted file mode 100644 index e69de29bb..000000000 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'}