From 218690db00d0b3a8ae737320437de654292af34d Mon Sep 17 00:00:00 2001 From: John BOTELLA Date: Thu, 7 Mar 2019 17:05:27 +0100 Subject: [PATCH 1/4] add css behavior --- htdocs/core/lib/functions.lib.php | 4 +--- htdocs/theme/eldy/style.css.php | 5 +++++ htdocs/theme/md/style.css.php | 5 +++++ 3 files changed, 11 insertions(+), 3 deletions(-) diff --git a/htdocs/core/lib/functions.lib.php b/htdocs/core/lib/functions.lib.php index 36cdf2c7686..7d5487f1215 100644 --- a/htdocs/core/lib/functions.lib.php +++ b/htdocs/core/lib/functions.lib.php @@ -7197,9 +7197,7 @@ function printCommonFooter($zone = 'private') print '/* JS CODE TO ENABLE to manage handler to switch left menu page (menuhider) */'."\n"; print 'jQuery(".menuhider").click(function() {'; 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/theme/eldy/style.css.php b/htdocs/theme/eldy/style.css.php index b21a399f8bd..076d2797f08 100644 --- a/htdocs/theme/eldy/style.css.php +++ b/htdocs/theme/eldy/style.css.php @@ -1221,6 +1221,11 @@ td.showDragHandle { box-shadow: 3px 0 6px -2px #eee; background: rgb(); } + +body.sidebar-collapse .side-nav { + display: none; +} + div.blockvmenulogo { border-bottom: 0 !important; diff --git a/htdocs/theme/md/style.css.php b/htdocs/theme/md/style.css.php index fcff90c4359..a7cf2785810 100644 --- a/htdocs/theme/md/style.css.php +++ b/htdocs/theme/md/style.css.php @@ -1246,6 +1246,11 @@ div.login_block { z-index: 90; } +body.sidebar-collapse .side-nav { + display: none; +} + + div.backgroundsemitransparent { background:rgba(255,255,255,0.6); padding-left: 10px; From 1127716abff7d3b043f375b226dac43efd5a3ced Mon Sep 17 00:00:00 2001 From: John BOTELLA Date: Thu, 7 Mar 2019 17:50:26 +0100 Subject: [PATCH 2/4] add support for md theme --- htdocs/theme/md/style.css.php | 24 +++++++++++++++++++++--- 1 file changed, 21 insertions(+), 3 deletions(-) diff --git a/htdocs/theme/md/style.css.php b/htdocs/theme/md/style.css.php index a7cf2785810..c8cce686e34 100644 --- a/htdocs/theme/md/style.css.php +++ b/htdocs/theme/md/style.css.php @@ -1246,9 +1246,6 @@ div.login_block { z-index: 90; } -body.sidebar-collapse .side-nav { - display: none; -} div.backgroundsemitransparent { @@ -5721,6 +5718,27 @@ border-top-right-radius: 6px; } +/* +* 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, body.sidebar-collapse .login_block { + left: -228px; +} + +body.sidebar-collapse .side-nav-vert, body.sidebar-collapse #id-right { + margin-left: 0;padding-left:0 +} close(); From 56a40c7de8065021eddc1ea684f7ceaea90988c2 Mon Sep 17 00:00:00 2001 From: John BOTELLA Date: Fri, 8 Mar 2019 14:06:37 +0100 Subject: [PATCH 3/4] Fix sidebar collapse behavior --- htdocs/main.inc.php | 4 +++ htdocs/theme/eldy/style.css.php | 4 +-- htdocs/theme/md/style.css.php | 53 +++++++++++++++++---------------- 3 files changed, 32 insertions(+), 29 deletions(-) diff --git a/htdocs/main.inc.php b/htdocs/main.inc.php index 70571964162..4f4dcd9a092 100644 --- a/htdocs/main.inc.php +++ b/htdocs/main.inc.php @@ -1095,6 +1095,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/style.css.php b/htdocs/theme/eldy/style.css.php index 076d2797f08..3793db64a61 100644 --- a/htdocs/theme/eldy/style.css.php +++ b/htdocs/theme/eldy/style.css.php @@ -1220,6 +1220,7 @@ 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 { @@ -1268,11 +1269,8 @@ div.vmenu, td.vmenu { background: #FFF; padding-left: 20px; padding-right: 20px; -} -.side-nav { position: absolute; z-index: 90; - display: none; } div.blockvmenulogo { diff --git a/htdocs/theme/md/style.css.php b/htdocs/theme/md/style.css.php index c8cce686e34..8af835b44bb 100644 --- a/htdocs/theme/md/style.css.php +++ b/htdocs/theme/md/style.css.php @@ -1210,9 +1210,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; @@ -1239,11 +1263,9 @@ div.login_block { overflow-x: initial !important; overflow-y: scroll; - display: none; + display: block; - position: auto; - top: auto; - z-index: 90; + position: relative; } @@ -1260,7 +1282,7 @@ div.backgroundsemitransparent { div.login_block { /* position: initial !important;*/ - display: none; + /*display: none;*/ } .login_block_getinfo { text-align: center; @@ -5718,27 +5740,6 @@ border-top-right-radius: 6px; } -/* -* 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, body.sidebar-collapse .login_block { - left: -228px; -} - -body.sidebar-collapse .side-nav-vert, body.sidebar-collapse #id-right { - margin-left: 0;padding-left:0 -} close(); From 37cd62b564fd6950a9776a8cf839e35f16a1eead Mon Sep 17 00:00:00 2001 From: John BOTELLA Date: Fri, 8 Mar 2019 14:26:06 +0100 Subject: [PATCH 4/4] Add user friendly behavior --- htdocs/core/lib/functions.lib.php | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/htdocs/core/lib/functions.lib.php b/htdocs/core/lib/functions.lib.php index 7d5487f1215..7d1fdab5bad 100644 --- a/htdocs/core/lib/functions.lib.php +++ b/htdocs/core/lib/functions.lib.php @@ -7195,7 +7195,8 @@ 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 " $('body').toggleClass('sidebar-collapse')\n"; print '});'."\n";