diff --git a/htdocs/core/lib/functions.lib.php b/htdocs/core/lib/functions.lib.php index fbca9c33ca5..f36901512f1 100644 --- a/htdocs/core/lib/functions.lib.php +++ b/htdocs/core/lib/functions.lib.php @@ -7191,11 +7191,10 @@ function printCommonFooter($zone = 'private') { print "\n"; print '/* JS CODE TO ENABLE to manage handler to switch left menu page (menuhider) */'."\n"; - print 'jQuery(".menuhider").click(function() {'; + print 'jQuery(".menuhider").click(function(event) {'; + print ' if(!$( "body" ).hasClass( "sidebar-collapse" )){ event.preventDefault(); }'."\n"; print ' console.log("We click on .menuhider");'."\n"; - //print " $('.side-nav').animate({width:'toggle'},200);\n"; // OK with eldy theme but not with md - print " $('.side-nav').toggle()\n"; - print " $('.login_block').toggle()\n"; + print " $('body').toggleClass('sidebar-collapse')\n"; print '});'."\n"; } diff --git a/htdocs/main.inc.php b/htdocs/main.inc.php index 2dcd9265c76..6fbad81780a 100644 --- a/htdocs/main.inc.php +++ b/htdocs/main.inc.php @@ -1096,6 +1096,10 @@ if (! function_exists("llxHeader")) // html header top_htmlhead($head, $title, $disablejs, $disablehead, $arrayofjs, $arrayofcss); + if ($conf->browser->layout == 'phone'){ + $morecssonbody.= ' sidebar-collapse'; + } + print '' . "\n"; // top menu and left menu area diff --git a/htdocs/theme/eldy/global.inc.php b/htdocs/theme/eldy/global.inc.php index 510ddce966e..1d71b6e7ae3 100644 --- a/htdocs/theme/eldy/global.inc.php +++ b/htdocs/theme/eldy/global.inc.php @@ -963,7 +963,13 @@ td.showDragHandle { border-right: 1px solid #d0d0d0; box-shadow: 3px 0 6px -2px #eee; background: rgb(); + transition: left 0.5s ease; } + +body.sidebar-collapse .side-nav { + display: none; +} + div.blockvmenulogo { border-bottom: 0 !important; @@ -1006,11 +1012,8 @@ div.vmenu, td.vmenu { background: #FFF; padding-left: 20px; padding-right: 20px; -} -.side-nav { position: absolute; - z-index: 90; - display: none; + z-index: 90; } div.blockvmenulogo { diff --git a/htdocs/theme/md/style.css.php b/htdocs/theme/md/style.css.php index d4da4f98fba..3f1c4356041 100644 --- a/htdocs/theme/md/style.css.php +++ b/htdocs/theme/md/style.css.php @@ -1196,9 +1196,33 @@ td.showDragHandle { } + +/* +* Slide animation +*/ +.side-nav-vert, #id-right { + transition: padding-left 0.5s ease, margin-left 0.5s ease; +} + +.side-nav, .login_block { + transition: left 0.5s ease; +} + +body.sidebar-collapse .side-nav-vert, body.sidebar-collapse #id-right { + margin-left: 0;padding-left:0 +} + + .side-nav-vert { margin-left: 228px; } +body.sidebar-collapse .side-nav, body.sidebar-collapse .login_block { +browser->layout, array('phone','tablet')) && ((GETPOST('testmenuhider') || ! empty($conf->global->MAIN_TESTMENUHIDER)) && empty($conf->global->MAIN_OPTIMIZEFORTEXTBROWSER))) { ?> + left: -240px; + + left: -229px; + +} global->THEME_DISABLE_STICKY_TOPMENU)) { ?> .side-nav-vert { position: sticky; @@ -1225,13 +1249,13 @@ div.login_block { overflow-x: initial !important; overflow-y: scroll; - display: none; + display: block; - position: auto; - top: auto; - z-index: 90; + position: relative; } + + div.backgroundsemitransparent { background:rgba(255,255,255,0.6); padding-left: 10px; @@ -1244,7 +1268,7 @@ div.backgroundsemitransparent { div.login_block { /* position: initial !important;*/ - display: none; + /*display: none;*/ } .login_block_getinfo { text-align: center;