";
print ' ';
diff --git a/htdocs/html.form.class.php b/htdocs/html.form.class.php
index 73e7bf1ac80..61e27fed171 100644
--- a/htdocs/html.form.class.php
+++ b/htdocs/html.form.class.php
@@ -1623,27 +1623,42 @@ class Form
*/
if ($conf->use_javascript && $conf->use_popup_calendar && $h==0 && $m==0)
{
-
- if ($langs->defaultlang != "")
- {
- print '';
+ // Calendrier popup version eldy
+ if ("$conf->use_popup_calendar" == "eldy") // Laissé conf->use_popup_calendar entre quote
+ {
+ //print "e".$conf->format_date_short;
+ $timearray=getDate($set_time);
+ $formated_date=dolibarr_print_date($set_time,$conf->format_date_short);
+ print ' ';
+ print '';
+ print ''."\n";
+ print ''."\n";
+ print ''."\n";
}
- print '';
- //$timearray=getDate($set_time);
- // print ' '.$timearray['mon'];
- $formated_date=dolibarr_print_date($set_time,$conf->format_date_short);
- if($formated_date=="?") $formated_date="";
- print ' ';
- print ''."\n";
- print ''."\n";
- print ''."\n";
- if($form_name =="")
- print ''.img_cal().'';
else
- print ''.img_cal().'';
-
+ {
+ // Calendrier popup version defaut
+ if ($langs->defaultlang != "")
+ {
+ print '';
+ }
+ print '';
+ $formated_date=dolibarr_print_date($set_time,$conf->format_date_short);
+ if($formated_date=="?") $formated_date="";
+ print ' ';
+ print ''."\n";
+ print ''."\n";
+ print ''."\n";
+ if($form_name =="")
+ print ''.img_cal().'';
+ else
+ print ''.img_cal().'';
+ }
}
/*
diff --git a/htdocs/lib/datepicker.php b/htdocs/lib/datepicker.php
new file mode 100644
index 00000000000..2c1bb2ba785
--- /dev/null
+++ b/htdocs/lib/datepicker.php
@@ -0,0 +1,139 @@
+
+ * This file is a modified version of datepicker.php from phpBSM
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ *
+ * $Id$
+ * $Source$
+ */
+
+/**
+ \file htdocs/lib/datepicker.php
+ \brief Fichier de gestion de la popup de selection de date eldy
+ \version $Revision$
+*/
+
+require_once("../conf/conf.php");
+require_once("../master.inc.php");
+$langs->trans("main");
+
+if(!isset($_GET["cm"])) $_GET["cm"]="shw";
+if(!isset($_GET["sd"])) $_GET["sd"]="00000000";
+
+switch($_GET["cm"])
+{
+ case "shw":
+ displayBox($_GET["sd"],$_GET["m"],$_GET["y"]);
+ break;
+}
+
+
+
+function xyzToUnixTimestamp($mysqldate){
+ $year=substr($mysqldate,0,4);
+ $month=substr($mysqldate,4,2);
+ $day=substr($mysqldate,6,2);
+ $unixtimestamp=mktime(0,0,0,$month,$day,$year);
+ return $unixtimestamp;
+}
+
+function displayBox($selectedDate,$month,$year){
+ global $dolibarr_main_url_root,$langs;
+ $langs->load("main");
+
+ //print "$selectedDate,$month,$year";
+ $thedate=mktime(0,0,0,$month,1,$year);
+ $today=mktime(0,0,0);
+ $todayArray=getdate($today);
+ if($selectedDate != "00000000")
+ {
+ $selDate=xyzToUnixTimestamp($selectedDate);
+ $xyz=date("Ymd",$selDate);
+ }
+ else
+ {
+ $selDate=0;
+ $xyz=0;
+ }
+?>
+
+
+
+
+
+
+
<<
+
','','')"><
+
','')">trans("Today") ?>
+
','','')">>
+
>>
+
+
+
S
+
M
+
T
+
W
+
R
+
F
+
S
+
+ ";
+ if($firstdate==$mydate){
+ // firstdate, so we may have to put in blanks
+ echo "
";
+ for($i=0;$i<$mydate["wday"];$i++)
+ echo "
";
+ }
+
+ $dayclass="dpReg";
+ if($thedate==$selDate) $dayclass="dpSelected";
+ elseif($thedate==$today) $dayclass="dpToday";
+
+ // Sur click dans calendrier, appelle fonction dpClickDay
+ echo "