antadis/bebeboutik
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'tiket-productTemplate' into develop

Browse Source
This commit is contained in:
Marion Muszynski 2016-04-29 16:04:45 +02:00
commit 5da6bd1c3f
4 changed files with 88 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
themes/site/css/style.css
View File

@ -5847,7 +5847,7 @@ a.loyalty-transform, .history_method span.total-discount-loyalty{
display: block;
text-align: center;
width: 100%;
height: 15px;
height: 22px;
position: absolute;
}
#views_block #view_scroll_left img, #view_scroll_right img{
@ -5855,11 +5855,11 @@ a.loyalty-transform, .history_method span.total-discount-loyalty{
}
#views_block #view_scroll_left{
/* margin-bottom: 10px; */
top: -5px;
top: -10px;
}
#views_block #view_scroll_right{
/* margin-top: 10px; */
bottom: -5px;
bottom: -10px;
}
#thumbs_list{
height: 420px;
@ -5913,11 +5913,16 @@ a.loyalty-transform, .history_method span.total-discount-loyalty{
background-position: -5px;
padding-left: 55px;
}
#sale_end #countdown {
#product #sale_end #countdown {
clear: both;
color: #fb66a9;
float: left;
}
#product .delay_flag{
position: absolute;
top: 115px;
left: -15px;
}
#product #short_description_block {
padding: 0px 20px 0px 20px;
width: 100%;
@ -5975,6 +5980,17 @@ div.form-right{
padding-top: 10px;
text-align: right;
}
#product #add_to_cart input.exclusive_disabled,
#product #add_to_cart input.exclusive[type="submit"] {
background: url("../img/add_to_cart.jpg") no-repeat left center #504d8b;
padding: 0 11px 0 50px;
height: 32px;
opacity: 1 !important;
border-radius: 0;
}
#product #add_to_cart input.exclusive[type="submit"]:hover {
background: url("../img/add_to_cart.jpg") no-repeat left center #FB5FA6;
}
#product #short_description_block #more_description_content{
margin-top: 20px;
}

76
themes/site/delay.tpl
View File

@ -1,25 +1,53 @@
{if $delivery_delay == 2}
<div class="delivery_delay">
<img src="{$img_ps_dir}delay/48h_site_{$cookie->id_lang}.png" alt="48h">
</div>
{elseif $delivery_delay == 3}
<div class="delivery_delay">
<img src="{$img_ps_dir}delay/7j_site_{$cookie->id_lang}.png" alt="7j">
</div>
{elseif $delivery_delay == 4}
<div class="delivery_delay">
<img src="{$img_ps_dir}delay/10j_site_{$cookie->id_lang}.png" alt="10j">
</div>
{elseif $delivery_delay == 5}
<div class="delivery_delay">
<img src="{$img_ps_dir}delay/noel_site_{$cookie->id_lang}.png" alt="noel">
</div>
{elseif $delivery_delay == 6}
<div class="delivery_delay">
<img src="{$img_ps_dir}delay/star_site_{$cookie->id_lang}.png" alt="star">
</div>
{elseif $delivery_delay == 7}
<div class="delivery_delay">
<img src="{$img_ps_dir}delay/72h_site_{$cookie->id_lang}.png" alt="72h">
</div>
{if $page_name == 'product'}
{if $delivery_delay == 2}
<div class="delivery_delay">
<img src="{$img_ps_dir}delay/delay_48h_{$cookie->id_lang}.png" alt="48h">
</div>
{elseif $delivery_delay == 3}
<div class="delivery_delay">
<img src="{$img_ps_dir}delay/delay_7j_{$cookie->id_lang}.png" alt="7j">
</div>
{elseif $delivery_delay == 4}
<div class="delivery_delay">
<img src="{$img_ps_dir}delay/delay_10j_{$cookie->id_lang}.png" alt="10j">
</div>
{elseif $delivery_delay == 5}
<div class="delivery_delay">
<img src="{$img_ps_dir}delay/delay_noel_{$cookie->id_lang}.png" alt="noel">
</div>
{elseif $delivery_delay == 6}
<div class="delivery_delay">
<img src="{$img_ps_dir}delay/delay_star_{$cookie->id_lang}.png" alt="star">
</div>
{elseif $delivery_delay == 7}
<div class="delivery_delay">
<img src="{$img_ps_dir}delay/delay_72h_{$cookie->id_lang}.png" alt="72h">
</div>
{/if}
{else}
{if $delivery_delay == 2}
<div class="delivery_delay">
<img src="{$img_ps_dir}delay/48h_site_{$cookie->id_lang}.png" alt="48h">
</div>
{elseif $delivery_delay == 3}
<div class="delivery_delay">
<img src="{$img_ps_dir}delay/7j_site_{$cookie->id_lang}.png" alt="7j">
</div>
{elseif $delivery_delay == 4}
<div class="delivery_delay">
<img src="{$img_ps_dir}delay/10j_site_{$cookie->id_lang}.png" alt="10j">
</div>
{elseif $delivery_delay == 5}
<div class="delivery_delay">
<img src="{$img_ps_dir}delay/noel_site_{$cookie->id_lang}.png" alt="noel">
</div>
{elseif $delivery_delay == 6}
<div class="delivery_delay">
<img src="{$img_ps_dir}delay/star_site_{$cookie->id_lang}.png" alt="star">
</div>
{elseif $delivery_delay == 7}
<div class="delivery_delay">
<img src="{$img_ps_dir}delay/72h_site_{$cookie->id_lang}.png" alt="72h">
</div>
{/if}
{/if}

