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

:wq

Browse Source 
Merge branch 'develop' of gitlab.antadis.net:dev-antadis/bebeboutik into develop
This commit is contained in:
root 2017-05-10 10:42:33 +02:00
commit 2376146b12
8 changed files with 92 additions and 53 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
modules/invite/sponsor.php
View File

@ -21,7 +21,9 @@ if(($sponsor = Tools::getValue('sponsor')) && strlen($sponsor) > 12) {
$url = parse_url($_SERVER['REQUEST_URI']);
if(Tools::getIsset('lpes')) {
$lp = Tools::getValue('lpes');
Tools::redirect('?sponsor='.rawurlencode($cipherTool->encrypt('1|'.$email.'|')).(isset($lp)? '&lpes='.$lp: ''));
if( _THEME_NAME_ !== 'site_mobile') {
Tools::redirect('?sponsor='.rawurlencode($cipherTool->encrypt('1|'.$email.'|')).(isset($lp)? '&lpes='.$lp: ''));
}
}
if(Tools::getIsset('lp')) {

2
modules/landingpages/home_footer.tpl
View File

@ -25,7 +25,7 @@
{*<span class="form_info">{l s='(5 characters min.)'}</span>*}
</p>
<p class="required referralprogram">
<p class="referralprogram">
<label for="referralprogram_lp">{l s='E-mail address of your sponsor' mod='landingpages'}</label>
<input type="text" size="52" maxlength="128" class="text" id="referralprogram_lp" name="invite" value="{if isset($sponsor_email)}{$sponsor_email|escape:'htmlall':'UTF-8'}{elseif isset($smarty.post.invite)}{$smarty.post.invite|escape:'htmlall':'UTF-8'}{elseif isset($referralprogram)}{$referralprogram|escape:'htmlall':'UTF-8'}{/if}" />
</p>

77
themes/site_mobile/css/style.css
View File

@ -966,7 +966,7 @@ div#page #header .content,
div#page #header .content .top {
height:60px;
width:100%;
overflow: hidden;
/*overflow: hidden;*/
background: rgb(100,97,150);
background: -moz-linear-gradient(top, rgba(100,97,150,1) 0%, rgba(76,72,126,1) 100%);
background: -webkit-gradient(linear, left top, left bottom, color-stop(0%,rgba(100,97,150,1)), color-stop(100%,rgba(76,72,126,1)));
@ -980,16 +980,23 @@ div#page #header .content .top {
-moz-box-shadow: 0 5px 3px -3px #ccc;
box-shadow: 0 5px 3px -3px #ccc;*/
}
body.logged div#page #header .content {
body div#page #header .content .top .logo_block {
max-width:100%;
height:55px;
line-height:55px;
display:inline-block;
overflow:hidden;
float:left;
margin-left: 70px;
}
div#page #header .content {
text-align: center;
}
body div#page #header .content .top .logo_block {
max-width: 100%;
height: 55px;
line-height: 55px;
display: inline-block;
overflow: hidden;
}
/*body.logged div#page #header .content .top .logo_block {
margin-left: 70px;
float: left;
}*/
body div#page #header .content .top .logo_block a {
display:inline-block;
@ -1012,12 +1019,12 @@ div#page #header .icon.menu-mobile::before {
height: 26px;
background-image: url('../img/icon-menu.png');
background-size: cover;
background-repeat: no-repeat;
background-repeat: no-repeat;
position: absolute;
left: 0;
}
#page #header a.open-panel {
#page #header a.open-panel {
width: 30px;
top: 15px;
left: 15px;
@ -1026,24 +1033,24 @@ div#page #header .icon.menu-mobile::before {
}
.panel {
position: relative;
}
.panel.open { pointer-events: auto; }
.panel .inner {
position: fixed;
bottom: 0;
top: 0;
z-index: 10;
z-index: 9999;
left: -100%;
width: 80%;
transition: all 0.3s ease 0s;
-webkit-transition: all 0.3s ease 0s;
-moz-transition: all 0.3s ease 0s;
}
.panel .overlay {
transition: opacity 0.3s ease 0s;
-webkit-transition: opacity 0.3s ease 0s;
-moz-transition: opacity 0.3s ease 0s;
.panel .overlay {
transition: opacity 0.3s ease 0s;
-webkit-transition: opacity 0.3s ease 0s;
-moz-transition: opacity 0.3s ease 0s;
}
.panel.open .overlay {
content:'';
@ -1053,7 +1060,7 @@ div#page #header .icon.menu-mobile::before {
left: 0;
right: 0;
bottom: 0;
z-index: 1;
z-index: 9998;
}
.panel.open .inner {
padding: 20px 30px;
@ -1092,7 +1099,7 @@ div#page #header .content .top #header_user {
div#page #header .content .top #header_user ul {
margin:0px;
padding:0px;
text-align: left;
text-align: left;
padding-top: 30px;
}
div#page #header .content .top #header_user ul li {
@ -1150,11 +1157,15 @@ div#page #header .content .top #cart_block{
display:inline-block;
float:right;
border-bottom: 2px solid #413e6b;
width:23%;
height:60px;
max-height:60px;
padding-right: 15px;
position: absolute;
right: 15px;
z-index: 100;
top: 0px;
}
div#page #header .content .top #cart_block a{
div#page #header .content .top #cart_block a {
display: inline;
}
@ -1637,7 +1648,7 @@ body#category div#sale_end {
text-indent: 50px;
width: 74%;
}
body#category div#sale_end .date {
body#category div#sale_end .date {
color: #e36ea2;
}
body#category .sale_title, body#product .sale_title {
@ -1648,16 +1659,16 @@ body#category .sale_title, body#product .sale_title {
padding: 10px 0px;
text-align: left;
}
body#category .sale_title .gradient,
body#product .sale_title .gradient {
padding: 0;
body#category .sale_title .gradient,
body#product .sale_title .gradient {
padding: 0;
display: inline-block;
height: 40px;
height: 40px;
width: 15%;
vertical-align: top;
border: 0;
}
body#category .sale_title .gradient a.back,
body#category .sale_title .gradient a.back,
body#product .sale_title .gradient a.back {
width: 40px;
height: 40px;
@ -1880,8 +1891,8 @@ body#product #primary_block div.show_price {
text-align:center;
padding:10px;
}
body#product #primary_block #buy_block {
font-size: 0;
body#product #primary_block #buy_block {
font-size: 0;
}
body#product #primary_block div.show_price.half {
width: 50%;
@ -1922,7 +1933,7 @@ body#product #primary_block form#buy_block #attributes {
padding: 10px 0;
}
body#product #primary_block form#buy_block #attributes p {
margin-bottom: 5px;
margin-bottom: 5px;
}
body#product #primary_block form#buy_block #attributes p:last-child { margin-bottom: 0; }
body#product #primary_block form#buy_block #attributes label{
@ -3851,15 +3862,17 @@ h2.title{
body#product #img_wrap{
background:#fff;
padding: 5px;
text-align: center;
-webkit-box-shadow: 0 5px 3px -3px #ccc;
-moz-box-shadow: 0 5px 3px -3px #ccc;
box-shadow: 0 5px 3px -3px #ccc;
}
body#product #img_wrap #image-block{
body#product #img_wrap #image-block {
display:inline-block;
width:78%;
border: 1px solid #e6e6e6;
max-width: 78%;
margin: auto;
}
body#product #img_wrap #image-block.full{
display:inline-block;

