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

fix conflict

Browse Source
This commit is contained in:
Marion Muszynski 2017-10-12 13:59:34 +02:00
commit f33d4403a5
6 changed files with 181 additions and 75 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -2275,7 +2275,8 @@ h6 {
}
h1 {
color: #1e1633;
background: url("../img/bg_title.jpg") no-repeat top left;
/*background: url("../img/bg_title.jpg") no-repeat top left;*/
background: #fff;
font-size: 26px;
text-transform: none;
line-height: 1.5em;
@ -2318,6 +2319,7 @@ h4 {
}
#left_column {
padding-top: 0px;
padding-left: 2px;
}
body#category #center_column h1 {
margin: 0px 5px 20px 20px;
@ -7392,6 +7394,7 @@ table#carrierTable tbody td {
}
#order #center_column #gift_div textarea {
margin-bottom: 5px;
width: 100%;
}
#my_gift{
text-align: center;
@ -7451,4 +7454,99 @@ table#carrierTable tbody td {
text-decoration: underline;
color: #514E8C;
margin:10px 0px;
}
}
/* for new white bg */
#order-detail-content,
#after_cart_summary,
div.addresses ul.address,
#block_order_choices,
#order #center_column #HOOK_PAYMENT p.payment_module,
#order #center_column #HOOK_PAYMENT div.payment_module,
#left_column .text_block2,
#left_column #blockordersummary,
#left_column .informations_block_left,
#left_column .facebook_block,
#left_column .advertising_block,
#center_column .block_invite_tab,
#my-account #center_column ul,
#history #block-history,
#order-slip #block-history,
#order-follow #block-history,
#identity #center_column form,
#discount #block_discount,
.block-paybox,
.block-paypal,
.ant_support .section-help,
#cms #center_column .rte,
#contact-form form{
-webkit-box-sizing: border-box;
-moz-box-sizing: border-box;
box-sizing: border-box;
background: #fff;
-moz-box-shadow: 2px 2px 5px #cccccc;
-webkit-box-shadow: 2px 2px 5px #CCC;
-ms-box-shadow: 2px 2px 5px #cccccc;
-o-box-shadow: 2px 2px 5px #cccccc;
box-shadow: 2px 2px 5px #CCC;
}
#order-detail-content,
#after_cart_summary,
#block_order_choices,
#order #center_column #HOOK_PAYMENT p.payment_module,
#order #center_column #HOOK_PAYMENT div.payment_module,
#my-account #center_column ul,
#center_column .block_invite_tab,
#order-follow #block-history,
#order-slip #block-history,
#identity #center_column form,
#discount #block_discount,
.ant_support .section-help,
#cms #center_column .rte,
#contact-form form{
padding: 20px;
}
#order-detail-content,
#after_cart_summary,
#block_order_choices,
#order #center_column #HOOK_PAYMENT p.payment_module,
#order #center_column #HOOK_PAYMENT div.payment_module,
#my-account #center_column ul,
#center_column .block_invite_tab,
#history #block-history,
#order-slip #block-history,
#order-follow #block-history,
#identity #center_column form,
#discount #block_discount,
.block-paybox,
.block-paypal,
.ant_support .section-help,
#cms #center_column .rte,
#contact-form form{
width: 755px;
}
#after_cart_summary{
margin-top: 20px;
}
div.addresses ul.address.item {
margin-left: 2px;
}
#order #center_column #HOOK_PAYMENT p.payment_module,
#order #center_column #HOOK_PAYMENT div.payment_module{
border: 0px;
}
#my-account #center_column > h4,
#identity #center_column > h3{
text-align: center;
}
#order-follow #block-history .alternate_item,
#order-slip #block-history .alternate_item,
#discount .discount .alternate_item{
background: #F3F3F3;
}
.ant_support{
padding:0px!important;
}
#left_column .informations_block_left{
background: #f6f6f6;
}

101
themes/site/discount.tpl
View File

