Panel bugfix + restore conf.json example

This commit is contained in:
Kload 2013-10-24 09:23:46 +00:00
parent 3d966ce49a
commit c0c10edbf5
2 changed files with 27 additions and 3 deletions

View file

@ -1 +1,20 @@
{} {
"portal_scheme": "https",
"portal_domain": "mydomain.com",
"portal_path": "/ssowat/",
"domains": [
"mydomain.com",
"myotherdomain.com"
],
"skipped_urls": [
"mydomain.com/megusta",
"myotherdomain.com/somuchwin"
],
"unprotected_urls": ["mydomain.com/yunoprotect"],
"additional_headers": {
"Auth-User": "uid",
"Remote-User": "uid",
"Email": "mail",
"Name": "cn"
}
}

View file

@ -13,7 +13,6 @@
<script src="assets/js/jquery-1.10.2.min.js"></script> <script src="assets/js/jquery-1.10.2.min.js"></script>
</head> </head>
<body class="gradient" style="overflow: hidden"> <body class="gradient" style="overflow: hidden">
<!--<body class="gradient" style="">-->
<iframe name="glu" id="glu" width="100%" src="/" style=""></iframe> <iframe name="glu" id="glu" width="100%" src="/" style=""></iframe>
<script> <script>
var ynh = {}; var ynh = {};
@ -42,7 +41,7 @@ ynh.jquery = jQuery.noConflict();
if((direction == "top") && ($("body").scrollTop() == 107 || $("html").scrollTop() == 107) && $("#ynhtoggle.ynhopen").length == 0) { if((direction == "top") && ($("body").scrollTop() == 107 || $("html").scrollTop() == 107) && $("#ynhtoggle.ynhopen").length == 0) {
if(preventFire) return; if(preventFire) return;
datScroll(0); datScroll(0);
} else if((direction == "bottom") && $("#ynhtoggle.ynhopen").length > 0) { } else if((direction == "bottom") && $("#ynhtoggle.ynhopen").length > 0 ) {
datScroll(h); datScroll(h);
} }
} }
@ -73,6 +72,12 @@ ynh.jquery = jQuery.noConflict();
}); });
}, 10); }, 10);
$(window).resize(function() {
if ($("#ynhtoggle.ynhopen").length == 0) {
$("body,html").scrollTop(h);
}
});
$( $(this)[0].contentWindow ).bind("DOMMouseScroll mousewheel scroll", function(event) { $( $(this)[0].contentWindow ).bind("DOMMouseScroll mousewheel scroll", function(event) {
if ((event.type == "DOMMouseScroll" && event.originalEvent.detail > 0) if ((event.type == "DOMMouseScroll" && event.originalEvent.detail > 0)
|| (event.type == "mousewheel" && event.originalEvent.wheelDeltaY < 0) || (event.type == "mousewheel" && event.originalEvent.wheelDeltaY < 0)