fix confict css

This commit is contained in:
Marion Muszynski 2016-04-26 16:22:26 +02:00
commit 21f418dd84
3 changed files with 297 additions and 129 deletions

View File

@ -5796,6 +5796,160 @@ a.loyalty-transform, .history_method span.total-discount-loyalty{
display: block;
}
/** New product tpl **/
#product .product_title{
background:none;
-moz-box-shadow:none;
-webkit-box-shadow: none;
-ms-box-shadow:none;
-o-box-shadow:none;
box-shadow: none;
margin-bottom: 5px;
height: auto;
padding: 10px 0 0 10px;
font-size: 22px;
line-height: 22px;
}
#product #pb-left-column {
width: 435px;
float: right;
}
#product #pb-right-column {
width: 535px;
margin-left: 10px;
min-height: 750px;
float: left;
}
#primary_block #image-block {
float: left;
}
#product #views_block {
border: none;
border-top: 0;
width: 110px;
max-height: 420px;
float: left;
position: relative;
margin-top: 10px;
box-sizing: border-box;
}
#views_block #view_scroll_left, #view_scroll_right{
display: block;
text-align: center;
width: 100%;
height: 15px;
position: absolute;
}
#views_block #view_scroll_left img, #view_scroll_right img{
height: 100%;
}
#views_block #view_scroll_left{
/* margin-bottom: 10px; */
top: -5px;
}
#views_block #view_scroll_right{
/* margin-top: 10px; */
bottom: -5px;
}
#thumbs_list{
height: 420px;
overflow: hidden;
}
#views_block #thumbs_list ul li{
margin-bottom: 6px;
height: 100px;
width: 100px;
box-sizing: border-box;
margin-left: 5px;
}
#product #views_block ul li a{
width: 100px;
height: 100px;
}
#product #views_block ul li a img{
border: 1px solid #e9e5e6;
box-sizing: border-box;
}
#thumbs_list li:first-child{
margin-top: 15px;
}
#product #views_block ul {
overflow: initial;
}
#product .title_block {
background: none;
-moz-box-shadow: none;
-webkit-box-shadow: none;
-ms-box-shadow: none;
-o-box-shadow: none;
box-shadow: none;
margin: 10px 10px 0px 5px;
width: 100%;
box-sizing: border-box;
padding: 0px 20px 0px 20px;
}
#product .title_block .content {
border:none;
padding: 0px;
position: relative;
}
#product #sale_end{
top: 20px;
right: 0;
width: 120px;
background-position: -5px;
padding-left: 55px;
}
#product #short_description_block {
padding: 0px 20px 0px 20px;
width: 100%;
box-sizing: border-box;
}
#product #buy_block {
padding: 20px 10px 10px 30px;
margin: 10px 10px 10px 5px;
width: 100%;
box-sizing: border-box;
}
div.form-left{
float: left;
padding-top: 30px;
}
div.form-right{
float: right;
padding-top: 5px;
max-width: 225px;
}
#product .reduction_product {
margin-left: 0px;
position: absolute;
}
#product p.price{
border-top: 1px solid #cac7bf;
}
#product div#attributes {
float: left;
}
#product #buy_block #attributes p {
margin-bottom: 10px;
}
#product p#quantity_wanted_p {
float: left;
padding-bottom: 0px;
border-bottom: none;
}
#product #add_to_cart{
padding:0;
padding-top: 10px;
}
#product #short_description_block #short_description_content {
width: 100%;
margin-left: 5px;
text-align: justify;
}
@keyframes slideInDown {
0% {
-webkit-transform: translateY(-500px);

View File

@ -423,7 +423,7 @@ $(document).ready(function()
items:'li:visible',
prev:'a#view_scroll_left',
next:'a#view_scroll_right',
axis:'x',
axis:'y',
offset:0,
start:0,
stop:true,
@ -440,6 +440,7 @@ $(document).ready(function()
$('#thumbs_list').trigger('goto', 1);// SerialScroll Bug on goto 0 ?
$('#thumbs_list').trigger('goto', 0);
//hover 'other views' images management
$('#views_block li a').hover(
function(){displayImage($(this));},

View File

@ -122,21 +122,6 @@ var fieldRequired = '{l s='Please fill in all required fields, then save the cus
{include file="$tpl_dir./breadcrumb.tpl"}
{/if}
<div class="title_block">
<div class="content">
<div class="logo_vente">
<img src="{$base_dir_ssl}modules/privatesales/img/{$sale->id}/thumb_{$cookie->id_lang}.jpg" height="80px" />
</div>
<h1>{$product->name|escape:'htmlall':'UTF-8'}</h1>
</div>
</div>
{if $sale}
<div class="psales">
{$HOOK_PRIVATESALES_PRODUCT}
</div>
{/if}
<div id="primary_block" class="clearfix">
{if isset($adminActionDisplay) && $adminActionDisplay}
<div id="admin-action">
@ -157,6 +142,7 @@ var fieldRequired = '{l s='Please fill in all required fields, then save the cus
</p>
{/if}
<h1 class='product_title'>{$product->name|escape:'htmlall':'UTF-8'}</h1>
<!-- right infos-->
<div id="pb-right-column">
<!-- product img-->
@ -172,20 +158,30 @@ var fieldRequired = '{l s='Please fill in all required fields, then save the cus
{if isset($images) && count($images) > 0}
<!-- thumbnails -->
<div id="views_block" {if isset($images) && count($images) < 2}class="hidden"{/if}>
<div id="thumbs_list">
<ul id="thumbs_list_frame">
{if isset($images)}
{foreach from=$images item=image name=thumbnails}
{assign var=imageIds value="`$product->id`-`$image.id_image`"}
<li id="thumbnail_{$image.id_image}">
<a href="{$link->getImageLink($product->link_rewrite, $imageIds, 'thickbox')}" rel="other-views" class="thickbox {if $smarty.foreach.thumbnails.first}shown{/if}" title="{$image.legend|htmlspecialchars}">
<img id="thumb_{$image.id_image}" src="{$link->getImageLink($product->link_rewrite, $imageIds, 'mini_carre')}" alt="{$image.legend|htmlspecialchars}" height="80" width="80" />
</a>
</li>
{/foreach}
{/if}
</ul>
</div>
{if isset($images) && count($images) > 2}
<a id="view_scroll_left" class="" title="{l s='Other views'}" href="javascript:{ldelim}{rdelim}">
<img src="{$img_dir}previous_.png" alt="" />
</a>
{/if}
<div id="thumbs_list">
<ul id="thumbs_list_frame">
{if isset($images)}
{foreach from=$images item=image name=thumbnails}
{assign var=imageIds value="`$product->id`-`$image.id_image`"}
<li id="thumbnail_{$image.id_image}">
<a href="{$link->getImageLink($product->link_rewrite, $imageIds, 'thickbox')}" rel="other-views" class="thickbox {if $smarty.foreach.thumbnails.first}shown{/if}" title="{$image.legend|htmlspecialchars}">
<img id="thumb_{$image.id_image}" src="{$link->getImageLink($product->link_rewrite, $imageIds, 'mini_carre')}" alt="{$image.legend|htmlspecialchars}" height="100" width="100" />
</a>
</li>
{/foreach}
{/if}
</ul>
</div>
{if isset($images) && count($images) > 2}
<a id="view_scroll_right" title="{l s='Other views'}" href="javascript:{ldelim}{rdelim}">
<img src="{$img_dir}next_.png" alt="" />
</a>
{/if}
</div>
{/if}
{if isset($images) && count($images) > 1}<p class="align_center clear"><span id="wrapResetImages" style="display: none;"><img src="{$img_dir}icon/cancel.png" alt="{l s='Cancel'}" /> <a id="resetImages" href="{$link->getProductLink($product)}" onclick="$('span#wrapResetImages').hide('slow');return (false);">{l s='Display all pictures'}</a></span></p>{/if}
@ -205,11 +201,22 @@ var fieldRequired = '{l s='Please fill in all required fields, then save the cus
<!-- left infos-->
<div id="pb-left-column">
<div class="title_block">
<div class="content">
<div class="logo_vente">
<img src="{$base_dir_ssl}modules/privatesales/img/{$sale->id}/thumb_{$cookie->id_lang}.jpg" height="80px"/>
</div>
{if $sale}
<div class="psales">
{$HOOK_PRIVATESALES_PRODUCT}
</div>
{/if}
</div>
</div>
{if $product->description_short OR $packItems|@count > 0}
<div id="short_description_block">
{if $product->description_short}
<div id="short_description_content" class="rte align_justify">{$product->description_short}</div>
{/if}
{*{if $product->description}
<p class="buttons_bottom_block"><a href="javascript:{ldelim}{rdelim}" class="button">{l s='More details'}</a></p>
{/if}*}
@ -232,112 +239,114 @@ var fieldRequired = '{l s='Please fill in all required fields, then save the cus
<input type="hidden" name="add" value="1" />
<input type="hidden" name="id_product_attribute" id="idCombination" value="" />
</p>
{if isset($groups)}
<!-- attributes -->
<div id="attributes">
{foreach from=$groups key=id_attribute_group item=group}
{if $group.attributes|@count}
<p>
<label for="group_{$id_attribute_group|intval}">{$group.name|escape:'htmlall':'UTF-8'} :</label>
{assign var="groupName" value="group_$id_attribute_group"}
<select name="{$groupName}" id="group_{$id_attribute_group|intval}" onchange="javascript:findCombination();">
{foreach from=$group.attributes key=id_attribute item=group_attribute}
<option value="{$id_attribute|intval}"{if (isset($smarty.get.$groupName) && $smarty.get.$groupName|intval == $id_attribute) || $group.default == $id_attribute} selected="selected"{/if} title="{$group_attribute|escape:'htmlall':'UTF-8'}">{$group_attribute|escape:'htmlall':'UTF-8'}</option>
{/foreach}
</select>
</p>
{/if}
{/foreach}
</div>
{/if}
{*<p id="product_reference" {if isset($groups) OR !$product->reference}style="display: none;"{/if}><label for="product_reference">{l s='Reference :'} </label><span class="editable">{$product->reference|escape:'htmlall':'UTF-8'}</span></p>*}
<!-- quantity wanted -->
<p id="quantity_wanted_p"{if (!$allow_oosp && $product->quantity <= 0) OR $virtual OR !$product->available_for_order OR $PS_CATALOG_MODE} style="display: none;"{/if}>
<label>{l s='Quantity :'}</label>
<input type="text" name="qty" id="quantity_wanted" class="text" value="{if isset($quantityBackup)}{$quantityBackup|intval}{else}{if $product->minimal_quantity > 1}{$product->minimal_quantity}{else}1{/if}{/if}" size="2" maxlength="3" {if $product->minimal_quantity > 1}onkeyup="checkMinimalQuantity({$product->minimal_quantity});"{/if} />
</p>
{if isset($product->specificPrice) && $product->specificPrice.reduction_type == "percentage"}
<span class="reduction_product">- {$product->specificPrice.reduction|number_format:2 * 100}%</span>
{/if}
<!-- minimal quantity wanted -->
<p id="minimal_quantity_wanted_p"{if $product->minimal_quantity <= 1 OR !$product->available_for_order OR $PS_CATALOG_MODE} style="display: none;"{/if}>{l s='You must add '} <b id="minimal_quantity_label">{$product->minimal_quantity}</b> {l s=' as a minimum quantity to buy this product.'}</p>
{if $product->minimal_quantity > 1}
<script type="text/javascript">
checkMinimalQuantity();
</script>
{/if}
<!-- prices -->
{if $product->show_price AND !isset($restricted_country_mode) AND !$PS_CATALOG_MODE}
<p class="price">
{if !$priceDisplay || $priceDisplay == 2}
{assign var='productPrice' value=$product->getPrice(true, $smarty.const.NULL, 2)}
{assign var='productPriceWithoutRedution' value=$product->getPriceWithoutReduct(false, $smarty.const.NULL)}
{elseif $priceDisplay == 1}
{assign var='productPrice' value=$product->getPrice(false, $smarty.const.NULL, 2)}
{assign var='productPriceWithoutRedution' value=$product->getPriceWithoutReduct(true, $smarty.const.NULL)}
{/if}
{if $product->on_sale}
<img src="{$img_dir}onsale_{$lang_iso}.gif" alt="{l s='On sale'}" class="on_sale_img"/>
<span class="on_sale">{l s='On sale!'}</span>
{*{elseif $product->specificPrice AND $product->specificPrice.reduction AND $productPriceWithoutRedution > $productPrice}
<span class="discount">{l s='Reduced price!'}</span>*}
{/if}
<span class="our_price_display">
{if $priceDisplay >= 0 && $priceDisplay <= 2}
<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 $priceDisplay == 1}{l s='tax excl.'}{else}{l s='tax incl.'}{/if}
{/if}
{/if}
</span>
{if $priceDisplay == 2}
<span id="pretaxe_price"><span id="pretaxe_price_display">{convertPrice price=$product->getPrice(false, $smarty.const.NULL, 2)}</span>&nbsp;{l s='tax excl.'}</span>
{/if}
</p>
{if $product->specificPrice AND $product->specificPrice.reduction}
<p id="old_price"><span class="bold">
{if $priceDisplay >= 0 && $priceDisplay <= 2}
{if $productPriceWithoutRedution > $productPrice}
<span id="old_price_display">{convertPrice price=$productPriceWithoutRedution}</span>
{if $tax_enabled && $display_tax_label == 1}
<div class="form-left">
{if isset($product->specificPrice) && $product->specificPrice.reduction_type == "percentage"}
<span class="reduction_product">- {$product->specificPrice.reduction|number_format:2 * 100}%</span>
{/if}
<!-- prices -->
{if $product->show_price AND !isset($restricted_country_mode) AND !$PS_CATALOG_MODE}
<p class="price">
{if !$priceDisplay || $priceDisplay == 2}
{assign var='productPrice' value=$product->getPrice(true, $smarty.const.NULL, 2)}
{assign var='productPriceWithoutRedution' value=$product->getPriceWithoutReduct(false, $smarty.const.NULL)}
{elseif $priceDisplay == 1}
{assign var='productPrice' value=$product->getPrice(false, $smarty.const.NULL, 2)}
{assign var='productPriceWithoutRedution' value=$product->getPriceWithoutReduct(true, $smarty.const.NULL)}
{/if}
{if $product->on_sale}
<img src="{$img_dir}onsale_{$lang_iso}.gif" alt="{l s='On sale'}" class="on_sale_img"/>
<span class="on_sale">{l s='On sale!'}</span>
{*{elseif $product->specificPrice AND $product->specificPrice.reduction AND $productPriceWithoutRedution > $productPrice}
<span class="discount">{l s='Reduced price!'}</span>*}
{/if}
<span class="our_price_display">
{if $priceDisplay >= 0 && $priceDisplay <= 2}
<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 $priceDisplay == 1}{l s='tax excl.'}{else}{l s='tax incl.'}{/if}
{/if}
{/if}
{/if}
</span>
</p>
{/if}
{*{if $product->specificPrice AND $product->specificPrice.reduction_type == 'percentage'}
<p id="reduction_percent">{l s='(price reduced by'} <span id="reduction_percent_display">{$product->specificPrice.reduction*100}</span> %{l s=')'}</p>
{/if}*}
{if $packItems|@count}
<p class="pack_price">{l s='instead of'} <span style="text-decoration: line-through;">{convertPrice price=$product->getNoPackPrice()}</span></p>
<br class="clear" />
{/if}
{if $product->ecotax != 0}
<p class="price-ecotax">{l s='include'} <span id="ecotax_price_display">{if $priceDisplay == 2}{$ecotax_tax_exc|convertAndFormatPrice}{else}{$ecotax_tax_inc|convertAndFormatPrice}{/if}</span> {l s='for green tax'}
{if $product->specificPrice AND $product->specificPrice.reduction}
<br />{l s='(not impacted by the discount)'}
</span>
{if $priceDisplay == 2}
<span id="pretaxe_price"><span id="pretaxe_price_display">{convertPrice price=$product->getPrice(false, $smarty.const.NULL, 2)}</span>&nbsp;{l s='tax excl.'}</span>
{/if}
</p>
{if $product->specificPrice AND $product->specificPrice.reduction}
<p id="old_price"><span class="bold">
{if $priceDisplay >= 0 && $priceDisplay <= 2}
{if $productPriceWithoutRedution > $productPrice}
<span id="old_price_display">{convertPrice price=$productPriceWithoutRedution}</span>
{if $tax_enabled && $display_tax_label == 1}
{if $priceDisplay == 1}{l s='tax excl.'}{else}{l s='tax incl.'}{/if}
{/if}
{/if}
{/if}
</span>
</p>
{/if}
{*{if $product->specificPrice AND $product->specificPrice.reduction_type == 'percentage'}
<p id="reduction_percent">{l s='(price reduced by'} <span id="reduction_percent_display">{$product->specificPrice.reduction*100}</span> %{l s=')'}</p>
{/if}*}
{if $packItems|@count}
<p class="pack_price">{l s='instead of'} <span style="text-decoration: line-through;">{convertPrice price=$product->getNoPackPrice()}</span></p>
<br class="clear" />
{/if}
{if $product->ecotax != 0}
<p class="price-ecotax">{l s='include'} <span id="ecotax_price_display">{if $priceDisplay == 2}{$ecotax_tax_exc|convertAndFormatPrice}{else}{$ecotax_tax_inc|convertAndFormatPrice}{/if}</span> {l s='for green tax'}
{if $product->specificPrice AND $product->specificPrice.reduction}
<br />{l s='(not impacted by the discount)'}
{/if}
</p>
{/if}
{if !empty($product->unity) && $product->unit_price_ratio > 0.000000}
{math equation="pprice / punit_price" pprice=$productPrice punit_price=$product->unit_price_ratio assign=unit_price}
<p class="unit-price"><span id="unit_price_display">{convertPrice price=$unit_price}</span> {l s='per'} {$product->unity|escape:'htmlall':'UTF-8'}</p>
{/if}
{*close if for show price*}
{/if}
{if !empty($product->unity) && $product->unit_price_ratio > 0.000000}
{math equation="pprice / punit_price" pprice=$productPrice punit_price=$product->unit_price_ratio assign=unit_price}
<p class="unit-price"><span id="unit_price_display">{convertPrice price=$unit_price}</span> {l s='per'} {$product->unity|escape:'htmlall':'UTF-8'}</p>
</div>
<div class="form-right">
{if isset($groups)}
<!-- attributes -->
<div id="attributes">
{foreach from=$groups key=id_attribute_group item=group}
{if $group.attributes|@count}
<p>
<label for="group_{$id_attribute_group|intval}">{$group.name|escape:'htmlall':'UTF-8'} :</label>
{assign var="groupName" value="group_$id_attribute_group"}
<select name="{$groupName}" id="group_{$id_attribute_group|intval}" onchange="javascript:findCombination();">
{foreach from=$group.attributes key=id_attribute item=group_attribute}
<option value="{$id_attribute|intval}"{if (isset($smarty.get.$groupName) && $smarty.get.$groupName|intval == $id_attribute) || $group.default == $id_attribute} selected="selected"{/if} title="{$group_attribute|escape:'htmlall':'UTF-8'}">{$group_attribute|escape:'htmlall':'UTF-8'}</option>
{/foreach}
</select>
</p>
{/if}
{/foreach}
</div>
{/if}
{*close if for show price*}
{/if}
<p{if (!$allow_oosp && $product->quantity <= 0) OR !$product->available_for_order OR (isset($restricted_country_mode) AND $restricted_country_mode) OR $PS_CATALOG_MODE} style="display: none;"{/if} id="add_to_cart" class="buttons_bottom_block"><input type="submit" name="Submit" value="{l s='Add to cart'}" class="exclusive" /></p>
{*<p id="product_reference" {if isset($groups) OR !$product->reference}style="display: none;"{/if}><label for="product_reference">{l s='Reference :'} </label><span class="editable">{$product->reference|escape:'htmlall':'UTF-8'}</span></p>*}
<!-- quantity wanted -->
<p id="quantity_wanted_p"{if (!$allow_oosp && $product->quantity <= 0) OR $virtual OR !$product->available_for_order OR $PS_CATALOG_MODE} style="display: none;"{/if}>
<label>{l s='Quantity :'}</label>
<input type="text" name="qty" id="quantity_wanted" class="text" value="{if isset($quantityBackup)}{$quantityBackup|intval}{else}{if $product->minimal_quantity > 1}{$product->minimal_quantity}{else}1{/if}{/if}" size="2" maxlength="3" {if $product->minimal_quantity > 1}onkeyup="checkMinimalQuantity({$product->minimal_quantity});"{/if} />
</p>
<!-- minimal quantity wanted -->
<p id="minimal_quantity_wanted_p"{if $product->minimal_quantity <= 1 OR !$product->available_for_order OR $PS_CATALOG_MODE} style="display: none;"{/if}>{l s='You must add '} <b id="minimal_quantity_label">{$product->minimal_quantity}</b> {l s=' as a minimum quantity to buy this product.'}</p>
{if $product->minimal_quantity > 1}
<script type="text/javascript">
checkMinimalQuantity();
</script>
{/if}
<div class="clear"></div>
<p{if (!$allow_oosp && $product->quantity <= 0) OR !$product->available_for_order OR (isset($restricted_country_mode) AND $restricted_country_mode) OR $PS_CATALOG_MODE} style="display: none;"{/if} id="add_to_cart" class="buttons_bottom_block"><input type="submit" name="Submit" value="{l s='Add to cart'}" class="exclusive" /></p>
</div>
<div class="clear"></div>
<!-- availability -->
<p id="availability_statut"{if ($product->quantity <= 0 && !$product->available_later && $allow_oosp) OR ($product->quantity > 0 && !$product->available_now) OR !$product->available_for_order OR $PS_CATALOG_MODE} style="display: none;"{/if}>
<span id="availability_label">{l s='Availability:'}</span>
@ -374,9 +383,13 @@ var fieldRequired = '{l s='Please fill in all required fields, then save the cus
{/if}
{if isset($HOOK_PRODUCT_ACTIONS) && $HOOK_PRODUCT_ACTIONS}{$HOOK_PRODUCT_ACTIONS}{/if}
<div class="clear"></div>
</form>
{/if}
{if $product->description_short}
<div id="short_description_content" class="rte align_justify">{$product->description_short}</div>
{/if}
</div>
{/if}