@ -29,60 +29,61 @@
<h1>{l s='My Vouchers'}</h1>
<div id="block_discount">
{if isset($discount) && count($discount) && $nbDiscounts}
<table class="discount std">
<thead>
<tr>
<th class="discount_code first_item">{l s='Code'}</th>
<th class="discount_description item">{l s='Description'}</th>
<th class="discount_quantity item">{l s='Quantity'}</th>
<th class="discount_value item">{l s='Value'}*</th>
<th class="discount_minimum item">{l s='Minimum'}</th>
<th class="discount_cumulative item">{l s='Cumulative'}</th>
<th class="discount_expiration_date last_item">{l s='Expiration date'}</th>
</tr>
</thead>
<tbody>
{foreach from=$discount item=discountDetail name=myLoop}
<tr class="{if $smarty.foreach.myLoop.first}first_item{elseif $smarty.foreach.myLoop.last}last_item{else}item{/if} {if $smarty.foreach.myLoop.index % 2}alternate_item{/if}">
<td class="discount_code">{$discountDetail.name}</td>
<td class="discount_description">{$discountDetail.description}</td>
<td class="discount_quantity">{$discountDetail.quantity_for_user}</td>
<td class="discount_value">
{if $discountDetail.id_discount_type == 1}
{$discountDetail.value|escape:'htmlall':'UTF-8'}%
{elseif $discountDetail.id_discount_type == 2}
{convertPrice price=$discountDetail.value}
{else}
{l s='Free shipping'}
{/if}
</td>
<td class="discount_minimum">
{if $discountDetail.minimal == 0}
{l s='none'}
{else}
{convertPrice price=$discountDetail.minimal}
{/if}
</td>
<td class="discount_cumulative">
{if $discountDetail.cumulable == 1}
<img src="{$img_dir}icon/yes.gif" alt="{l s='Yes'}" class="icon" />
{else}
<img src="{$img_dir}icon/no.gif" alt="{l s='No'}" class="icon" />
{/if}
</td>
<td class="discount_expiration_date">{dateFormat date=$discountDetail.date_to}</td>
</tr>
{/foreach}
</tbody>
</table>
<p>
* {l s='Tax included'}
</p>
<table class="discount std">
<thead>
<tr>
<th class="discount_code first_item">{l s='Code'}</th>
<th class="discount_description item">{l s='Description'}</th>
<th class="discount_quantity item">{l s='Quantity'}</th>
<th class="discount_value item">{l s='Value'}*</th>
<th class="discount_minimum item">{l s='Minimum'}</th>
<th class="discount_cumulative item">{l s='Cumulative'}</th>
<th class="discount_expiration_date last_item">{l s='Expiration date'}</th>
</tr>
</thead>
<tbody>
{foreach from=$discount item=discountDetail name=myLoop}
<tr class="{if $smarty.foreach.myLoop.first}first_item{elseif $smarty.foreach.myLoop.last}last_item{else}item{/if} {if $smarty.foreach.myLoop.index % 2}alternate_item{/if}">
<td class="discount_code">{$discountDetail.name}</td>
<td class="discount_description">{$discountDetail.description}</td>
<td class="discount_quantity">{$discountDetail.quantity_for_user}</td>
<td class="discount_value">
{if $discountDetail.id_discount_type == 1}
{$discountDetail.value|escape:'htmlall':'UTF-8'}%
{elseif $discountDetail.id_discount_type == 2}
{convertPrice price=$discountDetail.value}
{else}
{l s='Free shipping'}
{/if}
</td>
<td class="discount_minimum">
{if $discountDetail.minimal == 0}
{l s='none'}
{else}
{convertPrice price=$discountDetail.minimal}
{/if}
</td>
<td class="discount_cumulative">
{if $discountDetail.cumulable == 1}
<img src="{$img_dir}icon/yes.gif" alt="{l s='Yes'}" class="icon" />
{else}
<img src="{$img_dir}icon/no.gif" alt="{l s='No'}" class="icon" />
{/if}
</td>
<td class="discount_expiration_date">{dateFormat date=$discountDetail.date_to}</td>
</tr>
{/foreach}
</tbody>
</table>
<p>
* {l s='Tax included'}
</p>
{else}
<p class="warning">{l s='You do not possess any vouchers.'}</p>
{/if}
</div>
{*<p class="footer_links">
<a href="{$base_dir}" class="button">{l s='Home'}</a></li>
</p>*}

2
themes/site/modules/blocktext2/blocktext.tpl
View File

@ -23,7 +23,7 @@
{if $page_name != 'order'}
<div class="facebook_block">
<iframe src="//www.facebook.com/plugins/likebox.php?href=http%3A%2F%2Fwww.facebook.com%2Fbebeboutik&amp;width=200&amp;height=350&amp;colorscheme=light&amp;show_faces=true&amp;border_color&amp;stream=false&amp;header=false" scrolling="no" frameborder="0" style="border:none; overflow:hidden; width:200px; height:350px;" allowTransparency="true"></iframe>
<iframe src="//www.facebook.com/plugins/likebox.php?href=http%3A%2F%2Fwww.facebook.com%2Fbebeboutik&amp;width=200&amp;height=350&amp;colorscheme=light&amp;show_faces=true&amp;border_color&amp;stream=false&amp;header=false" scrolling="no" frameborder="0" style="border:none; overflow:hidden; width:200px; height:225px;" allowTransparency="true"></iframe>
</div>
{/if}
<!-- /MODULE Block text -->

