Mathis/allianceauth
1
0
Fork 0
mirror of https://gitlab.com/allianceauth/allianceauth.git synced 2026-02-09 08:36:23 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge master.

Browse Source 
Fix FAT statistics generation.
This commit is contained in:
Adarnof
2017-04-07 00:21:14 -04:00
parent f0f1b21226 7d0aa2b5ec
commit 96b04a269d
23 changed files with 232 additions and 242 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
stock/templates/registered/addtimer.html
View File

@@ -7,9 +7,6 @@
{% block title %}{% trans "Alliance Auth - Structure Timer Create" %}{% endblock %}
{% block page_title %}{% trans "Timer Create" %}{% endblock page_title %}
{% block extra_css %}
{% include 'bundles/jquery-datetimepicker-css.html' %}
{% endblock extra_css %}
{% block content %}
<div class="col-lg-12">
@@ -30,17 +27,3 @@
</div>
{% endblock content %}
{% block extra_javascript %}
{% include 'bundles/jquery-datetimepicker-js.html' %}
{% endblock %}
{% block extra_script %}
$('#id_eve_time').datetimepicker({
lang: '{{ LANGUAGE_CODE }}',
maskInput: true,
format: 'Y-m-d H:i',minDate:0
});
{% endblock extra_script %}

8
stock/templates/registered/optimerupdate.html
View File

@@ -7,8 +7,10 @@
{% block title %}Alliance Auth - Update Fleet Operation {% endblock %}
{% block page_title %}{% trans "Update AAR Link" %}{% 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 %}
@@ -37,6 +39,10 @@
{% endblock content %}
{% block extra_javascript %}
{% include 'bundles/jquery-datetimepicker-js.html' %}
{% endblock %}
{% block extra_script %}
$('#id_start').datetimepicker({

7
stock/templates/registered/srpfleetadd.html
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({

11
stock/templates/registered/srpfleetrequest.html
View File

@@ -6,8 +6,6 @@
{% block title %}SRP Request{% endblock %}
{% block page_title %}{% trans "SRP Request" %}{% endblock page_title %}
{% block extra_css %}
<link href="{% static 'css/jquery.datetimepicker.css' %}" rel="stylesheet" type="text/css">{% endblock extra_css %}
{% block content %}
@@ -31,12 +29,3 @@
</div>
{% endblock content %}
{% block extra_script %}
$('#id_fleet_time').datetimepicker({
maskInput: true,
format: 'Y-m-d H:i',minDate:0
});
{% endblock extra_script %}

11
stock/templates/registered/srpfleetrequestamount.html
View File

@@ -6,8 +6,6 @@
{% block title %}Alliance Auth - Update SRP Amount{% endblock %}
{% block page_title %}{% trans "Update SRP Amount" %}{% endblock page_title %}
{% block extra_css %}
<link href="{% static 'css/jquery.datetimepicker.css' %}" rel="stylesheet" type="text/css">{% endblock extra_css %}
{% block content %}
@@ -31,12 +29,3 @@
</div>
{% endblock content %}
{% block extra_script %}
$('#id_fleet_time').datetimepicker({
maskInput: true,
format: 'Y-m-d H:i',minDate:0
});
{% endblock extra_script %}

11
stock/templates/registered/srpfleetupdate.html
View File

@@ -6,8 +6,6 @@
{% block title %}Alliance Auth - Update AAR Link{% endblock %}
{% block page_title %}{% trans "Update AAR Link" %}{% endblock page_title %}
{% block extra_css %}
<link href="{% static 'css/jquery.datetimepicker.css' %}" rel="stylesheet" type="text/css">{% endblock extra_css %}
{% block content %}
@@ -35,12 +33,3 @@
</div>
{% endblock content %}
{% block extra_script %}
$('#id_fleet_time').datetimepicker({
maskInput: true,
format: 'Y-m-d H:i',minDate:0
});
{% endblock extra_script %}

11
stock/templates/registered/timerupdate.html
View File

@@ -6,8 +6,6 @@
{% block title %}Alliance Auth - Update Structure Timer {% endblock %}
{% block page_title %}{% trans "Update AAR Link" %}{% endblock page_title %}
{% block extra_css %}
<link href="{% static 'css/jquery.datetimepicker.css' %}" rel="stylesheet" type="text/css">{% endblock extra_css %}
{% block content %}
@@ -35,12 +33,3 @@
</div>
{% endblock content %}
{% block extra_script %}
$('#id_fleet_time').datetimepicker({
maskInput: true,
format: 'Y-m-d H:i',minDate:0
});
{% endblock extra_script %}