diff --git a/htdocs/main.inc.php b/htdocs/main.inc.php index 7a35d96a424..88e418f2f09 100644 --- a/htdocs/main.inc.php +++ b/htdocs/main.inc.php @@ -737,14 +737,6 @@ function top_htmlhead($head, $title='', $disablejs=0, $disablehead=0, $arrayofjs } } - // Definition en alternate style sheet des feuilles de styles les plus maintenues - // Les navigateurs qui supportent sont rares. Plus aucun connu. - /* - print ''."\n"; - print ''."\n"; - print ''."\n"; - */ - if (empty($conf->global->MAIN_OPTIMIZEFORTEXTBROWSER)) print ''."\n"; if (empty($conf->global->MAIN_OPTIMIZEFORTEXTBROWSER)) print ''."\n"; if (empty($conf->global->MAIN_OPTIMIZEFORTEXTBROWSER)) print ''."\n"; @@ -837,24 +829,6 @@ function top_menu($head, $title='', $target='') print '
'; - /* - * Si la constante MAIN_NEED_UPDATE est definie (par le script de migration sql en general), c'est que - * les donnees ont besoin d'un remaniement. Il faut passer le update.php - */ - if (! empty($conf->global->MAIN_NEED_UPDATE)) - { - $langs->load("admin"); - print '
'."\n"; - print ''; - print ''; - print "
'; - print $langs->trans("UpdateRequired",DOL_URL_ROOT.'/install/index.php'); - print '
"; - llxFooter(); - exit; - } - - /* * Top menu */ @@ -873,12 +847,12 @@ function top_menu($head, $title='', $target='') // Affiche le menu $menutop->showmenu(); - // Lien sur fiche du login + // Link to login card print 'atarget?(' target="'.$menutop->atarget.'"'):''; print '>'.$user->login.''; - // Lien info + // Link info $htmltext=''; $text=''; if ($_SESSION["dol_authmode"] != 'forceuser' && $_SESSION["dol_authmode"] != 'http') @@ -915,12 +889,18 @@ function top_menu($head, $title='', $target='') $htmltext.='
'.$langs->trans("CurrentUserLanguage").': '.$langs->getDefaultLang(); if (! empty($_SESSION["disablemodules"])) $htmltext.='
'.$langs->trans("DisabledModules").':
'.join('
',split(',',$_SESSION["disablemodules"])); - $html=new Form($db); - print $html->textwithtooltip('',$htmltext,2,1,$text); - // print ''.$title.''; + $html=new Form($db); + print $html->textwithtooltip('',$htmltext,2,1,$text); + + // Link to print + $text =''; + $text.='trans("Print").'" title="">'; + $text.=''; + //print $text; print "\n
\n\n"; }