lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #7603 from hregis/develop_bug5

Browse Source 
Fix: force jquery cal if MAIN_POPUP_CALENDAR=eldy (showDP commented)
This commit is contained in:
Laurent Destailleur 2017-10-11 11:48:46 +02:00 committed by GitHub
commit eb995bb7ad
3 changed files with 54 additions and 53 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
htdocs/core/class/html.form.class.php
View File

@ -4750,7 +4750,9 @@ class Form
// You can set MAIN_POPUP_CALENDAR to 'eldy' or 'jquery' // You can set MAIN_POPUP_CALENDAR to 'eldy' or 'jquery'
$usecalendar='combo'; $usecalendar='combo';
if (! empty($conf->use_javascript_ajax) && (empty($conf->global->MAIN_POPUP_CALENDAR) || $conf->global->MAIN_POPUP_CALENDAR != "none")) $usecalendar=empty($conf->global->MAIN_POPUP_CALENDAR)?'jquery':$conf->global->MAIN_POPUP_CALENDAR; if (! empty($conf->use_javascript_ajax) && (empty($conf->global->MAIN_POPUP_CALENDAR) || $conf->global->MAIN_POPUP_CALENDAR != "none")) {
$usecalendar = ((empty($conf->global->MAIN_POPUP_CALENDAR) || $conf->global->MAIN_POPUP_CALENDAR == 'eldy')?'jquery':$conf->global->MAIN_POPUP_CALENDAR);
}
//if (! empty($conf->browser->phone)) $usecalendar='combo'; //if (! empty($conf->browser->phone)) $usecalendar='combo';
if ($d) if ($d)
@ -4795,7 +4797,6 @@ class Form
{ {
$retstring.="<script type='text/javascript'>"; $retstring.="<script type='text/javascript'>";
$retstring.="$(function(){ $('#".$prefix."').datepicker({ $retstring.="$(function(){ $('#".$prefix."').datepicker({
dateFormat: '".$langs->trans("FormatDateShortJQueryInput")."',
autoclose: true, autoclose: true,
todayHighlight: true,"; todayHighlight: true,";
if (empty($conf->global->MAIN_POPUP_CALENDAR_ON_FOCUS)) if (empty($conf->global->MAIN_POPUP_CALENDAR_ON_FOCUS))

96
htdocs/core/js/datepicker.js.php
View File

@ -45,68 +45,68 @@ else header('Cache-Control: no-cache');
// Define tradMonths javascript array (we define this in datepicker AND in parent page to avoid errors with IE8) // Define tradMonths javascript array (we define this in datepicker AND in parent page to avoid errors with IE8)
$tradMonths=array( $tradMonths=array(
dol_escape_js($langs->transnoentitiesnoconv("January")), dol_escape_js($langs->transnoentitiesnoconv("January")),
dol_escape_js($langs->transnoentitiesnoconv("February")), dol_escape_js($langs->transnoentitiesnoconv("February")),
dol_escape_js($langs->transnoentitiesnoconv("March")), dol_escape_js($langs->transnoentitiesnoconv("March")),
dol_escape_js($langs->transnoentitiesnoconv("April")), dol_escape_js($langs->transnoentitiesnoconv("April")),
dol_escape_js($langs->transnoentitiesnoconv("May")), dol_escape_js($langs->transnoentitiesnoconv("May")),
dol_escape_js($langs->transnoentitiesnoconv("June")), dol_escape_js($langs->transnoentitiesnoconv("June")),
dol_escape_js($langs->transnoentitiesnoconv("July")), dol_escape_js($langs->transnoentitiesnoconv("July")),
dol_escape_js($langs->transnoentitiesnoconv("August")), dol_escape_js($langs->transnoentitiesnoconv("August")),
dol_escape_js($langs->transnoentitiesnoconv("September")), dol_escape_js($langs->transnoentitiesnoconv("September")),
dol_escape_js($langs->transnoentitiesnoconv("October")), dol_escape_js($langs->transnoentitiesnoconv("October")),
dol_escape_js($langs->transnoentitiesnoconv("November")), dol_escape_js($langs->transnoentitiesnoconv("November")),
dol_escape_js($langs->transnoentitiesnoconv("December")) dol_escape_js($langs->transnoentitiesnoconv("December"))
); );
$tradMonthsShort=array( $tradMonthsShort=array(
$langs->trans("JanuaryMin"), $langs->trans("JanuaryMin"),
$langs->trans("FebruaryMin"), $langs->trans("FebruaryMin"),
$langs->trans("MarchMin"), $langs->trans("MarchMin"),
$langs->trans("AprilMin"), $langs->trans("AprilMin"),
$langs->trans("MayMin"), $langs->trans("MayMin"),
$langs->trans("JuneMin"), $langs->trans("JuneMin"),
$langs->trans("JulyMin"), $langs->trans("JulyMin"),
$langs->trans("AugustMin"), $langs->trans("AugustMin"),
$langs->trans("SeptemberMin"), $langs->trans("SeptemberMin"),
$langs->trans("OctoberMin"), $langs->trans("OctoberMin"),
$langs->trans("NovemberMin"), $langs->trans("NovemberMin"),
$langs->trans("DecemberMin") $langs->trans("DecemberMin")
); );
$tradDays=array( $tradDays=array(
$langs->trans("Sunday"), $langs->trans("Sunday"),
$langs->trans("Monday"), $langs->trans("Monday"),
$langs->trans("Tuesday"), $langs->trans("Tuesday"),
$langs->trans("Wednesday"), $langs->trans("Wednesday"),
$langs->trans("Thursday"), $langs->trans("Thursday"),
$langs->trans("Friday"), $langs->trans("Friday"),
$langs->trans("Saturday") $langs->trans("Saturday")
); );
$tradDaysShort=array( $tradDaysShort=array(
$langs->trans("ShortSunday"), $langs->trans("ShortSunday"),
$langs->trans("ShortMonday"), $langs->trans("ShortMonday"),
$langs->trans("ShortTuesday"), $langs->trans("ShortTuesday"),
$langs->trans("ShortWednesday"), $langs->trans("ShortWednesday"),
$langs->trans("ShortThursday"), $langs->trans("ShortThursday"),
$langs->trans("ShortFriday"), $langs->trans("ShortFriday"),
$langs->trans("ShortSaturday") $langs->trans("ShortSaturday")
); );
$tradDaysMin=array( $tradDaysMin=array(
$langs->trans("SundayMin"), $langs->trans("SundayMin"),
$langs->trans("MondayMin"), $langs->trans("MondayMin"),
$langs->trans("TuesdayMin"), $langs->trans("TuesdayMin"),
$langs->trans("WednesdayMin"), $langs->trans("WednesdayMin"),
$langs->trans("ThursdayMin"), $langs->trans("ThursdayMin"),
$langs->trans("FridayMin"), $langs->trans("FridayMin"),
$langs->trans("SaturdayMin") $langs->trans("SaturdayMin")
); );
?> ?>
// For eldy and jQuery date picker // For jQuery date picker
var tradMonths = <?php echo json_encode($tradMonths) ?>; var tradMonths = <?php echo json_encode($tradMonths) ?>;
var tradMonthsShort = <?php echo json_encode($tradMonthsShort) ?>; var tradMonthsShort = <?php echo json_encode($tradMonthsShort) ?>;
var tradDays = <?php echo json_encode($tradDays) ?>; var tradDays = <?php echo json_encode($tradDays) ?>;
@ -140,8 +140,8 @@ jQuery(function($){
dateFormat: '<?php echo $langs->trans("FormatDateShortJQuery"); ?>', dateFormat: '<?php echo $langs->trans("FormatDateShortJQuery"); ?>',
firstDay: <?php echo (isset($conf->global->MAIN_START_WEEK)?$conf->global->MAIN_START_WEEK:'1'); ?>, firstDay: <?php echo (isset($conf->global->MAIN_START_WEEK)?$conf->global->MAIN_START_WEEK:'1'); ?>,
isRTL: <?php echo ($langs->trans("DIRECTION")=='rtl'?'true':'false'); ?>, isRTL: <?php echo ($langs->trans("DIRECTION")=='rtl'?'true':'false'); ?>,
showMonthAfterYear: false, // TODO add specific to country showMonthAfterYear: false, /* TODO add specific to country */
yearSuffix: '' // TODO add specific to country yearSuffix: '' /* TODO add specific to country */
}; };
$.datepicker.setDefaults($.datepicker.regional['<?php echo $langs->defaultlang ?>']); $.datepicker.setDefaults($.datepicker.regional['<?php echo $langs->defaultlang ?>']);
}); });

6
htdocs/main.inc.php
View File

@ -1322,11 +1322,11 @@ function top_htmlhead($head, $title='', $disablejs=0, $disablehead=0, $arrayofjs
print '<!-- Includes JS of Dolibarr -->'."\n"; print '<!-- Includes JS of Dolibarr -->'."\n";
print '<script type="text/javascript" src="'.DOL_URL_ROOT.'/core/js/lib_head.js.php?lang='.$langs->defaultlang.($ext?'&amp;'.$ext:'').'"></script>'."\n"; print '<script type="text/javascript" src="'.DOL_URL_ROOT.'/core/js/lib_head.js.php?lang='.$langs->defaultlang.($ext?'&amp;'.$ext:'').'"></script>'."\n";
// Add datepicker default options // Add datepicker default options (needed by jquery datepicker!)
/*if (! defined('DISABLE_DATE_PICKER')) if (! defined('DISABLE_DATE_PICKER'))
{ {
print '<script type="text/javascript" src="'.DOL_URL_ROOT.'/core/js/datepicker.js.php?lang='.$langs->defaultlang.($ext?'&'.$ext:'').'"></script>'."\n"; print '<script type="text/javascript" src="'.DOL_URL_ROOT.'/core/js/datepicker.js.php?lang='.$langs->defaultlang.($ext?'&'.$ext:'').'"></script>'."\n";
}*/ }
// JS forced by modules (relative url starting with /) // JS forced by modules (relative url starting with /)
if (! empty($conf->modules_parts['js'])) // $conf->modules_parts['js'] is array('module'=>array('file1','file2')) if (! empty($conf->modules_parts['js'])) // $conf->modules_parts['js'] is array('module'=>array('file1','file2'))