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

// Release branch merged

Browse Source
This commit is contained in:
François Gaillard
2013-04-25 17:00:56 +02:00
parent f0da3fa2ae 056709f2dd
commit 6106066ef1
53 changed files with 1086 additions and 905 deletions
Download Patch File Download Diff File Expand all files Collapse all files
themes/default/css/comparator.css
+3 -3
View File
@@ -40,7 +40,7 @@ table#product_comparison {
margin-bottom:10px;
padding-left:10px;
color:#0088cc;
background:url(../../img/arrow_right_1.png) no-repeat 0 4px transparent;
background:url(../img/arrow_right_1.png) no-repeat 0 4px transparent;
}
.prices_container {height:50px}
@@ -68,7 +68,7 @@ table#product_comparison {
padding-right:16px;
font-weight:bold;
text-align:right;
background:url(../../img/icon/delete.gif) no-repeat 100% 1px transparent;
background:url(../img/icon/delete.gif) no-repeat 100% 1px transparent;
}
.ajax_add_to_cart_button {
@@ -82,7 +82,7 @@ table#product_comparison {
height: 26px;
left: -12px;
width: 26px;
background: url(../../img/icon/pict_add_cart.png) no-repeat 0 0 transparent
background: url(../img/icon/pict_add_cart.png) no-repeat 0 0 transparent
}
themes/default/history.tpl
+1 -1
View File
@@ -28,7 +28,7 @@
{include file="$tpl_dir./errors.tpl"}
<h1>{l s='Order history'}</h1>
<p>{l s='Here are the orders you\'ve placed since your account was created.'}.</p>
<p>{l s='Here are the orders you\'ve placed since your account was created.'}</p>
{if $slowValidation}<p class="warning">{l s='If you have just placed an order, it may take a few minutes for it to be validated. Please refresh this page if your order is missing.'}</p>{/if}
themes/default/product.tpl
+2 -2
View File
@@ -541,7 +541,7 @@ var fieldRequired = '{l s='Please fill in all the required fields before saving
<div class="block_content">
<ul>
{foreach from=$accessories item=accessory name=accessories_list}
{if ($accessory.allow_oosp || $accessory.quantity_all_versions > 0) AND $accessory.available_for_order AND !isset($restricted_country_mode)}
{if ($accessory.allow_oosp || $accessory.quantity_all_versions > 0 || $accessory.quantity > 0) AND $accessory.available_for_order AND !isset($restricted_country_mode)}
{assign var='accessoryLink' value=$link->getProductLink($accessory.id_product, $accessory.link_rewrite, $accessory.category)}
<li class="ajax_block_product{if $smarty.foreach.accessories_list.first} first_item{elseif $smarty.foreach.accessories_list.last} last_item{else} item{/if} product_accessories_description">
<p class="s_title_block">
@@ -645,4 +645,4 @@ var fieldRequired = '{l s='Please fill in all the required fields before saving
{include file="$tpl_dir./product-list.tpl" products=$packItems}
</div>
{/if}
{/if}
{/if}