diff --git a/htdocs/core/lib/functions.lib.php b/htdocs/core/lib/functions.lib.php index 0b84d9e65bf..7bfe90dbbde 100644 --- a/htdocs/core/lib/functions.lib.php +++ b/htdocs/core/lib/functions.lib.php @@ -1155,11 +1155,12 @@ function dol_syslog($message, $level = LOG_INFO, $ident = 0, $suffixinfilename = * @param string $morehtmlright Add more html content on right of tabs title * @param string $morecss More Css * @param int $limittoshow Limit number of tabs to show. Use 0 to use automatic default value. + * @param string $moretabssuffix A suffix to use when you have several dol_get_fiche_head() in same page * @return void */ -function dol_fiche_head($links = array(), $active = '0', $title = '', $notab = 0, $picto = '', $pictoisfullpath = 0, $morehtmlright = '', $morecss = '', $limittoshow = 0) +function dol_fiche_head($links = array(), $active = '0', $title = '', $notab = 0, $picto = '', $pictoisfullpath = 0, $morehtmlright = '', $morecss = '', $limittoshow = 0, $moretabssuffix = '') { - print dol_get_fiche_head($links, $active, $title, $notab, $picto, $pictoisfullpath, $morehtmlright, $morecss, $limittoshow); + print dol_get_fiche_head($links, $active, $title, $notab, $picto, $pictoisfullpath, $morehtmlright, $morecss, $limittoshow, $moretabssuffix); } /** @@ -1174,9 +1175,10 @@ function dol_fiche_head($links = array(), $active = '0', $title = '', $notab = 0 * @param string $morehtmlright Add more html content on right of tabs title * @param string $morecss More Css * @param int $limittoshow Limit number of tabs to show. Use 0 to use automatic default value. + * @param string $moretabssuffix A suffix to use when you have several dol_get_fiche_head() in same page * @return string */ -function dol_get_fiche_head($links = array(), $active = '', $title = '', $notab = 0, $picto = '', $pictoisfullpath = 0, $morehtmlright = '', $morecss = '', $limittoshow = 0) +function dol_get_fiche_head($links = array(), $active = '', $title = '', $notab = 0, $picto = '', $pictoisfullpath = 0, $morehtmlright = '', $morecss = '', $limittoshow = 0, $moretabssuffix = '') { global $conf, $langs, $hookmanager; @@ -1184,7 +1186,7 @@ function dol_get_fiche_head($links = array(), $active = '', $title = '', $notab $showtitle = 1; if (!empty($conf->dol_optimize_smallscreen)) $showtitle = 0; - $out = "\n".''; + $out = "\n".''; if ((!empty($title) && $showtitle) || $morehtmlright || !empty($links)) { $out .= '
'."\n"; @@ -1298,7 +1300,8 @@ function dol_get_fiche_head($links = array(), $active = '', $title = '', $notab $left = ($langs->trans("DIRECTION") == 'rtl' ? 'right' : 'left'); $right = ($langs->trans("DIRECTION") == 'rtl' ? 'left' : 'right'); - $tabsname = str_replace("@", "", $picto); + $tabsname = $moretabssuffix; + if (empty($tabsname)) { $tabsname = str_replace("@", "", $picto); } $out .= '
'; $out .= ''.$langs->trans("More").'... ('.$nbintab.')'; $out .= '
'; diff --git a/htdocs/modulebuilder/index.php b/htdocs/modulebuilder/index.php index 58944d9d108..df9e58e9b31 100644 --- a/htdocs/modulebuilder/index.php +++ b/htdocs/modulebuilder/index.php @@ -1843,7 +1843,7 @@ if ($module == 'initmodule') if ($action != 'editfile' || empty($file)) { - dol_fiche_head($head2, $tab, '', -1, ''); // Description - level 2 + dol_fiche_head($head2, $tab, '', -1, '', 0, '', '', 0, 'formodulesuffix'); // Description - level 2 print ''.$langs->trans("ModuleBuilderDesc".$tab).''; $infoonmodulepath = '';