Mathis/allianceauth
1
0
Fork 0
mirror of https://gitlab.com/allianceauth/allianceauth.git synced 2025-07-15 15:30:16 +02:00
Code Issues Packages Projects Releases Wiki Activity

Move DataTables source to cdnjs

Browse Source
This commit is contained in:
Adarnof 2017-06-08 21:31:19 -04:00
parent 0deb60ac2c
commit 122ab148a4
4 changed files with 24 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
corputils/templates/corputils/corpstats.html
View File

@ -24,18 +24,6 @@
</table> </table>
</div> </div>
</div> </div>
<div class="row">
<div class="col-lg-12">
<b>{% trans "Registration Index" %}</b>
<div class="progress">
<div class="progress-bar" role="progressbar" aria-valuenow="{{ corpstats.registered_member_count }}"
aria-valuemin="0" aria-valuemax="{{ corpstats.member_count }}"
style="width: {% widthratio corpstats.registered_member_count corpstats.member_count 100 %}%;">
{{ corpstats.registered_member_count }}/{{ corpstats.member_count }}
</div>
</div>
</div>
</div>
<div class="row"> <div class="row">
<div class="col-lg-12"> <div class="col-lg-12">
<div class="panel panel-default"> <div class="panel panel-default">
@ -180,16 +168,16 @@
{% endif %} {% endif %}
{% endblock %} {% endblock %}
{% block extra_javascript %} {% block extra_javascript %}
<script type="text/javascript" src="https://cdn.datatables.net/v/bs-3.3.7/dt-1.10.15/r-2.1.1/rg-1.0.0/datatables.min.js"></script> {% include 'bundles/datatables-js.html' %}
<script type="text/javascript">
$(document).ready(function(){
$('#table-mains').DataTable();
$('#table-members').DataTable();
$('#table-unregistered').DataTable();
$('.dropdown-toggle').dropdown();
});
</script>
{% endblock %} {% endblock %}
{% block extra_css %} {% block extra_css %}
<link rel="stylesheet" type="text/css" href="https://cdn.datatables.net/v/bs-3.3.7/dt-1.10.15/r-2.1.1/rg-1.0.0/datatables.min.css"/> {% include 'bundles/datatables-css.html' %}
{% endblock %} {% endblock %}
{% block extra_script %}
$(document).ready(function(){
$('#table-mains').DataTable();
$('#table-members').DataTable();
$('#table-unregistered').DataTable();
});
{% endblock %}

16
corputils/templates/corputils/search.html
View File

@ -1,6 +1,5 @@
{% extends "corputils/base.html" %} {% extends "corputils/base.html" %}
{% load i18n %} {% load i18n %}
{% load bootstrap_pagination %}
{% block member_data %} {% block member_data %}
<div class="panel panel-default"> <div class="panel panel-default">
<div class="panel-heading clearfix"> <div class="panel-heading clearfix">
@ -37,14 +36,13 @@
</div> </div>
{% endblock %} {% endblock %}
{% block extra_javascript %} {% block extra_javascript %}
<script type="text/javascript" src="https://cdn.datatables.net/v/bs-3.3.7/dt-1.10.15/r-2.1.1/rg-1.0.0/datatables.min.js"></script> {% include 'bundles/datatables-js.html' %}
<script type="text/javascript">
$(document).ready(function(){
$('#table-search').DataTable();
$('.dropdown-toggle').dropdown();
});
</script>
{% endblock %} {% endblock %}
{% block extra_css %} {% block extra_css %}
<link rel="stylesheet" type="text/css" href="https://cdn.datatables.net/v/bs-3.3.7/dt-1.10.15/r-2.1.1/rg-1.0.0/datatables.min.css"/> {% include 'bundles/datatables-css.html' %}
{% endblock %}
{% block extra_script %}
$(document).ready(function(){
$('#table-search').DataTable();
});
{% endblock %} {% endblock %}

3
stock/templates/bundles/datatables-css.html Normal file
View File

@ -0,0 +1,3 @@
<!-- Start DataTables-css -->
<link rel="stylesheet" type="text/css" href="https://cdnjs.cloudflare.com/ajax/libs/datatables/1.10.15/css/dataTables.bootstrap.min.css"/>
<!-- End DataTables-css -->

4
stock/templates/bundles/datatables-js.html Normal file
View File

@ -0,0 +1,4 @@
<!-- Start DataTables-js -->
<script type="text/javascript" src="https://cdnjs.cloudflare.com/ajax/libs/datatables/1.10.15/js/jquery.dataTables.min.js"></script>
<script type="text/javascript" src="https://cdnjs.cloudflare.com/ajax/libs/datatables/1.10.15/js/dataTables.bootstrap.min.js"></script>
<!-- End DataTables-js -->