default timepicker to 15 min steps. abbr -> span

This commit is contained in:
Mario Vavti 2015-11-26 21:00:04 +01:00
parent 55d00243fb
commit 5cb71fa5da
2 changed files with 4 additions and 4 deletions

View File

@ -235,7 +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 . '"'),
));
$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>";
return $o;
}

View File

@ -71,7 +71,7 @@
switch(view.name){
case "month":
element.find(".fc-title").html(
"<img src='{0}' style='height:12px;width:12px;' title='{1}'>&nbsp;<abbr title='{3}\r\n\r\n{4}'>{2}</abbr>".format(
"<img src='{0}' style='height:12px;width:12px;' title='{1}'>&nbsp;<span title='{3}\r\n\r\n{4}'>{2}</span>".format(
event.item['author']['xchan_photo_s'],
event.item['author']['xchan_name'],
event.title,
@ -81,7 +81,7 @@
break;
case "agendaWeek":
element.find(".fc-title").html(
"<img src='{0}' style='height:12px;width:12px;'>&nbsp;{1}: <abbr title='{3}\r\n\r\n{4}'>{2}</abbr>".format(
"<img src='{0}' style='height:12px;width:12px;'>&nbsp;{1}: <span title='{3}\r\n\r\n{4}'>{2}</span>".format(
event.item['author']['xchan_photo_s'],
event.item['author']['xchan_name'],
event.title,
@ -91,7 +91,7 @@
break;
case "agendaDay":
element.find(".fc-title").html(
"<img src='{0}' style='height:12px;width:12px;'>&nbsp;{1}: <abbr title='{3}\r\n\r\n{4}'>{2}</abbr>".format(
"<img src='{0}' style='height:12px;width:12px;'>&nbsp;{1}: <span title='{3}\r\n\r\n{4}'>{2}</span>".format(
event.item['author']['xchan_photo_s'],
event.item['author']['xchan_name'],
event.title,