diff --git a/htdocs/langs/en_US/admin.lang b/htdocs/langs/en_US/admin.lang index 3b9a78e20fe..6d767bf4a3d 100644 --- a/htdocs/langs/en_US/admin.lang +++ b/htdocs/langs/en_US/admin.lang @@ -630,6 +630,10 @@ Module600Desc=Send email notifications triggered by a business event: per user ( Module600Long=Note that this module sends emails in real-time when a specific business event occurs. If you are looking for a feature to send email reminders for agenda events, go into the setup of module Agenda. Module610Name=Product Variants Module610Desc=Creation of product variants (color, size etc.) +Module650Name=Bills Of Material (BOM) +Module650Desc=Module to define your Bills Of Materials (BOM). Can be used for Manufacturing Resource Planning by the module Manufacturing Orders (MO) +Module660Name=Manufacturing Resource Planning (MRP) +Module660Desc=Module to Manage Manufacturing Orders (MO) Module700Name=Donations Module700Desc=Donation management Module770Name=Expense Reports diff --git a/htdocs/theme/eldy/global.inc.php b/htdocs/theme/eldy/global.inc.php index 7c3437b98ce..9a333b65ce8 100644 --- a/htdocs/theme/eldy/global.inc.php +++ b/htdocs/theme/eldy/global.inc.php @@ -7796,7 +7796,7 @@ table.jPicker { max-width: 370px; } } -/* rule to reduce top menu - 2nd reduction: Reduce width of top menu icons again */ +/* rule to reduce top menu - 2nd reduction: Reduce width of top menu icons again ( menu entries) */ @media only screen and (max-width: global->THEME_ELDY_WITDHOFFSET_FOR_REDUC2) ? round($nbtopmenuentries * 69, 0) + 130 : $conf->global->THEME_ELDY_WITDHOFFSET_FOR_REDUC2; ?>px) /* reduction 2 */ { li.tmenucompanylogo { @@ -7806,7 +7806,7 @@ table.jPicker { height: 23px; } div.tmenucenter { - max-width: px; /* size of viewport */ + max-width: px; /* size of viewport */ text-overflow: clip; } span.mainmenuaspan { diff --git a/htdocs/theme/eldy/style.css.php b/htdocs/theme/eldy/style.css.php index ee8c02d1131..05c16635b53 100644 --- a/htdocs/theme/eldy/style.css.php +++ b/htdocs/theme/eldy/style.css.php @@ -265,12 +265,11 @@ $colortext = join(',', colorStringToArray($colortext)); $colortextlink = join(',', colorStringToArray($colortextlink)); $nbtopmenuentries = $menumanager->showmenu('topnb'); - +$nbtopmenuentriesreal = $nbtopmenuentries; if ($conf->browser->layout == 'phone') { $nbtopmenuentries = max($nbtopmenuentries, 10); } - $minwidthtmenu = 66; /* minimum width for one top menu entry */ $heightmenu = 50; /* height of top menu, part with image */ $heightmenu2 = 49; /* height of top menu, part with login */ diff --git a/htdocs/theme/md/style.css.php b/htdocs/theme/md/style.css.php index 32e20cdc0bb..00d696f32b9 100644 --- a/htdocs/theme/md/style.css.php +++ b/htdocs/theme/md/style.css.php @@ -271,6 +271,7 @@ $colortext = join(',', colorStringToArray($colortext)); $colortextlink = join(',', colorStringToArray($colortextlink)); $nbtopmenuentries = $menumanager->showmenu('topnb'); +$nbtopmenuentriesreal = $nbtopmenuentries; if ($conf->browser->layout == 'phone') { $nbtopmenuentries = max($nbtopmenuentries, 10); }