diff --git a/htdocs/core/lib/functions.lib.php b/htdocs/core/lib/functions.lib.php index 37b8eaa320b..1ac8ccaeea0 100644 --- a/htdocs/core/lib/functions.lib.php +++ b/htdocs/core/lib/functions.lib.php @@ -1065,7 +1065,7 @@ function dol_syslog($message, $level = LOG_INFO, $ident = 0, $suffixinfilename = * @param array $links Array of tabs. Currently initialized by calling a function xxx_admin_prepare_head * @param string $active Active tab name (document', 'info', 'ldap', ....) * @param string $title Title - * @param int $notab -1 or 0=Add tab header, 1=no tab header. If you set this to 1, using dol_fiche_end() to close tab is not required. + * @param int $notab -1 or 0=Add tab header, 1=no tab header (if you set this to 1, using dol_fiche_end() to close tab is not required), -2=Add tab header with no seaparation under tab (to start a tab just after) * @param string $picto Add a picto on tab title * @param int $pictoisfullpath If 1, image path is a full path. If you set this to 1, you can use url returned by dol_buildpath('/mymodyle/img/myimg.png',1) for $picto. * @param string $morehtmlright Add more html content on right of tabs title @@ -1083,7 +1083,7 @@ function dol_fiche_head($links = array(), $active = '0', $title = '', $notab = 0 * @param array $links Array of tabs * @param string $active Active tab name * @param string $title Title - * @param int $notab -1 or 0=Add tab header, 1=no tab header. If you set this to 1, using dol_fiche_end() to close tab is not required. + * @param int $notab -1 or 0=Add tab header, 1=no tab header (if you set this to 1, using dol_fiche_end() to close tab is not required), -2=Add tab header with no seaparation under tab (to start a tab just after) * @param string $picto Add a picto on tab title * @param int $pictoisfullpath If 1, image path is a full path. If you set this to 1, you can use url returned by dol_buildpath('/mymodyle/img/myimg.png',1) for $picto. * @param string $morehtmlright Add more html content on right of tabs title @@ -1232,7 +1232,7 @@ function dol_get_fiche_head($links = array(), $active = '', $title = '', $notab $out.="\n"; - if (! $notab || $notab == -1) $out.="\n".'
'."\n"; + if (! $notab || $notab == -1 || $notab == -2) $out.="\n".'
'."\n"; $parameters=array('tabname' => $active, 'out' => $out); $reshook=$hookmanager->executeHooks('printTabsHead', $parameters); // This hook usage is called just before output the head of tabs. Take also a look at "completeTabsHead" diff --git a/htdocs/exports/export.php b/htdocs/exports/export.php index f04f6419643..8b179f29f75 100644 --- a/htdocs/exports/export.php +++ b/htdocs/exports/export.php @@ -428,9 +428,6 @@ if ($step == 1 || ! $datatoexport) { llxHeader('', $langs->trans("NewExport"), 'EN:Module_Exports_En|FR:Module_Exports|ES:Módulo_Exportaciones'); - /* - * Affichage onglets - */ $h = 0; $head[$h][0] = DOL_URL_ROOT.'/exports/export.php?step=1'; @@ -438,12 +435,6 @@ if ($step == 1 || ! $datatoexport) $hselected=$h; $h++; - /* - $head[$h][0] = ''; - $head[$h][1] = $langs->trans("Step")." 2"; - $h++; - */ - dol_fiche_head($head, $hselected, $langs->trans("NewExport"), -1); @@ -500,10 +491,6 @@ if ($step == 2 && $datatoexport) { llxHeader('', $langs->trans("NewExport"), 'EN:Module_Exports_En|FR:Module_Exports|ES:Módulo_Exportaciones'); - - /* - * Affichage onglets - */ $h = 0; $head[$h][0] = DOL_URL_ROOT.'/exports/export.php?step=1'; @@ -515,7 +502,7 @@ if ($step == 2 && $datatoexport) $hselected=$h; $h++; - dol_fiche_head($head, $hselected, $langs->trans("NewExport"), -1); + dol_fiche_head($head, $hselected, $langs->trans("NewExport"), -2); print '
'; print '
'; @@ -697,9 +684,6 @@ if ($step == 3 && $datatoexport) llxHeader('', $langs->trans("NewExport"), 'EN:Module_Exports_En|FR:Module_Exports|ES:Módulo_Exportaciones'); - /* - * Affichage onglets - */ $h = 0; $head[$h][0] = DOL_URL_ROOT.'/exports/export.php?step=1'; @@ -715,7 +699,7 @@ if ($step == 3 && $datatoexport) $hselected=$h; $h++; - dol_fiche_head($head, $hselected, $langs->trans("NewExport"), -1); + dol_fiche_head($head, $hselected, $langs->trans("NewExport"), -2); print '
'; print '
'; @@ -873,9 +857,6 @@ if ($step == 4 && $datatoexport) llxHeader('', $langs->trans("NewExport"), 'EN:Module_Exports_En|FR:Module_Exports|ES:Módulo_Exportaciones'); - /* - * Affichage onglets - */ $stepoffset=0; $h = 0; @@ -901,7 +882,7 @@ if ($step == 4 && $datatoexport) $hselected=$h; $h++; - dol_fiche_head($head, $hselected, $langs->trans("NewExport"), -1); + dol_fiche_head($head, $hselected, $langs->trans("NewExport"), -2); print '
'; print '
'; @@ -1121,9 +1102,6 @@ if ($step == 5 && $datatoexport) llxHeader('', $langs->trans("NewExport"), 'EN:Module_Exports_En|FR:Module_Exports|ES:Módulo_Exportaciones'); - /* - * Affichage onglets - */ $h = 0; $stepoffset=0; @@ -1153,7 +1131,7 @@ if ($step == 5 && $datatoexport) $hselected=$h; $h++; - dol_fiche_head($head, $hselected, $langs->trans("NewExport"), -1); + dol_fiche_head($head, $hselected, $langs->trans("NewExport"), -2); /* * Confirmation suppression fichier diff --git a/htdocs/theme/eldy/style.css.php b/htdocs/theme/eldy/style.css.php index 1baf1650494..068a7bddcc8 100644 --- a/htdocs/theme/eldy/style.css.php +++ b/htdocs/theme/eldy/style.css.php @@ -2369,6 +2369,11 @@ div.tabBar div.titre { padding-top: 20px; } +div.tabBar.tabBarNoTop { + padding-top: 0; + border-top: 0; +} + /* tabBar used for creation/update/send forms */ div.tabBarWithBottom { padding-bottom: 18px; diff --git a/htdocs/theme/md/style.css.php b/htdocs/theme/md/style.css.php index 6f22cf2746d..aa4c6fa38fe 100644 --- a/htdocs/theme/md/style.css.php +++ b/htdocs/theme/md/style.css.php @@ -2304,6 +2304,12 @@ div.tabBar { div.tabBar div.titre { padding-top: 10px; } + +div.tabBar.tabBarNoTop { + padding-top: 0; + border-top: 0; +} + div.tabBarWithBottom { padding-bottom: 18px; border-bottom: 1px solid #aaa;