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

Merge branch 'ticket-12487-HTTPS' into develop

Browse Source
This commit is contained in:
Marion Muszynski 2017-03-09 11:54:39 +01:00
commit 61ec78cab3
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
modules/skinstatic/AdminSkinStatic.php
View File

@ -61,7 +61,7 @@ class AdminSkinStatic extends AdminTab {
'<style type="text/css">body#index #columns { background: url("//www.bebeboutik.com/themes/site/skinstatic_cache/skin_'.(int) $i.'_'.(int) $id_lang.'.jpg?v={version}") no-repeat '.(Tools::getValue('fixed_'.(int) $i)? 'fixed center 0px': 'scroll center 0px').' #F1F1F1}</style><a'.((int) Tools::getValue('new_window_'.(int) $i)? ' onclick="window.open(this.href); return false;"': '').' id="skin-left" href="{left_link}"></a><a'.((int) Tools::getValue('new_window_'.(int) $i)? ' onclick="window.open(this.href); return false;"': '').' id="skin-right" href="{right_link}"></a>'.(Tools::getValue('fixed_'.(int) $i)? '
<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", "")); margin = 170; height = 750; if($(document).scrollTop()==0){margin = 30;} if($(document).scrollTop()>130){height = $(window).height();} console.log(height); scrolling.css({ "marginTop": Math.min($(document).scrollTop(), max_size)-margin + "px", "height" : height+"px" }); }); '.($i == 0 && substr(Tools::getValue('left_link_'.(int) $i), 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"); });': '').'
$(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", "")); margin = 170; height = 750; if($(document).scrollTop()==0){margin = 30;} if($(document).scrollTop()>130){height = $(window).height();}; scrolling.css({ "marginTop": Math.min($(document).scrollTop(), max_size)-margin + "px", "height" : height+"px" }); }); '.($i == 0 && substr(Tools::getValue('left_link_'.(int) $i), 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"); });': '').'
});
-->
</script>': '').'