harukin/core
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Resolving merge conflict

Browse Source
This commit is contained in:
Haakon Meland Eriksen
2015-11-29 11:55:39 +01:00
parent 8cf6b4064f
commit 4d97ea106c
9 changed files with 49 additions and 302 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
include/datetime.php
View File

@@ -235,11 +235,7 @@ function datetimesel($format, $min, $max, $default, $label, $id = 'datetimepicke
$o .= replace_macros($tpl,array(
'$field' => array($id, $label, $input_text, (($required) ? t('Required') : ''), (($required) ? '*' : ''), 'placeholder="' . $readable_format . '"'),
));
<<<<<<< HEAD
$o .= "<script>\$(function () {var picker = \$('#id_$id').datetimepicker({step:5,format:'$dateformat' $minjs $maxjs $pickers $defaultdatejs,dayOfWeekStart:$first_day}); $extra_js})</script>";
=======
$o .= "<script>\$(function () {var picker = \$('#id_$id').datetimepicker({step:15,format:'$dateformat' $minjs $maxjs $pickers $defaultdatejs,dayOfWeekStart:$first_day}); $extra_js})</script>";
>>>>>>> upstream/master
return $o;
}