30
themes/site/modules/invite/invite-program.tpl
View File

@ -48,20 +48,22 @@
</div>
{/if}
<ul class="idTabs">
<li><a href="#idTab1" {if $activeTab=='sponsor'}class="selected"{/if}>{l s='Sponsor my friends' mod='invite'}</a></li>
<li><a href="#idTab2" {if $activeTab=='pending'}class="selected"{/if}>{l s='Pending friends' mod='invite'}</a></li>
<li><a href="#idTab3" {if $activeTab=='subscribed'}class="selected"{/if}>{l s='Friends I sponsored' mod='invite'}</a></li>
</ul>
<div class="sheets">
<div id="idTab1">
{include file="tab1.tpl"}
</div>
<div id="idTab2">
{include file="tab2.tpl"}
</div>
<div id="idTab3">
{include file="tab3.tpl"}
<div class="block_invite_tab">
<ul class="idTabs">
<li><a href="#idTab1" {if $activeTab=='sponsor'}class="selected"{/if}>{l s='Sponsor my friends' mod='invite'}</a></li>
<li><a href="#idTab2" {if $activeTab=='pending'}class="selected"{/if}>{l s='Pending friends' mod='invite'}</a></li>
<li><a href="#idTab3" {if $activeTab=='subscribed'}class="selected"{/if}>{l s='Friends I sponsored' mod='invite'}</a></li>
</ul>
<div class="sheets">
<div id="idTab1">
{include file="tab1.tpl"}
</div>
<div id="idTab2">
{include file="tab2.tpl"}
</div>
<div id="idTab3">
{include file="tab3.tpl"}
</div>
</div>
</div>

17
themes/site/order-carrier.tpl
View File

@ -100,17 +100,19 @@
<div id="opc_delivery_methods-overlay" class="opc-overlay" style="display: none;"></div>
{/if}
<div id="block_order_choices">
{if $conditions AND $cms_id}
<h3 class="condition_title">{l s='Terms of service'}</h3>
<p class="checkbox">
<input type="checkbox" name="cgv" id="cgv" value="1" {if $checkedTOS || $cookie->id_lang == 3}checked="checked"{/if} />
<label for="cgv">{l s='I agree to the terms of service and adhere to them unconditionally.'}</label> <a href="{$link_conditions}" class="iframe">{l s='(read)'}</a>
</p>
<script type="text/javascript">$('a.iframe').fancybox();</script>
<h3 class="condition_title">{l s='Terms of service'}</h3>
<p class="checkbox">
<input type="checkbox" name="cgv" id="cgv" value="1" {if $checkedTOS || $cookie->id_lang == 3}checked="checked"{/if} />
<label for="cgv">{l s='I agree to the terms of service and adhere to them unconditionally.'}</label> <a href="{$link_conditions}" class="iframe">{l s='(read)'}</a>
</p>
<script type="text/javascript">$('a.iframe').fancybox();</script>
{/if}
{if $virtual_cart}
<input id="input_virtual_carrier" class="hidden" type="hidden" name="id_carrier" value="0" />
<input id="input_virtual_carrier" class="hidden" type="hidden" name="id_carrier" value="0" />
{else}
<h3 class="carrier_title">{l s='Choose your delivery method'}</h3>
@ -272,6 +274,7 @@
{/if} *}
{/if}
{/if}
</div>
{if !$opc}
{if $cookie->id_lang == 3}

4
themes/site/shopping-cart.tpl
View File

@ -324,6 +324,7 @@
</p>
{/if}
<div id="after_cart_summary">
{if $site_version == 'es'}
<p class="safety-payment">{l s='Pago seguro, datos encriptados'}</p>
{/if}
@ -369,7 +370,7 @@
</p>
<p id="gift_div" class="textarea">
<label for="gift_message">{l s='If you wish, you can add a note to the gift:'}</label>
<textarea rows="5" cols="35" id="gift_message" name="gift_message">{$cart->gift_message|escape:'htmlall':'UTF-8'}</textarea>
<textarea rows="5" id="gift_message" name="gift_message">{$cart->gift_message|escape:'htmlall':'UTF-8'}</textarea>
{* <a id="cart_add_gift_message" class="exclusive">{l s='Enregistré'}</a> <a id="cart_remove_gift_message" class="exclusive">{l s='Supprimer'}</a> *}
<div class="clear"></div>
</p>
@ -386,6 +387,7 @@
</script>
{/if}
{/if}
</div>
{* Define the style if it doesn't exist in the PrestaShop version*}
{* Will be deleted for 1.5 version and more *}