From 426454a67b8d4df7bee5dea8f73b0b7610f3f5c2 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Sun, 22 May 2016 19:32:08 +0200 Subject: [PATCH] Prepare the hide left menu icon --- htdocs/core/menus/standard/eldy.lib.php | 8 ++++---- htdocs/main.inc.php | 3 ++- htdocs/theme/eldy/img/menus/README.md | 3 ++- htdocs/theme/eldy/img/menus/menu.png | Bin 166 -> 296 bytes htdocs/theme/eldy/style.css.php | 5 +++++ htdocs/theme/md/img/menus/menu.png | Bin 0 -> 296 bytes htdocs/theme/md/style.css.php | 5 +++++ 7 files changed, 18 insertions(+), 6 deletions(-) create mode 100644 htdocs/theme/md/img/menus/menu.png diff --git a/htdocs/core/menus/standard/eldy.lib.php b/htdocs/core/menus/standard/eldy.lib.php index 127d80ff197..5474b1dfffe 100644 --- a/htdocs/core/menus/standard/eldy.lib.php +++ b/htdocs/core/menus/standard/eldy.lib.php @@ -51,16 +51,16 @@ function print_eldy_menu($db,$atarget,$type_user,&$tabMenu,&$menu,$noout=0) if (empty($noout)) print_start_menu_array(); // Show/Hide vertical menu - if (GETPOST('testhidemenu') && empty($conf->global->MAIN_OPTIMIZEFORTEXTBROWSER)) + if (GETPOST('testmenuhider') && empty($conf->global->MAIN_OPTIMIZEFORTEXTBROWSER)) { $showmode=1; $classname = 'class="tmenu"'; - $idsel='home'; + $idsel='menu'; if (empty($noout)) print_start_menu_entry($idsel,$classname,$showmode); - if (empty($noout)) print_text_menu_entry($langs->trans("XXX"), 1, '#', $id, $idsel, $classname, $atarget); + if (empty($noout)) print_text_menu_entry('', 1, '#', $id, $idsel, $classname, $atarget); if (empty($noout)) print_end_menu_entry($showmode); - $menu->add('#', $langs->trans("XXX"), 0, $showmode, $atarget, "xxx", ''); + $menu->add('#', '', 0, $showmode, $atarget, "xxx", ''); } // Home diff --git a/htdocs/main.inc.php b/htdocs/main.inc.php index ffdb4288928..bd65a1e63bd 100644 --- a/htdocs/main.inc.php +++ b/htdocs/main.inc.php @@ -1036,7 +1036,8 @@ function top_htmlhead($head, $title='', $disablejs=0, $disablehead=0, $arrayofjs //if (! empty($conf->dol_use_jmobile)) $ext='version='.urlencode(DOL_VERSION); $ext='version='.urlencode(DOL_VERSION); if (GETPOST('version')) $ext='version='.GETPOST('version','int'); // usefull to force no cache on css/js - + if (GETPOST('testmenuhider')) $ext='testmenuhider='.GETPOST('testmenuhider','int'); + if (! defined('DISABLE_JQUERY') && ! $disablejs && $conf->use_javascript_ajax) { print ''."\n"; diff --git a/htdocs/theme/eldy/img/menus/README.md b/htdocs/theme/eldy/img/menus/README.md index 3b04bafbc9b..2c3e65e4e23 100644 --- a/htdocs/theme/eldy/img/menus/README.md +++ b/htdocs/theme/eldy/img/menus/README.md @@ -5,9 +5,10 @@ Tutorial to create a new image for menu: 2) With Gimp, open image and check there is a alpha channel. If not add one. 3) Convert image into back and white (Menu Image - Mode - Grey levels). 4) Use the degrade tool with option (Menu Tools - Paint - Degrade - CTRL+L): -* Mode: Erase color (you can also try "Elear only") +* Mode: Erase color (you can also try "Clear only") * Opacity: 50 +/- * Offset: 0 +* PP toward transparent * Shape: Linear * Select on image top of file and drag to bottom. Il est possible aussi d'augmenter la transparence globale depuis le calque. diff --git a/htdocs/theme/eldy/img/menus/menu.png b/htdocs/theme/eldy/img/menus/menu.png index e8ef108b1275503b5da65e98c326ba7c89c4c9ac..97f2da4df4e13fc14d4501f4bec70d3c80d330f9 100644 GIT binary patch delta 235 zcmV2{ve~S78oL=lC^Z``*CC1aW@o_JCJXg@`~@P{j%D*F$GY zvmw{y#wE=aY=gJ|xSZB+KwR1fNJS;YJM#d= ljz(+X*yYoE<^Vzb6+Y;*Nd7L5-2DIm002ovPDHLkV1gxCZVdnc delta 104 zcmZ3%w2X0r7VH1^{xkb0>dQy4@Nmn@<$Mr3!oa{_?&;zf5^?zL<%NO_1{@5Ar~X+7 zpJoWT;4Q<(_fhab-E#g=XYbqBYW^Pl$Na*99fA(n>s48D$m(+1Hvo-b@O1TaS?83{ F1OV|eCBXmy diff --git a/htdocs/theme/eldy/style.css.php b/htdocs/theme/eldy/style.css.php index 0e8aa08c885..0d53504f337 100644 --- a/htdocs/theme/eldy/style.css.php +++ b/htdocs/theme/eldy/style.css.php @@ -1025,6 +1025,11 @@ div.mainmenu.members { background-image: url(); } +div.mainmenu.menu { + background-image: url(); + top: 7px; +} + div.mainmenu.products { background-image: url(); } diff --git a/htdocs/theme/md/img/menus/menu.png b/htdocs/theme/md/img/menus/menu.png new file mode 100644 index 0000000000000000000000000000000000000000..97f2da4df4e13fc14d4501f4bec70d3c80d330f9 GIT binary patch literal 296 zcmeAS@N?(olHy`uVBq!ia0vp^1|ZDA0wn)(8}a}trX+877Y2q^y~;*F9%q3^WHAE+ zw=f7ZGR&GI0Tg5}@$_|Nf50ln&&X5rna2$%wA0hYF(l&f+t7o8%?3Q1-_K|ejaaB% z^0x1SWW>Vyu3yY^;@+ryVGQ}DdhX=6xgwncEQNJ1zBPmgwRSj!1RUjjd)+zRYqR3@ zC&yIJism$L|G#6-wS0$|TkMY)@w~Y>fzMLZcfUwR$`+Z-rR#S$?R=BoxXrg?@s9_R zD^7%82)Z8K?V~8QjCo&sht!j0$I{9x^7p!|{{G45tn7XEey^wNvy3zsefMxxJ!1Wt p;b@;*_JbQwFIPWfaQq``_hPfhKfV4te}SH0@O1TaS?83{1OV?lbzuMi literal 0 HcmV?d00001 diff --git a/htdocs/theme/md/style.css.php b/htdocs/theme/md/style.css.php index 330f36119c7..78208e06ce4 100644 --- a/htdocs/theme/md/style.css.php +++ b/htdocs/theme/md/style.css.php @@ -1083,6 +1083,11 @@ div.mainmenu.members { background-image: url(); } +div.mainmenu.menu { + background-image: url(); + top: 7px; +} + div.mainmenu.products { background-image: url(); }