12
themes/site_mobile/js/global.js
View File

@ -13,4 +13,14 @@ $(document).ready(function() {
e.preventDefault();
$(this).parent().parent().removeClass('open');
});
});
$('#privatesales_block ul .extra_info .small_title').each(function() {
if(window.matchMedia("(max-width:1199px)").matches) {
var nameProduct = $(this).text();
if(nameProduct.length > 20) {
nameProduct = nameProduct.substring(0,22)+"...";
$(this).text(nameProduct);
}
}
});
});

27
themes/site_mobile/js/product.js
View File

@ -466,8 +466,23 @@ $(document).ready(function()
//add a link on the span 'view full size' and on the big image
$('span#view_full_size, div#image-block img').click(function(){
$('#views_block li a.shown').click();
$('#views_block li a.shown').fancybox({
'hideOnContentClick': true,
'transitionIn' : 'elastic',
'transitionOut' : 'elastic',
'onComplete' : function(){$('#views_block li a.shown').unbind('click.fb');}
});
});
// if($('.thickbox').length > 0) {
// $('.thickbox').fancybox({
// 'hideOnContentClick': true,
// 'transitionIn' : 'elastic',
// 'transitionOut' : 'elastic'
// });
// }
//catch the click on the "more infos" button at the top of the page
$('div#short_description_block p a.button').click(function(){
$('#more_info_tab_more_info').click();
@ -494,13 +509,11 @@ $(document).ready(function()
});
}
if($('.thickbox').length > 0) {
$('.thickbox').fancybox({
'hideOnContentClick': true,
'transitionIn' : 'elastic',
'transitionOut' : 'elastic'
});
}
$('#product #thumbs_list_frame a').click(function(e) {
return false;
});
$('.tailles').click(function(e) {
$('.box_info_size').css({

4
themes/site_mobile/modules/categoryscroll/product-list.tpl
View File

@ -47,11 +47,11 @@
{/if}
{/if}
{/if}
<span class="gradient">
{* <span class="gradient">
<a href="{$product.link|escape:'htmlall':'UTF-8'}" title="{$product.description_short|truncate:360:'...'|strip_tags:'UTF-8'|escape:'htmlall':'UTF-8'}">
<img src="{$img_dir}arrow-blank.png" alt="{$product.description_short|truncate:360:'...'|strip_tags:'UTF-8'|escape:'htmlall':'UTF-8'}" />
</a>
</span>
</span> *}
</div>
</div>
</div>

4
themes/site_mobile/modules/privatesales_countdown/category.tpl
View File

@ -6,8 +6,8 @@
{else}
<div id="sale_end">
{l s='Until' mod='privatesales_countdown'}
<span class="date"> {$sale->date_start|date_format:'%e/%m'}</span> {l s='at' mod='privatesales_countdown'}
<span class="hour">{$sale->date_start|date_format:'%Hh%M'}</span>
<span class="date"> {$sale->date_end|date_format:'%e/%m'}</span> {l s='at' mod='privatesales_countdown'}
<span class="hour">{$sale->date_end|date_format:'%Hh%M'}</span>
</div>
{*<script type="text/javascript" src="{$base_dir_ssl}modules/privatesales_countdown/js/jquery.countdown.min.js"></script>
<script type="text/javascript" src="{$base_dir_ssl}modules/privatesales_countdown/js/jquery.countdown-{$lang_iso}.js"></script>

15
themes/site_mobile/product.tpl
View File

@ -99,13 +99,14 @@ var oneQuantityAvailableSentence = '{l s='Warning: 1 item in stock!' js=1}';
{/if}
<div class="product_title">
<h1 class="title sale_title">
{if isset($smarty.server.HTTP_REFERER) && preg_replace('#^https?://[^/]+/#', '/', $smarty.server.HTTP_REFERER) != $request_uri}
<span class="gradient">
<a href="{$smarty.server.HTTP_REFERER|escape:'htmlall':'UTF-8'|secureReferrer}" class="button_small back" title="{l s='Back'}">{l s='Back'}</a>
</span>
{/if}
<span>{$product->name|escape:'htmlall':'UTF-8'|truncate:24}</span></h1>
<h1 class="title sale_title">
{if isset($smarty.server.HTTP_REFERER) && preg_replace('#^https?://[^/]+/#', '/', $smarty.server.HTTP_REFERER) != $request_uri}
<span class="gradient">
<a href="{$smarty.server.HTTP_REFERER|escape:'htmlall':'UTF-8'|secureReferrer}" class="button_small back" title="{l s='Back'}">{l s='Back'}</a>
</span>
{/if}
<span>{$product->name|escape:'htmlall':'UTF-8'|truncate:28:'...':true:false}</span>
</h1>
</div>