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

git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10953 b9a71923-0436-4b27-9f14-aed3839534dd

Browse Source
This commit is contained in:
sThiebaut
2011-12-05 17:22:27 +00:00
parent 5b1642b26e
commit 6bea0782e9
7 changed files with 30 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files
themes/default/css/global.css
+6
View File
@@ -547,6 +547,12 @@ div.star_hover a, div.star a:hover { background-position: 0 -32px }
#footer li {padding:7px 0} #footer li {padding:7px 0}
#footer li a {color:#fff} #footer li a {color:#fff}
#footer .myaccount {padding: 15px 10px;}
#footer .myaccount h4 {
padding:0 0 10px 0;
background:none;
}
/* ************************************************************************************************ /* ************************************************************************************************
PRODUCT PAGE PRODUCT PAGE
************************************************************************************************ */ ************************************************************************************************ */
themes/default/css/product.css
+4 -1
View File
@@ -151,10 +151,11 @@ span.view_scroll_spacer {
padding:1px; padding:1px;
border:1px solid #ccc border:1px solid #ccc
} }
.attribute_list #color_to_pick_list li.selected{border:1px solid #000}
.attribute_list #color_to_pick_list a.color_pick{ .attribute_list #color_to_pick_list a.color_pick{
display:block; display:block;
height:15px; height:15px;
width:15px width:15px;
} }
.product_attributes { .product_attributes {
@@ -198,6 +199,8 @@ span.view_scroll_spacer {
/* prices */ /* prices */
.content_prices { .content_prices {
margin-top:10px; margin-top:10px;
padding-top:10px;
border-top:1px solid #ccc;
text-align:right text-align:right
} }
#buy_block p.price {padding:0} #buy_block p.price {padding:0}
themes/default/css/product_list.css
+5
View File
@@ -102,6 +102,11 @@ ul#product_list {
text-transform: uppercase; text-transform: uppercase;
background: none repeat scroll 0 0 #9B0000 background: none repeat scroll 0 0 #9B0000
} }
#product_list li .online_only {
position:absolute;
top:20px;
right:0;
}
#product_list li .content_price { #product_list li .content_price {
margin:26px 0 15px 0; margin:26px 0 15px 0;
} }
themes/default/js/product.js
+3 -3
View File
@@ -306,7 +306,7 @@ function updateDisplay()
if (selectedCombination['specific_price'].reduction_type == 'percentage') if (selectedCombination['specific_price'].reduction_type == 'percentage')
{ {
$('#reduction_amount').hide(); $('#reduction_amount').hide();
$('#reduction_percent_display').html('-' + selectedCombination['specific_price'].reduction*100 + '%'); $('#reduction_percent_display').html('-' + parseFloat(selectedCombination['specific_price'].reduction_percent) + '%');
$('#reduction_percent').show(); $('#reduction_percent').show();
} else if (selectedCombination['specific_price'].reduction_type == 'amount') { } else if (selectedCombination['specific_price'].reduction_type == 'amount') {
$('#reduction_percent').hide(); $('#reduction_percent').hide();
@@ -584,11 +584,11 @@ function checkMinimalQuantity(minimal_quantity)
function colorPickerClick(elt) function colorPickerClick(elt)
{ {
id_attribute = $(elt).attr('id').replace('color_', ''); id_attribute = $(elt).attr('id').replace('color_', '');
$('.color_pick').removeClass('selected'); $('.color_pick').parent().removeClass('selected');
$(elt).fadeTo('fast', 1, function(){ $(elt).fadeTo('fast', 1, function(){
$(this).fadeTo('slow', 0, function(){ $(this).fadeTo('slow', 0, function(){
$(this).fadeTo('slow', 1, function(){ $(this).fadeTo('slow', 1, function(){
$(this).addClass('selected'); $(this).parent().addClass('selected');
}); });
}); });
}); });
themes/default/product-list.tpl
+8 -8
View File
@@ -38,8 +38,11 @@
{/if} {/if}
</div> </div>
<div class="center_block"> <div class="center_block">
<a href="{$product.link|escape:'htmlall':'UTF-8'}" class="product_img_link" title="{$product.name|escape:'htmlall':'UTF-8'}"><img src="{$link->getImageLink($product.link_rewrite, $product.id_image, 'home')}" alt="{$product.legend|escape:'htmlall':'UTF-8'}" {if isset($homeSize)} width="{$homeSize.width}" height="{$homeSize.height}"{/if} /></a> <a href="{$product.link|escape:'htmlall':'UTF-8'}" class="product_img_link" title="{$product.name|escape:'htmlall':'UTF-8'}">
<h3>{if isset($product.new) && $product.new == 1}<span class="new">{l s='New'}</span>{/if}<a href="{$product.link|escape:'htmlall':'UTF-8'}" title="{$product.name|escape:'htmlall':'UTF-8'}">{$product.name|truncate:35:'...'|escape:'htmlall':'UTF-8'}</a></h3> <img src="{$link->getImageLink($product.link_rewrite, $product.id_image, 'home')}" alt="{$product.legend|escape:'htmlall':'UTF-8'}" {if isset($homeSize)} width="{$homeSize.width}" height="{$homeSize.height}"{/if} />
{if isset($product.new) && $product.new == 1}<span class="new">{l s='New'}</span>{/if}
</a>
<h3><a href="{$product.link|escape:'htmlall':'UTF-8'}" title="{$product.name|escape:'htmlall':'UTF-8'}">{$product.name|truncate:35:'...'|escape:'htmlall':'UTF-8'}</a></h3>
<p class="product_desc"><a href="{$product.link|escape:'htmlall':'UTF-8'}" title="{$product.description_short|truncate:360:'...'|strip_tags:'UTF-8'|escape:'htmlall':'UTF-8'}">{$product.description_short|truncate:360:'...'|strip_tags:'UTF-8'}</a></p> <p class="product_desc"><a href="{$product.link|escape:'htmlall':'UTF-8'}" title="{$product.description_short|truncate:360:'...'|strip_tags:'UTF-8'|escape:'htmlall':'UTF-8'}">{$product.description_short|truncate:360:'...'|strip_tags:'UTF-8'}</a></p>
</div> </div>
<div class="right_block"> <div class="right_block">
@@ -55,17 +58,14 @@
{if ($product.id_product_attribute == 0 || (isset($add_prod_display) && ($add_prod_display == 1))) && $product.available_for_order && !isset($restricted_country_mode) && $product.minimal_quantity <= 1 && $product.customizable != 2 && !$PS_CATALOG_MODE} {if ($product.id_product_attribute == 0 || (isset($add_prod_display) && ($add_prod_display == 1))) && $product.available_for_order && !isset($restricted_country_mode) && $product.minimal_quantity <= 1 && $product.customizable != 2 && !$PS_CATALOG_MODE}
{if ($product.allow_oosp || $product.quantity > 0)} {if ($product.allow_oosp || $product.quantity > 0)}
{if isset($static_token)} {if isset($static_token)}
<a class="button ajax_add_to_cart_button exclusive" rel="ajax_id_product_{$product.id_product|intval}" href="{$link->getPageLink('cart',false, NULL, "add&amp;id_product={$product.id_product|intval}&amp;token={$static_token}")}" title="{l s='Add to cart'}">{l s='Add to cart'}</a> <a class="button ajax_add_to_cart_button exclusive" rel="ajax_id_product_{$product.id_product|intval}" href="{$link->getPageLink('cart',false, NULL, "add&amp;id_product={$product.id_product|intval}&amp;token={$static_token}")}" title="{l s='Add to cart'}"><span></span>{l s='Add to cart'}</a>
{else} {else}
<a class="button ajax_add_to_cart_button exclusive" rel="ajax_id_product_{$product.id_product|intval}" href="{$link->getPageLink('cart',false, NULL, "add&amp;id_product={$product.id_product|intval}")}" title="{l s='Add to cart'}">{l s='Add to cart'}</a> <a class="button ajax_add_to_cart_button exclusive" rel="ajax_id_product_{$product.id_product|intval}" href="{$link->getPageLink('cart',false, NULL, "add&amp;id_product={$product.id_product|intval}")}" title="{l s='Add to cart'}"><span></span>{l s='Add to cart'}</a>
{/if} {else} {/if} {else}
<span class="exclusive"><span></span>{l s='Add to cart'}</span><br /> <span class="exclusive"><span></span>{l s='Add to cart'}</span><br />
{/if} {/if}
{/if} {/if}
<a class="button lnk_view" href="{$product.link|escape:'htmlall':'UTF-8'}" title="{l s='View'}">{l s='View'}</a> <a class="button lnk_view" href="{$product.link|escape:'htmlall':'UTF-8'}" title="{l s='View'}">{l s='View'}</a>
{if isset($comparator_max_item) && $comparator_max_item}
<p class="compare"><input type="checkbox" class="comparator" id="comparator_item_{$product.id_product}" value="comparator_item_{$product.id_product}" {if isset($compareProducts) && in_array($product.id_product, $compareProducts)}checked{/if}/> <label for="comparator_item_{$product.id_product}">{l s='Select to compare'}</label></p>
{/if}
</div> </div>
</li> </li>
{/foreach} {/foreach}
themes/default/product-sort.tpl
-1
View File
@@ -66,7 +66,6 @@ $(document).ready(function()
<option value="quantity:desc" {if $orderby eq 'quantity' AND $orderway eq 'desc'}selected="selected"{/if}>{l s='In-stock first'}</option> <option value="quantity:desc" {if $orderby eq 'quantity' AND $orderway eq 'desc'}selected="selected"{/if}>{l s='In-stock first'}</option>
{/if} {/if}
</select> </select>
<label for="selectPrductSort">{l s='Sort by'}</label>
</p> </p>
</form> </form>
<!-- /Sort products --> <!-- /Sort products -->
themes/default/product.tpl
+4 -3
View File
@@ -350,6 +350,7 @@ var fieldRequired = '{l s='Please fill in all required fields, then save the cus
<span {if $product->quantity == 1} style="display: none;"{/if} id="quantityAvailableTxtMultiple">{l s='items in stock'}</span> <span {if $product->quantity == 1} style="display: none;"{/if} id="quantityAvailableTxtMultiple">{l s='items in stock'}</span>
</p> </p>
{/if} {/if}
<!-- Out of stock hook --> <!-- Out of stock hook -->
<p id="oosHook"{if $product->quantity > 0} style="display: none;"{/if}> <p id="oosHook"{if $product->quantity > 0} style="display: none;"{/if}>
{$HOOK_PRODUCT_OOS} {$HOOK_PRODUCT_OOS}
@@ -377,9 +378,9 @@ var fieldRequired = '{l s='Please fill in all required fields, then save the cus
<p class="our_price_display"> <p class="our_price_display">
{if $priceDisplay >= 0 && $priceDisplay <= 2} {if $priceDisplay >= 0 && $priceDisplay <= 2}
<span id="our_price_display">{convertPrice price=$productPrice}</span> <span id="our_price_display">{convertPrice price=$productPrice}</span>
<!--{if $tax_enabled && ((isset($display_tax_label) && $display_tax_label == 1) OR !isset($display_tax_label))} <!--{if $tax_enabled && ((isset($display_tax_label) && $display_tax_label == 1) OR !isset($display_tax_label))}
{if $priceDisplay == 1}{l s='tax excl.'}{else}{l s='tax incl.'}{/if} {if $priceDisplay == 1}{l s='tax excl.'}{else}{l s='tax incl.'}{/if}
{/if}--> {/if}-->
{/if} {/if}
</p> </p>