From 122ab148a4171a1992a3f5468966691cf05c788e Mon Sep 17 00:00:00 2001
From: Adarnof <adarnof@gmail.com>
Date: Thu, 8 Jun 2017 21:31:19 -0400
Subject: [PATCH] Move DataTables source to cdnjs

---
 corputils/templates/corputils/corpstats.html | 32 ++++++--------------
 corputils/templates/corputils/search.html    | 16 +++++-----
 stock/templates/bundles/datatables-css.html  |  3 ++
 stock/templates/bundles/datatables-js.html   |  4 +++
 4 files changed, 24 insertions(+), 31 deletions(-)
 create mode 100644 stock/templates/bundles/datatables-css.html
 create mode 100644 stock/templates/bundles/datatables-js.html

diff --git a/corputils/templates/corputils/corpstats.html b/corputils/templates/corputils/corpstats.html
index 6a50734c..af872a09 100644
--- a/corputils/templates/corputils/corpstats.html
+++ b/corputils/templates/corputils/corpstats.html
@@ -24,18 +24,6 @@
                 </table>
             </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="col-lg-12">
                 <div class="panel panel-default">
@@ -180,16 +168,16 @@
     {% endif %}
 {% endblock %}
 {% 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>
-    <script type="text/javascript">
-        $(document).ready(function(){
-            $('#table-mains').DataTable();
-            $('#table-members').DataTable();
-            $('#table-unregistered').DataTable();
-            $('.dropdown-toggle').dropdown();
-        });
-    </script>
+    {% include 'bundles/datatables-js.html' %}
 {% endblock %}
 {% 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-mains').DataTable();
+        $('#table-members').DataTable();
+        $('#table-unregistered').DataTable();
+
+    });
+{% endblock %}
\ No newline at end of file
diff --git a/corputils/templates/corputils/search.html b/corputils/templates/corputils/search.html
index e812705b..85d482b9 100644
--- a/corputils/templates/corputils/search.html
+++ b/corputils/templates/corputils/search.html
@@ -1,6 +1,5 @@
 {% extends "corputils/base.html" %}
 {% load i18n %}
-{% load bootstrap_pagination %}
 {% block member_data %}
     <div class="panel panel-default">
         <div class="panel-heading clearfix">
@@ -37,14 +36,13 @@
     </div>
 {% endblock %}
 {% 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>
-    <script type="text/javascript">
-        $(document).ready(function(){
-            $('#table-search').DataTable();
-            $('.dropdown-toggle').dropdown();
-        });
-    </script>
+    {% include 'bundles/datatables-js.html' %}
 {% endblock %}
 {% 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 %}
\ No newline at end of file
diff --git a/stock/templates/bundles/datatables-css.html b/stock/templates/bundles/datatables-css.html
new file mode 100644
index 00000000..5cab0bb1
--- /dev/null
+++ b/stock/templates/bundles/datatables-css.html
@@ -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 -->
\ No newline at end of file
diff --git a/stock/templates/bundles/datatables-js.html b/stock/templates/bundles/datatables-js.html
new file mode 100644
index 00000000..648fb1bb
--- /dev/null
+++ b/stock/templates/bundles/datatables-js.html
@@ -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 -->
\ No newline at end of file