From 8b15d24b61a76f42c31ae7dbe3bb1942376be075 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Sat, 3 Dec 2005 20:53:18 +0000 Subject: [PATCH] =?UTF-8?q?Modif=20pour=20mieux=20g=E9rer=20l'activation?= =?UTF-8?q?=20ou=20d=E9sactivation=20de=20code=20javascript.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- htdocs/main.inc.php | 22 +++++++++++++++++----- 1 file changed, 17 insertions(+), 5 deletions(-) diff --git a/htdocs/main.inc.php b/htdocs/main.inc.php index 26ab85940ff..d6689c1612a 100644 --- a/htdocs/main.inc.php +++ b/htdocs/main.inc.php @@ -304,7 +304,7 @@ function top_htmlhead($head, $title="", $target="") if ($conf->use_javascript) { - print ''; + print ''; } print "\n"; @@ -322,7 +322,7 @@ function top_menu($head, $title="", $target="") top_htmlhead($head, $title, $target); - print ''; + print '
'; /* * Si la constante MAIN_NEED_UPDATE est définie (par le script de migration sql en général), c'est que @@ -366,7 +366,10 @@ function top_menu($head, $title="", $target="") print 'atarget?(' target="'.$menutop->atarget.'"'):''; print '>'; - print ''; + print ''.$langs->trans('; + print ''; } print "\n"; @@ -513,7 +516,7 @@ function printSearchForm($urlaction,$urlobject,$title,$htmlmodesearch='search',$ function llxFooter($foot='') { - global $dolibarr_auto_user, $micro_start_time; + global $conf, $dolibarr_auto_user, $micro_start_time; print "\n\n".''."\n"; print "\n\n".''; @@ -523,7 +526,16 @@ function llxFooter($foot='') print ''; print "\n"; } + + if ($conf->use_javascript) + { + print ''; + } + + // Juste pour éviter bug IE qui réorganise mal div précédents si celui-ci absent + print "\n".'
nbsp;
'."\n"; - print "\n\n"; + print "\n"; + print "\n"; } ?>