Merge branch 'tiket-productTemplate' into develop

This commit is contained in:
Marion Muszynski 2016-05-03 15:04:27 +02:00
commit b7f2c64d64

View File

@ -391,11 +391,11 @@ var fieldRequired = '{l s='Please fill in all required fields, then save the cus
<!-- left infos--> <!-- left infos-->
<div id="pb-left-column"> <div id="pb-left-column">
{if $product->description_more OR $packItems|@count > 0} {if $product->description_short OR $packItems|@count > 0}
<div id="short_description_block"> <div id="short_description_block">
{if $product->description_more} {*if $product->description_short}
<div id="short_description_content" class="rte align_justify">{$product->description_more}</div> <div id="short_description_content" class="rte align_justify">{$product->description_short}</div>
{/if} {/if*}
{*{if $product->description} {*{if $product->description}
<p class="buttons_bottom_block"><a href="javascript:{ldelim}{rdelim}" class="button">{l s='More details'}</a></p> <p class="buttons_bottom_block"><a href="javascript:{ldelim}{rdelim}" class="button">{l s='More details'}</a></p>
{/if}*} {/if}*}
@ -417,12 +417,13 @@ var fieldRequired = '{l s='Please fill in all required fields, then save the cus
{if $HOOK_EXTRA_RIGHT}{$HOOK_EXTRA_RIGHT}{/if} {if $HOOK_EXTRA_RIGHT}{$HOOK_EXTRA_RIGHT}{/if}
<!-- description and features --> <!-- description and features -->
{if $product->videos || $product->description_short || $product->description || $features || $accessories || $HOOK_PRODUCT_TAB || $attachments} {if $product->description_more || $product->videos || $product->description_short || $product->description || $features || $accessories || $HOOK_PRODUCT_TAB || $attachments}
<div id="more_info_block" class="clear"> <div id="more_info_block" class="clear">
<ul id="more_info_tabs" class="idTabs idTabsShort"> <ul id="more_info_tabs" class="idTabs idTabsShort">
{if $product->description_short}<li><a id="more_info_tab_more_info" href="#idTab1" style="cursor: default !important;">{l s='Description'}</a></li>{/if} {if $product->description_short}<li><a id="more_info_tab_more_info" href="#idTab1" style="cursor: default !important;">{l s='Description'}</a></li>{/if}
{if $product->description}<li><a id="more_info_tab_more_info" href="#idTab2" style="">{l s='Good to know'}</a></li>{/if} {if $product->description}<li><a id="more_info_tab_more_info" href="#idTab2" style="">{l s='Good to know'}</a></li>{/if}
{if $product->description_more}<li><a id="more_info_tab_more_info" href="#idTab3" style="">{l s='More'}</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->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_more_info" href="#idTab4" style="">{l s='Videos'}</a></li>{/if} {if $product->videos}<li><a id="more_info_tab_more_info" href="#idTab4" style="">{l s='Videos'}</a></li>{/if}
{*if $features}<li><a id="more_info_tab_data_sheet" href="#idTab2">{l s='Data sheet'}</a></li>{/if*} {*if $features}<li><a id="more_info_tab_data_sheet" href="#idTab2">{l s='Data sheet'}</a></li>{/if*}
@ -439,6 +440,10 @@ var fieldRequired = '{l s='Please fill in all required fields, then save the cus
<!-- full description --> <!-- full description -->
<div id="idTab2" class="rte">{$product->description}</div> <div id="idTab2" class="rte">{$product->description}</div>
{/if} {/if}
{if $product->description_more}
<!-- full description_more -->
<div id="idTab3" class="rte">{$product->description_more}</div>
{/if}
{if $product->videos} {if $product->videos}
<!-- full videos --> <!-- full videos -->
<div id="idTab4" class="rte">{$product->videos}</div> <div id="idTab4" class="rte">{$product->videos}</div>