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

Disable old datepicker

Browse Source
This commit is contained in:
Laurent Destailleur 2017-09-19 17:31:37 +02:00
parent 5f7631a95d
commit c38ed54990
4 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
htdocs/admin/system/perf.php
View File

@ -336,7 +336,7 @@ jQuery(document).ready(function() {
var compjsphpstring; var compjsphpstring;
getjsphpurl = $.ajax({ getjsphpurl = $.ajax({
type: "GET", type: "GET",
url: \''.DOL_URL_ROOT.'/core/js/datepicker.js.php\', url: \''.DOL_URL_ROOT.'/core/js/lib_head.js.php\',
cache: false, cache: false,
/* async: false, */ /* async: false, */
/* crossDomain: true,*/ /* crossDomain: true,*/

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

@ -5046,11 +5046,11 @@ class Form
else return 'BadValueForParameterTypeHour'; else return 'BadValueForParameterTypeHour';
if ($typehour!='text') $retstring.=' '.$langs->trans('HourShort'); if ($typehour!='text') $retstring.=' '.$langs->trans('HourShort');
else $retstring.=':'; else $retstring.='<span class="hideonsmartphone">:</span>';
// Minutes // Minutes
if ($minunderhours) $retstring.='<br>'; if ($minunderhours) $retstring.='<br>';
else $retstring.="&nbsp;"; else $retstring.='<span class="hideonsmartphone">&nbsp;</span>';
if ($typehour=='select' || $typehour=='textselect') if ($typehour=='select' || $typehour=='textselect')
{ {

4
htdocs/core/lib/project.lib.php
View File

@ -738,7 +738,7 @@ function projectLinesPerDay(&$inc, $parent, $fuser, $lines, &$level, &$projectsr
elseif (! $isavailable[$preselectedday]['afternoon']) $cssonholiday.='onholidayafternoon '; elseif (! $isavailable[$preselectedday]['afternoon']) $cssonholiday.='onholidayafternoon ';
// Duration // Duration
print '<td align="right" class="duration'.($cssonholiday?' '.$cssonholiday:'').'">'; print '<td align="center" class="duration'.($cssonholiday?' '.$cssonholiday:'').'">';
$dayWorkLoad = $projectstatic->weekWorkLoadPerTask[$preselectedday][$lines[$i]->id]; $dayWorkLoad = $projectstatic->weekWorkLoadPerTask[$preselectedday][$lines[$i]->id];
$alreadyspent=''; $alreadyspent='';
@ -748,7 +748,7 @@ function projectLinesPerDay(&$inc, $parent, $fuser, $lines, &$level, &$projectsr
$tableCell=''; $tableCell='';
$tableCell.='<span class="timesheetalreadyrecorded"><input type="text" class="center" size="2" disabled id="timespent['.$inc.']['.$idw.']" name="task['.$lines[$i]->id.']['.$idw.']" value="'.$alreadyspent.'"></span>'; $tableCell.='<span class="timesheetalreadyrecorded"><input type="text" class="center" size="2" disabled id="timespent['.$inc.']['.$idw.']" name="task['.$lines[$i]->id.']['.$idw.']" value="'.$alreadyspent.'"></span>';
$tableCell.=' + '; $tableCell.='<span class="hideonsmartphone"> + </span>';
//$tableCell.='&nbsp;&nbsp;&nbsp;'; //$tableCell.='&nbsp;&nbsp;&nbsp;';
$tableCell.=$form->select_duration($lines[$i]->id.'duration','',$disabledtask,'text',0,1); $tableCell.=$form->select_duration($lines[$i]->id.'duration','',$disabledtask,'text',0,1);
//$tableCell.='&nbsp;<input type="submit" class="button"'.($disabledtask?' disabled':'').' value="'.$langs->trans("Add").'">'; //$tableCell.='&nbsp;<input type="submit" class="button"'.($disabledtask?' disabled':'').' value="'.$langs->trans("Add").'">';

4
htdocs/main.inc.php
View File

@ -1322,10 +1322,10 @@ function top_htmlhead($head, $title='', $disablejs=0, $disablehead=0, $arrayofjs
print '<script type="text/javascript" src="'.DOL_URL_ROOT.'/core/js/lib_head.js.php'.($ext?'?'.$ext:'').'"></script>'."\n"; print '<script type="text/javascript" src="'.DOL_URL_ROOT.'/core/js/lib_head.js.php'.($ext?'?'.$ext:'').'"></script>'."\n";
// Add datepicker default options // Add datepicker default options
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'))