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

Merge branch 'ticket-consumable' into develop

Browse Source
This commit is contained in:
Marion Muszynski 2016-04-15 11:27:16 +02:00
commit d1ef6a27c2
3 changed files with 38 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1565,6 +1565,10 @@ body#product div#sale_end{
body#product div#sale_end #countdown{
color: #e36ea2;
}
#sale_end.consumable{
background: none;
padding: 0;
}
body#category div.sale_img,
body#product div.sale_img{
margin:10px 0px;

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

@ -1,14 +1,20 @@
{if $sale}
<div id="sale_end">
{l s='This sale ends in' mod='privatesales_countdown'} <span id="countdown"></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>
<script type="text/javascript">{literal}
var endstring = "{/literal}{$sale->date_end}{literal}";
var enddate = endstring.split(' ')[0].split('-');
var endtime = endstring.split(' ')[1].split(':');
var endofsale = new Date(enddate[0], enddate[1]-1, enddate[2], endtime[0], endtime[1], endtime[2]);
$('#countdown').countdown({serverSync:function(){var d = new Date({/literal}{$smarty.now|date_format:'%Y, '}{$smarty.now|date_format:'%-m'} - 1{$smarty.now|date_format:', %-d, %-H, %-M, %-S'}{literal}); return d;}, until: endofsale, layout: '{d<}{dn} {dl} {d>} {hn} {hl}'});
{/literal}</script>
{if $consumable}
<div id="sale_end" class="consumable">
<img src="{$base_dir_ssl}modules/privatesales/img/{$sale->id}/thumb_{$cookie->id_lang}.jpg" height="50px"/>
</div>
{else}
<div id="sale_end">
{l s='This sale ends in' mod='privatesales_countdown'} <span id="countdown"></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>
<script type="text/javascript">{literal}
var endstring = "{/literal}{$sale->date_end}{literal}";
var enddate = endstring.split(' ')[0].split('-');
var endtime = endstring.split(' ')[1].split(':');
var endofsale = new Date(enddate[0], enddate[1]-1, enddate[2], endtime[0], endtime[1], endtime[2]);
$('#countdown').countdown({serverSync:function(){var d = new Date({/literal}{$smarty.now|date_format:'%Y, '}{$smarty.now|date_format:'%-m'} - 1{$smarty.now|date_format:', %-d, %-H, %-M, %-S'}{literal}); return d;}, until: endofsale, layout: '{d<}{dn} {dl} {d>} {hn} {hl}'});
{/literal}</script>
{/if}
{/if}

28
themes/site_mobile/modules/privatesales_countdown/product.tpl
View File

@ -1,14 +1,18 @@
{if $sale}
<div id="sale_end">
{l s='This sale ends in' mod='privatesales_countdown'} <span id="countdown"></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>
<script type="text/javascript">{literal}
var endstring = "{/literal}{$sale->date_end}{literal}";
var enddate = endstring.split(' ')[0].split('-');
var endtime = endstring.split(' ')[1].split(':');
var endofsale = new Date(enddate[0], enddate[1]-1, enddate[2], endtime[0], endtime[1], endtime[2]);
$('#countdown').countdown({serverSync:function(){var d = new Date({/literal}{$smarty.now|date_format:'%Y, '}{$smarty.now|date_format:'%-m'} - 1{$smarty.now|date_format:', %-d, %-H, %-M, %-S'}{literal}); return d;}, until: endofsale, layout: '{d<}{dn} {dl} {d>} {hn} {hl}'});
{/literal}</script>
{if $consumable}
<div id="sale_end"></div>
{else}
<div id="sale_end">
{l s='This sale ends in' mod='privatesales_countdown'} <span id="countdown"></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>
<script type="text/javascript">{literal}
var endstring = "{/literal}{$sale->date_end}{literal}";
var enddate = endstring.split(' ')[0].split('-');
var endtime = endstring.split(' ')[1].split(':');
var endofsale = new Date(enddate[0], enddate[1]-1, enddate[2], endtime[0], endtime[1], endtime[2]);
$('#countdown').countdown({serverSync:function(){var d = new Date({/literal}{$smarty.now|date_format:'%Y, '}{$smarty.now|date_format:'%-m'} - 1{$smarty.now|date_format:', %-d, %-H, %-M, %-S'}{literal}); return d;}, until: endofsale, layout: '{d<}{dn} {dl} {d>} {hn} {hl}'});
{/literal}</script>
{/if}
{/if}