lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix select of menu entry

Browse Source
This commit is contained in:
Laurent Destailleur 2019-03-11 19:53:27 +01:00
parent 0480b7ee4a
commit c6a269e4c4
3 changed files with 38 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
htdocs/core/menus/standard/eldy.lib.php
View File

@ -201,10 +201,10 @@ function print_eldy_menu($db, $atarget, $type_user, &$tabMenu, &$menu, $noout =
'position' => 30, 'position' => 30,
'id' => $id, 'id' => $id,
'idsel' => 'mrp', 'idsel' => 'mrp',
'classname' => $classname = ( $_SESSION["mainmenu"] && $_SESSION["mainmenu"] == "project" ) ? 'class="tmenusel"' : 'class="tmenu"', 'classname' => $classname = ( $_SESSION["mainmenu"] && $_SESSION["mainmenu"] == "mrp" ) ? 'class="tmenusel"' : 'class="tmenu"',
'prefix' => '', 'prefix' => '',
'session' => ( ( $_SESSION["mainmenu"] && $_SESSION["mainmenu"] == "project" ) ? 0 : 1 ), 'session' => ( ( $_SESSION["mainmenu"] && $_SESSION["mainmenu"] == "mrp" ) ? 0 : 1 ),
'loadLangs' => array("projects"), 'loadLangs' => array("mrp"),
'submenus' => array(), 'submenus' => array(),
); );
@ -433,9 +433,9 @@ function print_eldy_menu($db, $atarget, $type_user, &$tabMenu, &$menu, $noout =
{ {
$smenu = (object) $smenu; $smenu = (object) $smenu;
if( $smenu->enabled ) if ($smenu->enabled)
{ {
if($langs->session) if ($smenu->session)
{ {
$_SESSION['idmenu']=''; $_SESSION['idmenu']='';
} }

52
htdocs/theme/eldy/_main_menu_fa_icons.css.php
View File

@ -26,34 +26,33 @@ content: "\f0c9";
} }
.mainmenu.home::before{ div.mainmenu.home::before{
content: "\f015"; content: "\f015";
} }
.mainmenu.billing::before { div.mainmenu.billing::before {
content: "\f0d6"; content: "\f0d6";
} }
.mainmenu.accountancy::before { div.mainmenu.accountancy::before {
content: "\f0d6"; content: "\f0d6";
} }
.mainmenu.agenda::before { div.mainmenu.agenda::before {
content: "\f073"; content: "\f073";
} }
.mainmenu.bank::before { div.mainmenu.bank::before {
content: "\f19c"; content: "\f19c";
} }
<?php if($conf->global->MAIN_FEATURES_LEVEL == 2){ ?> <?php if ($conf->global->MAIN_FEATURES_LEVEL == 2) { ?>
/* TESTING USAGE OF SVG WITHOUT FONT */ /* TESTING USAGE OF SVG WITHOUT FONT */
.mainmenu.cashdesk{ div.mainmenu.cashdesk{
line-height: 26px; line-height: 26px;
} }
.mainmenu.cashdesk .tmenuimage{ div.mainmenu.cashdesk .tmenuimage {
line-height: 26px; line-height: 26px;
display: inline-block; display: inline-block;
vertical-align: middle; vertical-align: middle;
@ -63,12 +62,11 @@ content: "\f0c9";
-webkit-mask: url(./img/fontawesome/cash-register-solid.svg) no-repeat 50% 50%; /* for old webkit browser */ -webkit-mask: url(./img/fontawesome/cash-register-solid.svg) no-repeat 50% 50%; /* for old webkit browser */
mask: url(./img/fontawesome/cash-register-solid.svg) no-repeat 50% 50%; mask: url(./img/fontawesome/cash-register-solid.svg) no-repeat 50% 50%;
} }
<?php }else{ ?> <?php } else { ?>
.mainmenu.cashdesk::before { div.mainmenu.cashdesk::before {
content: "\f788"; content: "\f788";
} }
@ -76,54 +74,58 @@ content: "\f0c9";
.mainmenu.takepos::before { div.mainmenu.takepos::before {
content: "\f217"; content: "\f217";
} }
.mainmenu.companies::before { div.mainmenu.companies::before {
content: "\f1ad"; content: "\f1ad";
} }
.mainmenu.commercial::before { div.mainmenu.commercial::before {
content: "\f508"; content: "\f508";
} }
.mainmenu.ecm::before { div.mainmenu.ecm::before {
content: "\f07c"; content: "\f07c";
} }
.mainmenu.externalsite::before { div.mainmenu.externalsite::before {
content: "\f360"; content: "\f360";
} }
.mainmenu.ftp::before { div.mainmenu.ftp::before {
content: "\f362"; content: "\f362";
} }
.mainmenu.hrm::before { div.mainmenu.hrm::before {
content: "\f5ca"; content: "\f5ca";
} }
.mainmenu.members::before { div.mainmenu.members::before {
content: "\f0c0"; content: "\f0c0";
} }
.mainmenu.products::before { div.mainmenu.products::before {
content: "\f468"; content: "\f468";
} }
.mainmenu.project::before { div.mainmenu.mrp::before {
content: "\f468";
}
div.mainmenu.project::before {
content: "\f0e8"; content: "\f0e8";
} }
.mainmenu.ticket::before { div.mainmenu.ticket::before {
content: "\f3ff"; content: "\f3ff";
} }
.mainmenu.tools::before { div.mainmenu.tools::before {
content: "\f0ad"; content: "\f0ad";
} }
.mainmenu.website::before { div.mainmenu.website::before {
content: "\f542"; content: "\f542";
} }

2
htdocs/theme/eldy/theme_vars.php
View File

@ -48,7 +48,7 @@ $colortext='0,0,0';
$colortextlink='0,0,100'; $colortextlink='0,0,100';
$fontsize='0.86em'; $fontsize='0.86em';
$fontsizesmaller='0.75em'; $fontsizesmaller='0.75em';
$topMenuFontSize='1.1em'; $topMenuFontSize='1.2em';
$toolTipBgColor='rgba(255, 255, 255, 0.96);'; $toolTipBgColor='rgba(255, 255, 255, 0.96);';
$toolTipFontColor='#333'; $toolTipFontColor='#333';