diff --git a/htdocs/main.inc.php b/htdocs/main.inc.php index 167427a6b2b..d4e61d77b6d 100644 --- a/htdocs/main.inc.php +++ b/htdocs/main.inc.php @@ -26,7 +26,7 @@ * \file htdocs/main.inc.php * \ingroup core * \brief File that defines environment for Dolibarr pages only (variables not required by scripts) - * \version $Id: main.inc.php,v 1.750 2011/07/06 11:43:39 eldy Exp $ + * \version $Id: main.inc.php,v 1.751 2011/07/06 12:09:19 eldy Exp $ */ @ini_set('memory_limit', '64M'); // This may be useless if memory is hard limited by your PHP @@ -904,12 +904,11 @@ function top_htmlhead($head, $title='', $disablejs=0, $disablehead=0, $arrayofjs print ''."\n"; $jquerytheme = 'smoothness'; if (!empty($conf->global->MAIN_USE_JQUERY_THEME)) $jquerytheme = $conf->global->MAIN_USE_JQUERY_THEME; - print ''."\n"; // JQuery - print ''."\n"; // Tooltip - print ''."\n"; // JNotify - //print ''."\n"; // Lightbox - // jQuery fileupload - if (! empty($conf->global->MAIN_USE_JQUERY_FILEUPLOAD)) + print ''."\n"; // JQuery + print ''."\n"; // Tooltip + print ''."\n"; // JNotify + //print ''."\n"; // Lightbox + if (! empty($conf->global->MAIN_USE_JQUERY_FILEUPLOAD)) // jQuery fileupload { print ''."\n"; } @@ -1014,6 +1013,7 @@ function top_htmlhead($head, $title='', $disablejs=0, $disablehead=0, $arrayofjs } // Define tradMonths javascript array (we define this in datapicker AND in parent page to avoid errors with IE8) + print ''."\n"; + print 'var tradMonths = '.json_encode($tradMonths).';'."\n"; // Define tradMonthsMin javascript array (we define this in datapicker AND in parent page to avoid errors with IE8) $tradMonthsMin=array($langs->trans("JanuaryMin"), @@ -1045,9 +1043,7 @@ function top_htmlhead($head, $title='', $disablejs=0, $disablehead=0, $arrayofjs $langs->trans("NovemberMin"), $langs->trans("DecemberMin") ); - print ''."\n"; + print 'var tradMonthsMin = '.json_encode($tradMonthsMin).';'."\n"; // Define tradDays javascript array (we define this in datapicker AND in parent page to avoid errors with IE8) $tradDays=array($langs->trans("Monday"), @@ -1058,9 +1054,7 @@ function top_htmlhead($head, $title='', $disablejs=0, $disablehead=0, $arrayofjs $langs->trans("Saturday"), $langs->trans("Sunday") ); - print ''."\n"; + print 'var tradDays = '.json_encode($tradDays).';'."\n"; // Define tradDaysMin javascript array (we define this in datapicker AND in parent page to avoid errors with IE8) $tradDaysMin=array($langs->trans("MondayMin"), @@ -1071,8 +1065,7 @@ function top_htmlhead($head, $title='', $disablejs=0, $disablehead=0, $arrayofjs $langs->trans("SaturdayMin"), $langs->trans("SundayMin") ); - print ''."\n"; if (! empty($head)) print $head."\n";