Merge pull request #289 from orbitroom/master

Changed timer to use 24 hour format / Fixed datetime picker bug on update.
This commit is contained in:
Mr McClain 2016-02-25 01:19:40 -06:00
commit 3b7d361595
2 changed files with 4 additions and 4 deletions

View File

@ -42,9 +42,9 @@
<a href="http://evemaps.dotlan.net/system/{{ ops.system }}">{{ ops.system }}</a>
</td>
<td style="width:150px" class="text-center">{{ ops.location }}</td>
<td style="width:150px" class="text-center">{{ ops.start }}</td>
<td style="width:150px" class="text-center">{{ ops.duration }}</td>
<td style="width:150px" class="text-center">{{ ops.fc }}</td>
<td style="width:150px" class="text-center" nowrap>{{ ops.start | date:"Y-m-d H:i" }}</td>
<td style="width:150px" class="text-center">{{ ops.duration }}</td>
<td style="width:150px" class="text-center">{{ ops.fc }}</td>
<td style="width:150px" class="text-center">{{ ops.details }}</td>
<td style="width:150px" class="text-center">{{ ops.post_time}}</td>
{% if perms.auth.optimer_management %}

View File

@ -37,7 +37,7 @@
{% block extra_script %}
$('#id_fleet_time').datetimepicker({
$('#id_start').datetimepicker({
maskInput: true,
format: 'Y-m-d H:i',minDate:0
});