Merge branch 'ticket-White_2'

This commit is contained in:
Marion Muszynski 2017-10-31 14:49:34 +01:00
commit b443abd67c
3 changed files with 4 additions and 4 deletions

View File

@ -42,7 +42,7 @@ class SkinStatic extends Module {
Tools::getValue('right_link_'.(int) $i.'_'.(int) $language['id_lang']),
Configuration::get('SKINSTATIC_VERSION'),
),
'<style type="text/css">body#index #columns { background: url("http://dev.bebeboutik.com/themes/site/skinstatic_cache/skin_'.(int) $i.'_'.(int) $language['id_lang'].'.jpg?v={version}") no-repeat '.(Tools::getValue('fixed_'.(int) $i.'_'.(int) $language['id_lang'])? 'fixed center 0px': 'scroll center 0px').' #F1F1F1}</style><a'.((int) Tools::getValue('new_window_'.(int) $i.'_'.(int) $language['id_lang'])? ' onclick="window.open(this.href); return false;"': '').' id="skin-left" href="{left_link}"></a><a'.((int) Tools::getValue('new_window_'.(int) $i.'_'.(int) $language['id_lang'])? ' onclick="window.open(this.href); return false;"': '').' id="skin-right" href="{right_link}"></a>'.(Tools::getValue('fixed_'.(int) $i.'_'.(int) $language['id_lang'])? '
'<style type="text/css">body#index #columns { background: url("http://dev.bebeboutik.com/themes/site/skinstatic_cache/skin_'.(int) $i.'_'.(int) $language['id_lang'].'.jpg?v={version}") no-repeat '.(Tools::getValue('fixed_'.(int) $i.'_'.(int) $language['id_lang'])? 'fixed center 0px': 'scroll center 0px').' #FFFFFF}</style><a'.((int) Tools::getValue('new_window_'.(int) $i.'_'.(int) $language['id_lang'])? ' onclick="window.open(this.href); return false;"': '').' id="skin-left" href="{left_link}"></a><a'.((int) Tools::getValue('new_window_'.(int) $i.'_'.(int) $language['id_lang'])? ' onclick="window.open(this.href); return false;"': '').' id="skin-right" href="{right_link}"></a>'.(Tools::getValue('fixed_'.(int) $i.'_'.(int) $language['id_lang'])? '
<script type="text/javascript">
<!--
$(document).ready(function() { var scrolling = $("#skin-left, #skin-right"); var pos = scrolling.position(); var size = scrolling.height() + 80; var max_size = $(document).height() - $("#footer").height() - 45; $(window).scroll(function(event) { offset = parseFloat(scrolling.css("marginTop").replace("px", "")); scrolling.css({ "marginTop": Math.min($(document).scrollTop(), max_size) + "px" }); }); '.($i == 0 && substr(Tools::getValue('left_link_'.(int) $i.'_'.(int) $language['id_lang']), 0, 28) == 'http://www.privatesportshop.'? '$("#skin-left, #skin-right").unbind("click").removeAttr("href").removeAttr("onclick").click(function(event) { event.stopPropagation(); event.preventDefault(); $("#privatesales_block li > a").first().trigger("click"); });': '').'

View File

@ -7452,4 +7452,4 @@ div.addresses ul.address.item {
}
.ant_support{
padding:0px!important;
}
}

View File

@ -242,9 +242,9 @@
</div>
<div class="fb_block">
{if $cookie->id_lang == 2}
<iframe src="https://www.facebook.com/plugins/likebox.php?href=http%3A%2F%2Fwww.facebook.com%2Fbebeboutik&amp;width=271&amp;height=62&amp;colorscheme=light&amp;show_faces=false&amp;border_color&amp;stream=false&amp;header=false" scrolling="no" frameborder="0" style="border:none; overflow:hidden; width:271px; height:62px;" allowTransparency="true"></iframe>
<iframe src="https://www.facebook.com/plugins/likebox.php?href=http%3A%2F%2Fwww.facebook.com%2Fbebeboutik&amp;width=271&amp;height=80&amp;colorscheme=light&amp;show_faces=false&amp;border_color&amp;stream=false&amp;header=false" scrolling="no" frameborder="0" style="border:none; overflow:hidden; width:271px; height:80px;" allowTransparency="true"></iframe>
{elseif $cookie->id_lang == 3}
<iframe src="https://www.facebook.com/plugins/likebox.php?href=https://www.facebook.com/Beb%C3%A9-Boutik-ES-703873103075174/&amp;width=271&amp;height=62&amp;colorscheme=light&amp;show_faces=false&amp;border_color&amp;stream=false&amp;header=false" scrolling="no" frameborder="0" style="border:none; overflow:hidden; width:271px; height:62px;" allowTransparency="true"></iframe>
<iframe src="https://www.facebook.com/plugins/likebox.php?href=https://www.facebook.com/Beb%C3%A9-Boutik-ES-703873103075174/&amp;width=271&amp;height=80&amp;colorscheme=light&amp;show_faces=false&amp;border_color&amp;stream=false&amp;header=false" scrolling="no" frameborder="0" style="border:none; overflow:hidden; width:271px; height:80px;" allowTransparency="true"></iframe>
{/if}
</div>
</li>