diff --git a/src/ninegate-1.0/src/Cadoles/CoreBundle/Resources/views/Include/footer.html.twig b/src/ninegate-1.0/src/Cadoles/CoreBundle/Resources/views/Include/footer.html.twig index 524f827c..b3ea925d 100644 --- a/src/ninegate-1.0/src/Cadoles/CoreBundle/Resources/views/Include/footer.html.twig +++ b/src/ninegate-1.0/src/Cadoles/CoreBundle/Resources/views/Include/footer.html.twig @@ -208,4 +208,10 @@ $(this).children(".item-preview").hide(); }); + $(".navbar-toggle").mouseup(function() { + setTimeout(function() { + resizeFrame(); + }, 50); + + }); diff --git a/src/ninegate-1.0/src/Cadoles/PortalBundle/Resources/views/Page/pages.html.twig b/src/ninegate-1.0/src/Cadoles/PortalBundle/Resources/views/Page/pages.html.twig index 898ed6f4..ff5a605f 100644 --- a/src/ninegate-1.0/src/Cadoles/PortalBundle/Resources/views/Page/pages.html.twig +++ b/src/ninegate-1.0/src/Cadoles/PortalBundle/Resources/views/Page/pages.html.twig @@ -403,13 +403,17 @@ var iFrame = document.getElementById('frameContent'); var heightbody = $('html').height(); - var heightheader = $('.header').height(); + + if($('.header').length) + var heightheader = $('.header').height(); + else + var heightheader = $('.navbarsmall').height(); + if($('#appmenu').css("display")=="none") var heightmenu = 0; else var heightmenu = $('#appmenu').height(); - var heightframe = heightbody-heightheader-heightmenu; $(".pageframe").each(function( index ) {