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,
'id' => $id,
'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' => '',
'session' => ( ( $_SESSION["mainmenu"] && $_SESSION["mainmenu"] == "project" ) ? 0 : 1 ),
'loadLangs' => array("projects"),
'session' => ( ( $_SESSION["mainmenu"] && $_SESSION["mainmenu"] == "mrp" ) ? 0 : 1 ),
'loadLangs' => array("mrp"),
'submenus' => array(),
);
@ -433,9 +433,9 @@ function print_eldy_menu($db, $atarget, $type_user, &$tabMenu, &$menu, $noout =
{
$smenu = (object) $smenu;
if( $smenu->enabled )
if ($smenu->enabled)
{
if($langs->session)
if ($smenu->session)
{
$_SESSION['idmenu']='';
}

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

@ -1,7 +1,7 @@
<?php if (! defined('ISLOADEDBYSTEELSHEET')) die('Must be call by steelsheet'); ?>
/* <style type="text/css" > */
.mainmenu::before{
.mainmenu::before{
/* font part */
font-family: "Font Awesome 5 Free";
font-weight: 900;
@ -21,54 +21,52 @@ div.mainmenu.menu {
background-image: none;
}
div.mainmenu.menu::before {
div.mainmenu.menu::before {
content: "\f0c9";
}
.mainmenu.home::before{
div.mainmenu.home::before{
content: "\f015";
}
}
.mainmenu.billing::before {
div.mainmenu.billing::before {
content: "\f0d6";
}
.mainmenu.accountancy::before {
div.mainmenu.accountancy::before {
content: "\f0d6";
}
.mainmenu.agenda::before {
div.mainmenu.agenda::before {
content: "\f073";
}
.mainmenu.bank::before {
div.mainmenu.bank::before {
content: "\f19c";
}
<?php if($conf->global->MAIN_FEATURES_LEVEL == 2){ ?>
<?php if ($conf->global->MAIN_FEATURES_LEVEL == 2) { ?>
/* TESTING USAGE OF SVG WITHOUT FONT */
.mainmenu.cashdesk{
div.mainmenu.cashdesk{
line-height: 26px;
}
.mainmenu.cashdesk .tmenuimage{
div.mainmenu.cashdesk .tmenuimage {
line-height: 26px;
display: inline-block;
vertical-align: middle;
height: <?php echo $topMenuFontSize; ?>;
background-color: #<?php echo $colortextbackhmenu; ?>;
width: 100%;
-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%;
}
<?php }else{ ?>
<?php } else { ?>
.mainmenu.cashdesk::before {
div.mainmenu.cashdesk::before {
content: "\f788";
}
@ -76,54 +74,58 @@ content: "\f0c9";
.mainmenu.takepos::before {
div.mainmenu.takepos::before {
content: "\f217";
}
.mainmenu.companies::before {
div.mainmenu.companies::before {
content: "\f1ad";
}
.mainmenu.commercial::before {
div.mainmenu.commercial::before {
content: "\f508";
}
.mainmenu.ecm::before {
div.mainmenu.ecm::before {
content: "\f07c";
}
.mainmenu.externalsite::before {
div.mainmenu.externalsite::before {
content: "\f360";
}
.mainmenu.ftp::before {
div.mainmenu.ftp::before {
content: "\f362";
}
.mainmenu.hrm::before {
div.mainmenu.hrm::before {
content: "\f5ca";
}
.mainmenu.members::before {
div.mainmenu.members::before {
content: "\f0c0";
}
.mainmenu.products::before {
div.mainmenu.products::before {
content: "\f468";
}
.mainmenu.project::before {
div.mainmenu.mrp::before {
content: "\f468";
}
div.mainmenu.project::before {
content: "\f0e8";
}
.mainmenu.ticket::before {
div.mainmenu.ticket::before {
content: "\f3ff";
}
.mainmenu.tools::before {
div.mainmenu.tools::before {
content: "\f0ad";
}
.mainmenu.website::before {
div.mainmenu.website::before {
content: "\f542";
}
}

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

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