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

[-] FO: fixed bug Optimizations on product.tp to avoid code duplication about two variables - #PSCFV-7950 + improve color attributes on product page

Browse Source
This commit is contained in:
sLorenzini committed 2013-03-06 15:22:06 +01:00
1 parent de6a53a62f
commit 94c6d45e73
2 files changed
+6 -12
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

themes/default/css/product.css
+5 -4
View File
@@ -212,23 +212,24 @@ span.view_scroll_spacer {
.ie7 #attributes .attribute_list span{margin-top:1px} .ie7 #attributes .attribute_list span{margin-top:1px}
.attribute_list #color_to_pick_list { #attributes .attribute_list #color_to_pick_list {
list-style-type:none; list-style-type:none;
width:125px; width:125px;
} }
.attribute_list #color_to_pick_list li { #attributes .attribute_list #color_to_pick_list li {
float:left; float:left;
margin:0 8px 8px 0; margin:0 8px 8px 0;
padding:1px; padding:1px;
border:1px solid #ccc; border:1px solid #ccc;
clear:none
} }
.attribute_list #color_to_pick_list li.selected { #attributes .attribute_list #color_to_pick_list li.selected {
border:1px solid #000; border:1px solid #000;
} }
.attribute_list #color_to_pick_list a.color_pick { #attributes .attribute_list #color_to_pick_list a.color_pick {
display:block; display:block;
height:20px; height:20px;
width:20px; width:20px;
themes/default/product.tpl
+1 -8
View File
@@ -80,6 +80,7 @@ var stock_management = {$stock_management|intval};
{assign var='productPriceWithoutReduction' value=$product->getPriceWithoutReduct(true, $smarty.const.NULL)} {assign var='productPriceWithoutReduction' value=$product->getPriceWithoutReduct(true, $smarty.const.NULL)}
{/if} {/if}
var productPriceWithoutReduction = '{$productPriceWithoutReduction}'; var productPriceWithoutReduction = '{$productPriceWithoutReduction}';
var productPrice = '{$productPrice}'; var productPrice = '{$productPrice}';
@@ -377,14 +378,6 @@ var fieldRequired = '{l s='Please fill in all the required fields before saving
{/if} {/if}
<div class="price"> <div class="price">
{if !$priceDisplay || $priceDisplay == 2}
{assign var='productPrice' value=$product->getPrice(true, $smarty.const.NULL, $priceDisplayPrecision)}
{assign var='productPriceWithoutReduction' value=$product->getPriceWithoutReduct(false, $smarty.const.NULL)}
{elseif $priceDisplay == 1}
{assign var='productPrice' value=$product->getPrice(false, $smarty.const.NULL, $priceDisplayPrecision)}
{assign var='productPriceWithoutReduction' value=$product->getPriceWithoutReduct(true, $smarty.const.NULL)}
{/if}
<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>