[-] FO: fix The "Compare buttons" on the Manufacturers List page is coded incorrectly... - #PSCFV-5636
I also fixed this bug on the supplier list
This commit is contained in:
Sarah Lorenzini
@@ -1,55 +1,67 @@
|
||||
{*
|
||||
* 2007-2012 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 <contact@prestashop.com>
|
||||
* @copyright 2007-2012 PrestaShop SA
|
||||
* @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./breadcrumb.tpl"}
|
||||
|
||||
{include file="$tpl_dir./errors.tpl"}
|
||||
|
||||
{if !isset($errors) OR !sizeof($errors)}
|
||||
<h1>{l s='List of products by manufacturer'} {$manufacturer->name|escape:'htmlall':'UTF-8'}</h1>
|
||||
{if !empty($manufacturer->description) || !empty($manufacturer->short_description)}
|
||||
<div class="description_box">
|
||||
{if !empty($manufacturer->short_description)}
|
||||
<p>{$manufacturer->short_description}</p>
|
||||
<p class="hide_desc">{$manufacturer->description}</p>
|
||||
<a href="#" class="lnk_more" onclick="$(this).prev().slideDown('slow'); $(this).hide(); return false;">{l s='More'}</a>
|
||||
{else}
|
||||
<p>{$manufacturer->description}</p>
|
||||
{/if}
|
||||
</div>
|
||||
{/if}
|
||||
|
||||
{if $products}
|
||||
<div class="sortPagiBar clearfix">
|
||||
{include file="./product-sort.tpl"}
|
||||
</div>
|
||||
{include file="./product-compare.tpl"}
|
||||
{include file="./product-list.tpl" products=$products}
|
||||
{include file="./pagination.tpl"}
|
||||
{include file="./product-compare.tpl"}
|
||||
{else}
|
||||
<p class="warning">{l s='No products for this manufacturer.'}</p>
|
||||
{/if}
|
||||
{/if}
|
||||
{*
|
||||
* 2007-2012 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 <contact@prestashop.com>
|
||||
* @copyright 2007-2012 PrestaShop SA
|
||||
* @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./breadcrumb.tpl"}
|
||||
|
||||
{include file="$tpl_dir./errors.tpl"}
|
||||
|
||||
{if !isset($errors) OR !sizeof($errors)}
|
||||
<h1>{l s='List of products by manufacturer'} {$manufacturer->name|escape:'htmlall':'UTF-8'}</h1>
|
||||
{if !empty($manufacturer->description) || !empty($manufacturer->short_description)}
|
||||
<div class="description_box">
|
||||
{if !empty($manufacturer->short_description)}
|
||||
<p>{$manufacturer->short_description}</p>
|
||||
<p class="hide_desc">{$manufacturer->description}</p>
|
||||
<a href="#" class="lnk_more" onclick="$(this).prev().slideDown('slow'); $(this).hide(); return false;">{l s='More'}</a>
|
||||
{else}
|
||||
<p>{$manufacturer->description}</p>
|
||||
{/if}
|
||||
</div>
|
||||
{/if}
|
||||
|
||||
{if $products}
|
||||
<div class="content_sortPagiBar">
|
||||
{include file="$tpl_dir./pagination.tpl"}
|
||||
|
||||
<div class="sortPagiBar clearfix">
|
||||
{include file="./product-sort.tpl"}
|
||||
{include file="./product-compare.tpl"}
|
||||
{include file="./nbr-product-page.tpl"}
|
||||
</div>
|
||||
</div>
|
||||
|
||||
{include file="./product-list.tpl" products=$products}
|
||||
|
||||
<div class="content_sortPagiBar">
|
||||
<div class="sortPagiBar clearfix">
|
||||
{include file="./product-sort.tpl"} {include file="./product-compare.tpl"} {include file="./nbr-product-page.tpl"}
|
||||
|
||||
</div>
|
||||
{include file="./pagination.tpl"}
|
||||
</div>
|
||||
{else}
|
||||
<p class="warning">{l s='No products for this manufacturer.'}</p>
|
||||
{/if}
|
||||
{/if}
|
||||
|
||||
+61
-49
@@ -1,49 +1,61 @@
|
||||
{*
|
||||
* 2007-2012 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 <contact@prestashop.com>
|
||||
* @copyright 2007-2012 PrestaShop SA
|
||||
* @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./breadcrumb.tpl"}
|
||||
|
||||
{include file="$tpl_dir./errors.tpl"}
|
||||
|
||||
{if !isset($errors) OR !sizeof($errors)}
|
||||
<h1>{l s='List of products by supplier:'} {$supplier->name|escape:'htmlall':'UTF-8'}</h1>
|
||||
{if !empty($supplier->description)}
|
||||
<div class="description_box">
|
||||
<p>{$supplier->description}</p>
|
||||
</div>
|
||||
{/if}
|
||||
|
||||
{if $products}
|
||||
<div class="sortPagiBar clearfix">
|
||||
{include file="$tpl_dir./product-sort.tpl"}
|
||||
</div>
|
||||
{include file="./product-compare.tpl"}
|
||||
{include file="$tpl_dir./product-list.tpl" products=$products}
|
||||
{include file="$tpl_dir./pagination.tpl"}
|
||||
{include file="./product-compare.tpl"}
|
||||
{else}
|
||||
<p class="warning">{l s='No products for this supplier.'}</p>
|
||||
{/if}
|
||||
{/if}
|
||||
{*
|
||||
* 2007-2012 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 <contact@prestashop.com>
|
||||
* @copyright 2007-2012 PrestaShop SA
|
||||
* @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./breadcrumb.tpl"}
|
||||
|
||||
{include file="$tpl_dir./errors.tpl"}
|
||||
|
||||
{if !isset($errors) OR !sizeof($errors)}
|
||||
<h1>{l s='List of products by supplier:'} {$supplier->name|escape:'htmlall':'UTF-8'}</h1>
|
||||
{if !empty($supplier->description)}
|
||||
<div class="description_box">
|
||||
<p>{$supplier->description}</p>
|
||||
</div>
|
||||
{/if}
|
||||
|
||||
{if $products}
|
||||
<div class="content_sortPagiBar">
|
||||
{include file="$tpl_dir./pagination.tpl"}
|
||||
|
||||
<div class="sortPagiBar clearfix">
|
||||
{include file="./product-sort.tpl"}
|
||||
{include file="./product-compare.tpl"}
|
||||
{include file="./nbr-product-page.tpl"}
|
||||
</div>
|
||||
</div>
|
||||
|
||||
{include file="./product-list.tpl" products=$products}
|
||||
|
||||
<div class="content_sortPagiBar">
|
||||
<div class="sortPagiBar clearfix">
|
||||
{include file="./product-sort.tpl"} {include file="./product-compare.tpl"} {include file="./nbr-product-page.tpl"}
|
||||
|
||||
</div>
|
||||
{include file="./pagination.tpl"}
|
||||
</div>
|
||||
{else}
|
||||
<p class="warning">{l s='No products for this manufacturer.'}</p>
|
||||
{/if}
|
||||
{/if}
|
||||
|
||||
Reference in New Issue
Block a user