diff --git a/htdocs/lib/datepicker.php b/htdocs/lib/datepicker.php
index e2cb67f9226fa0bd75506dd458a2174055de3c35..3931809454e76b7d256f73ad6f34700d6aed8271 100644
--- a/htdocs/lib/datepicker.php
+++ b/htdocs/lib/datepicker.php
@@ -44,7 +44,12 @@ if (isset($_GET["mode"]) && $_GET["mode"] == 'test')
{
print '<html><head>';
print '<script language="javascript" type="text/javascript" src="'.DOL_URL_ROOT.'/lib/lib_head.js"></script>'."\n";
- print '</head>';
+ print '</head><body>'."\n";
+}
+else
+{
+ //print '<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">'."\n";
+ print '<html><head></head><body>'."\n";
}
@@ -76,6 +81,9 @@ else
}
+print '</body></html>'."\n";
+
+
function xyzToUnixTimestamp($mysqldate){
$year=substr($mysqldate,0,4);
$month=substr($mysqldate,4,2);
@@ -103,9 +111,9 @@ function displayBox($selectedDate,$month,$year){
$xyz=0;
}
?>
-<table class="dp" cellspacing="0" cellpadding="0" border=0>
+<table class="dp" cellspacing="0" cellpadding="0" border="0">
<tr>
- <td colspan=6 class="dpHead">
+ <td colspan="6" class="dpHead">
<?php
$selectMonth = dolibarr_date("F", $thedate);
$selectYear = dolibarr_date("Y", $thedate);
@@ -117,7 +125,7 @@ function displayBox($selectedDate,$month,$year){
<tr>
<td class="dpButtons" onClick="loadMonth('<?php echo $dolibarr_main_url_root.'/lib/' ?>','<?php echo $month?>','<?php echo $year-1?>','<?php echo $xyz ?>')"><<</td>
<td class="dpButtons" onClick="loadMonth('<?php echo $dolibarr_main_url_root.'/lib/' ?>','<?php if($month==1) echo "12"; else echo $month-1?>','<?php if($month==1) echo $year-1; else echo $year?>','<?php echo $xyz ?>')"><</td>
- <td colspan=3 class="dpButtons" onClick="loadMonth('<?php echo $dolibarr_main_url_root.'/lib/' ?>','<?php echo dolibarr_date('m',$today)?>','<?php echo $todayArray["year"]?>','<?php echo $xyz ?>')"><?php echo $langs->trans("Today") ?></td>
+ <td colspan="3" class="dpButtons" onClick="loadMonth('<?php echo $dolibarr_main_url_root.'/lib/' ?>','<?php echo dolibarr_date('m',$today)?>','<?php echo $todayArray["year"]?>','<?php echo $xyz ?>')"><?php echo $langs->trans("Today") ?></td>
<td class="dpButtons" onClick="loadMonth('<?php echo $dolibarr_main_url_root.'/lib/' ?>','<?php if($month==12) echo "1"; else echo $month+1?>','<?php if($month==12) echo $year+1; else echo $year;?>','<?php echo $xyz ?>')">></td>
<td class="dpButtons" onClick="loadMonth('<?php echo $dolibarr_main_url_root.'/lib/' ?>','<?php echo $month?>','<?php echo $year+1?>','<?php echo $xyz ?>')">>></td>
</tr>
@@ -134,23 +142,6 @@ function displayBox($selectedDate,$month,$year){
//print "x ".$thedate." y";
$firstdate=dolibarr_getdate($thedate);
$mydate=$firstdate;
- $tradTemp=Array($langs->trans("January"),
- $langs->trans("February"),
- $langs->trans("March"),
- $langs->trans("April"),
- $langs->trans("May"),
- $langs->trans("June"),
- $langs->trans("July"),
- $langs->trans("August"),
- $langs->trans("September"),
- $langs->trans("October"),
- $langs->trans("November"),
- $langs->trans("December")
- );
-
- print '<script language="Javascript">';
- print 'var tradMonths = '.php2js($tradTemp);
- print '</script>';
// Loop on each day of month
$day=1;
diff --git a/htdocs/lib/lib_head.js b/htdocs/lib/lib_head.js
index b4b6da288d2b9ec7bb0789ef547ef9fd086a719e..550b34a568875acd108f4d2e554c97c0704435f8 100644
--- a/htdocs/lib/lib_head.js
+++ b/htdocs/lib/lib_head.js
@@ -146,7 +146,8 @@ function loadMonth(base,month,year,ymd)
theURL+="&sd="+ymd;
}
- loadXMLDoc(theURL,alertContents,false);
+// loadXMLDoc(theURL,alertContents,false); Cree erreur javascript avec IE
+ loadXMLDoc(theURL,null,false);
showDP.box.innerHTML=req.responseText;
}
diff --git a/htdocs/main.inc.php b/htdocs/main.inc.php
index 8745b256b0444c9ddf635eb0ef5309ada8e6fa47..fed3d68550f6906e03f365876110fcfbf6459553 100644
--- a/htdocs/main.inc.php
+++ b/htdocs/main.inc.php
@@ -757,6 +757,23 @@ function top_htmlhead($head, $title='', $disablejs=0, $disablehead=0)
print '<script language="javascript" type="text/javascript" src="'.DOL_URL_ROOT.'/includes/scriptaculous/src/window/tooltip.js"></script>'."\n";
}
+ // Define tradMonths javascript array
+ $tradTemp=Array($langs->trans("January"),
+ $langs->trans("February"),
+ $langs->trans("March"),
+ $langs->trans("April"),
+ $langs->trans("May"),
+ $langs->trans("June"),
+ $langs->trans("July"),
+ $langs->trans("August"),
+ $langs->trans("September"),
+ $langs->trans("October"),
+ $langs->trans("November"),
+ $langs->trans("December")
+ );
+ print '<script language="javascript" type="text/javascript">';
+ print 'var tradMonths = '.php2js($tradTemp).';';
+ print '</script>'."\n";
print "</head>\n";
}