Merge master.

Fix FAT statistics generation.
This commit is contained in:
Adarnof
2017-04-07 00:21:14 -04:00
23 changed files with 232 additions and 242 deletions

View File

@@ -7,7 +7,8 @@
{% block page_title %}{% trans "SRP Fleet Create" %}{% endblock page_title %}
{% block extra_css %}
<link href="{% static 'css/jquery.datetimepicker.css' %}" rel="stylesheet" type="text/css">{% endblock extra_css %}
{% include 'bundles/jquery-datetimepicker-css.html' %}
{% endblock extra_css %}
{% block content %}
@@ -40,6 +41,10 @@
{% endblock content %}
{% block extra_javascript %}
{% include 'bundles/jquery-datetimepicker-js.html' %}
{% endblock %}
{% block extra_script %}
$('#id_fleet_time').datetimepicker({