dinislage/PrestaShop
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

// Merge -> revision 8507

Browse Source 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@8513 b9a71923-0436-4b27-9f14-aed3839534dd
This commit is contained in:
rMalie
2011-09-12 16:17:37 +00:00
parent 3c6a0944fa
commit b50c7e4334
67 changed files with 1938 additions and 1509 deletions
Download Patch File Download Diff File Expand all files Collapse all files
themes/prestashop/category-count.tpl
+31
View File
@@ -0,0 +1,31 @@
{*
* 2007-2011 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-2011 PrestaShop SA
* @version Release: $Revision$
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
* International Registered Trademark & Property of PrestaShop SA
*}
{if $category->id == 1 OR $nb_products == 0}{l s='There are no products.'}
{else}
{if $nb_products == 1}{l s='There is'}{else}{l s='There are'}{/if}&#160;
{$nb_products}&#160;
{if $nb_products == 1}{l s='product.'}{else}{l s='products.'}{/if}
{/if}
themes/prestashop/category.tpl
+7 -9
View File
@@ -29,16 +29,14 @@
{if isset($category)}
{if $category->id AND $category->active}
<h1>{strip}
<h1>
{strip}
{$category->name|escape:'htmlall':'UTF-8'}
<span>
{if $category->id == 1 OR $nb_products == 0}{l s='There are no products.'}
{else}
{if $nb_products == 1}{l s='There is'}{else}{l s='There are'}{/if}&#160;
{$nb_products}&#160;
{if $nb_products == 1}{l s='product.'}{else}{l s='products.'}{/if}
{/if}
</span>{/strip}
<span class="category-product-count">
{include file="$tpl_dir./category-count.tpl"}
</span>
{/strip}
</h1>
{if $scenes}
themes/prestashop/product.tpl
+1 -1
View File
@@ -149,7 +149,7 @@ var fieldRequired = '{l s='Please fill in all required fields, then save the cus
<img src="{$link->getImageLink($product->link_rewrite, $cover.id_image, 'large')}"
{if $jqZoomEnabled}class="jqzoom" alt="{$link->getImageLink($product->link_rewrite, $cover.id_image, 'thickbox')}"{else} title="{$product->name|escape:'htmlall':'UTF-8'}" alt="{$product->name|escape:'htmlall':'UTF-8'}" {/if} id="bigpic" width="{$largeSize.width}" height="{$largeSize.height}" />
{else}
<img src="{$img_prod_dir}{$lang_iso}-default-large.jpg" id="bigpic" alt="" title="{$product->name|escape:'htmlall':'UTF-8'}" width="{$largeSize.width}" height="{$largeSize.height}" />
<img src="{$img_prod_dir}{$lang_iso}-default-large.jpg" id="bigpic" alt="" title="{$cover.legend|escape:'htmlall':'UTF-8'}" width="{$largeSize.width}" height="{$largeSize.height}" />
{/if}
</div>