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

Restore menu MRP on new eldy code

Browse Source
This commit is contained in:
Laurent Destailleur 2019-03-06 14:18:58 +01:00
parent df180a7682
commit d4409ffb08
3 changed files with 50 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -183,23 +183,33 @@ function print_eldy_menu($db, $atarget, $type_user, &$tabMenu, &$menu, $noout =
);
// MRP
$tmpentry = array(
'enabled'=>(! empty($conf->bom->enabled) || ! empty($conf->mrp->enabled)),
'perms'=>(! empty($user->rights->bom->read) || ! empty($user->rights->mrp->read)),
'module'=>'bom|mrp',
$menu_arr[] = array(
'name' => 'TMenuMRP',
'link' => '/bom/bom_list.php?mainmenu=mrp&leftmenu=',
'title' => $langs->trans("TMenuMRP"),
'level' => 0,
'enabled' => $showmode = isVisibleToUserType
(
$type_user,
$tmpentry = array(
'enabled'=>(! empty($conf->bom->enabled) || ! empty($conf->mrp->enabled)),
'perms'=>(! empty($user->rights->bom->read) || ! empty($user->rights->mrp->read)),
'module'=>'bom|mrp',
),
$listofmodulesforexternal
),
'target' => $atarget,
'mainmenu' => "mrp",
'leftmenu' => '',
'position' => 30,
'id' => $id,
'idsel' => 'mrp',
'classname' => $classname = ( $_SESSION["mainmenu"] && $_SESSION["mainmenu"] == "project" ) ? 'class="tmenusel"' : 'class="tmenu"',
'prefix' => '',
'session' => ( ( $_SESSION["mainmenu"] && $_SESSION["mainmenu"] == "project" ) ? 0 : 1 ),
'loadLangs' => array("projects"),
'submenus' => array(),
);
$showmode=isVisibleToUserType($type_user, $tmpentry, $listofmodulesforexternal);
if ($showmode)
{
$classname="";
if ($_SESSION["mainmenu"] && $_SESSION["mainmenu"] == "mrp") { $classname='class="tmenusel"'; $_SESSION['idmenu']=''; }
else $classname = 'class="tmenu"';
$idsel='products';
$chaine=$langs->trans("TMenuMRP");
$menu->add('/bom/bom_list.php?mainmenu=mrp&leftmenu=', $chaine, 0, $showmode, $atarget, "bom", '', 30, $id, $idsel, $classname);
}
// Projects
$menu_arr[] = array(
@ -328,9 +338,9 @@ function print_eldy_menu($db, $atarget, $type_user, &$tabMenu, &$menu, $noout =
'idsel' => 'bank',
'classname' => $classname = ( $_SESSION["mainmenu"] && $_SESSION["mainmenu"] == "bank" ) ? 'class="tmenusel"' : 'class="tmenu"',
'prefix' => '',
'session' => ( ( $_SESSION["mainmenu"] && $_SESSION["mainmenu"] == "bank" ) ? 0 : 1 ),
'loadLangs' => array("compta","banks"),
'submenus' => array(),
);
@ -359,9 +369,9 @@ function print_eldy_menu($db, $atarget, $type_user, &$tabMenu, &$menu, $noout =
'idsel' => 'accountancy',
'classname' => $classname = ( $_SESSION["mainmenu"] && $_SESSION["mainmenu"] == "accountancy" ) ? 'class="tmenusel"' : 'class="tmenu"',
'prefix' => '',
'session' => ( ( $_SESSION["mainmenu"] && $_SESSION["mainmenu"] == "accountancy" ) ? 0 : 1 ),
'loadLangs' => array("compta"),
'submenus' => array(),
);
@ -390,9 +400,9 @@ function print_eldy_menu($db, $atarget, $type_user, &$tabMenu, &$menu, $noout =
'idsel' => 'hrm',
'classname' => $classname = ( $_SESSION["mainmenu"] && $_SESSION["mainmenu"] == "hrm" ) ? 'class="tmenusel"' : 'class="tmenu"',
'prefix' => '',
'session' => ( ( $_SESSION["mainmenu"] && $_SESSION["mainmenu"] == "hrm" ) ? 0 : 1 ),
'loadLangs' => array("holiday"),
'submenus' => array(),
);
@ -421,31 +431,31 @@ function print_eldy_menu($db, $atarget, $type_user, &$tabMenu, &$menu, $noout =
'idsel' => 'tools',
'classname' => $classname = ( $_SESSION["mainmenu"] && $_SESSION["mainmenu"] == "tools" ) ? 'class="tmenusel"' : 'class="tmenu"',
'prefix' => '',
'session' => ( ( $_SESSION["mainmenu"] && $_SESSION["mainmenu"] == "tools" ) ? 0 : 1 ),
'loadLangs' => array("other"),
'submenus' => array(),
);
// Add menus
foreach($menu_arr as $key => $smenu)
{
$smenu = (object) $smenu;
if( $smenu->enabled )
{
if($langs->session)
{
$_SESSION['idmenu']='';
}
// Load Langue
if(! empty($smenu->loadLangs))
{
$langs->loadLangs($smenu->loadLangs);
}
// Trans title
$mtitle = '';
if(is_array($smenu->title))

8
htdocs/theme/eldy/main_menu_fa_icons.css
View File

@ -118,6 +118,14 @@ div.mainmenu.products::before {
font-size: 1.5em;
}
div.mainmenu.mrp::before {
font-family: "Font Awesome 5 Free";
font-weight: 900;
content: "\f468";
color: white;
font-size: 1.5em;
}
div.mainmenu.project::before {
font-family: "Font Awesome 5 Free";
font-weight: 900;

4
htdocs/theme/md/style.css.php
View File

@ -1764,6 +1764,10 @@ div.mainmenu.products {
background-image: url(<?php echo dol_buildpath($path.'/theme/'.$theme.'/img/menus/products.png', 1) ?>);
}
div.mainmenu.mrp {
background-image: url(<?php echo dol_buildpath($path.'/theme/'.$theme.'/img/menus/products.png', 1) ?>);
}
div.mainmenu.project {
background-image: url(<?php echo dol_buildpath($path.'/theme/'.$theme.'/img/menus/project.png', 1) ?>);
}