BIN
themes/site/img/add_to_cart.jpg
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 2.1 KiB

After

Width:  |  Height:  |  Size: 12 KiB

22
themes/site/product.tpl
View File

@ -160,7 +160,7 @@ var fieldRequired = '{l s='Please fill in all required fields, then save the cus
<div id="views_block" {if isset($images) && count($images) < 2}class="hidden"{/if}>
{if isset($images) && count($images) > 4}
<a id="view_scroll_left" class="" title="{l s='Other views'}" href="javascript:{ldelim}{rdelim}">
<img src="{$img_dir}previous_.png" alt="" />
<img src="{$img_dir}arrow_pink_top.png" alt="" />
</a>
{/if}
<div id="thumbs_list">
@ -179,7 +179,7 @@ var fieldRequired = '{l s='Please fill in all required fields, then save the cus
</div>
{if isset($images) && count($images) > 4}
<a id="view_scroll_right" title="{l s='Other views'}" href="javascript:{ldelim}{rdelim}">
<img src="{$img_dir}next_.png" alt="" />
<img src="{$img_dir}arrow_pink_bot.png" alt="" />
</a>
{/if}
</div>
@ -383,6 +383,16 @@ var fieldRequired = '{l s='Please fill in all required fields, then save the cus
<p>{l s='Bébé Boutik aime ce produit : parce qu’il est innovant, pratique, parce qu’il éveille votre enfant par ses couleurs, sa texture, ses fonctions, ou parce qu’il l’habille avec douceur et originalité, Bébé Boutik vous le recommande !'}</p>
</div>
{/if}
{if $sale->delivery_delay == 2
|| $sale->delivery_delay == 3
|| $sale->delivery_delay == 4
|| $sale->delivery_delay == 5
|| $sale->delivery_delay == 6
|| $sale->delivery_delay == 7}
<div class="delay_flag">
{include file="./themes/site/delay.tpl" delivery_delay=$sale->delivery_delay}
</div>
{/if}
{if isset($HOOK_PRODUCT_ACTIONS) && $HOOK_PRODUCT_ACTIONS}{$HOOK_PRODUCT_ACTIONS}{/if}
@ -418,8 +428,8 @@ var fieldRequired = '{l s='Please fill in all required fields, then save the cus
{if $product->description_short || $product->description || $features || $accessories || $HOOK_PRODUCT_TAB || $attachments}
<div id="more_info_block" class="clear">
<ul id="more_info_tabs" class="idTabs idTabsShort">
{if $product->description_short}<li><a id="more_info_tab_data_sheet" href="#idTab1">{l s='Description'}</a></li>{/if}
{if $product->description}<li><a id="more_info_tab_data_sheet" href="#idTab2">{l s='Good to know'}</a></li>{/if}
{if !empty($product->description_short)}<li><a id="more_info_tab_data_sheet" href="#idTab1">{l s='Description'}</a></li>{/if}
{if !empty($product->description)}<li><a id="more_info_tab_data_sheet" href="#idTab2">{l s='Good to know'}</a></li>{/if}
{*if $product->buy_guide}<li><a id="more_info_tab_data_sheet" href="#idTab3">{l s='Buy guide'}</a></li>{/if*}
{*if $product->videos}<li><a id="more_info_tab_data_sheet" href="#idTab4">{l s='Videos'}</a></li>{/if*}
<li><a id="more_info_tab_data_sheet" href="#idTab5">{l s='Shipping'}</a></li>
@ -429,13 +439,13 @@ var fieldRequired = '{l s='Please fill in all required fields, then save the cus
{$HOOK_PRODUCT_TAB}
</ul>
<div id="more_info_sheets" class="sheets align_justify">
{if $product->description_short}
{if !empty($product->description_short)}
<!-- full description -->
<div id="idTab1" class="rte">
{$product->description_short}
</div>
{/if}
{if $product->description}
{if !empty($product->description)}
<!-- full description -->
<div id="idTab2" class="rte">
{$product->description}