From 4b3939c4def71631ec8a27750e6545d695582984 Mon Sep 17 00:00:00 2001
From: Garret Wassermann <gwasser@gmail.com>
Date: Fri, 21 Dec 2018 17:07:09 -0500
Subject: [PATCH] Update base templates for Bootstrap 4.2.1 via CDN

---
 helpdesk/templates/helpdesk/base.html        | 14 +++++++-------
 helpdesk/templates/helpdesk/public_base.html | 11 +++++++----
 2 files changed, 14 insertions(+), 11 deletions(-)

diff --git a/helpdesk/templates/helpdesk/base.html b/helpdesk/templates/helpdesk/base.html
index 5af2f68a..7342d08f 100644
--- a/helpdesk/templates/helpdesk/base.html
+++ b/helpdesk/templates/helpdesk/base.html
@@ -19,13 +19,16 @@
 
     <!-- Bootstrap Core CSS -->
     {% if helpdesk_settings.HELPDESK_USE_CDN %}
-    <link href="https://maxcdn.bootstrapcdn.com/bootstrap/3.3.7/css/bootstrap.min.css" rel="stylesheet">
+    <link href="https://stackpath.bootstrapcdn.com/bootstrap/4.2.1/css/bootstrap.min.css" rel="stylesheet">
     {% else %}
     <link href="{% static 'helpdesk/vendor/bootstrap/css/bootstrap.min.css' %}" rel="stylesheet">
     {% endif %}
     
     <!-- Font Awesome -->
     <link href="{% static 'helpdesk/vendor/fontawesome-free/css/all.min.css' %}" rel="stylesheet" type="text/css">
+    
+    <!-- DataTables CSS-->
+    <link href="{% static 'helpdesk/vendor/datatables/css/dataTables.bootstrap4.css' %}" rel="stylesheet">
 
     <!-- MetisMenu CSS -->
     <link href="{% static 'helpdesk/vendor/metisMenu/metisMenu.min.css' %}" rel="stylesheet">
@@ -37,9 +40,6 @@
     <link href="{% static 'helpdesk/vendor/morrisjs/morris.css' %}" rel="stylesheet">
     {% endif %}
 
-    <!-- DataTables CSS-->
-    <link href="{% static 'helpdesk/vendor/datatables/dataTables.bootstrap4.css' %}" rel="stylesheet">
-
     <!-- Custom CSS -->
     <link href="{% static 'helpdesk/css/sb-admin.css' %}" rel="stylesheet">
     <link rel='stylesheet' href='{% static "helpdesk/helpdesk-extend.css" %}' type='text/css'  media="screen" >
@@ -110,7 +110,7 @@
     <!-- jQuery and Bootstrap Core -->
     {% if helpdesk_settings.HELPDESK_USE_CDN %}
     <script src="//ajax.googleapis.com/ajax/libs/jquery/1.9.0/jquery.min.js"></script>
-    <script src="https://maxcdn.bootstrapcdn.com/bootstrap/3.3.7/js/bootstrap.min.js"></script>
+    <script src="https://stackpath.bootstrapcdn.com/bootstrap/4.2.1/js/bootstrap.min.js"></script>
     {% else %}
     <script src="{% static 'helpdesk/vendor/jquery/jquery.min.js' %}"></script>
     <script src="{% static 'helpdesk/vendor/bootstrap/js/bootstrap.bundle.min.js' %}"></script>
@@ -121,8 +121,8 @@
     
     <!-- Page level plugin JavaScript-->
     <script src="{% static 'helpdesk/vendor/chart.js/Chart.min.js' %}"></script>
-    <script src="{% static 'helpdesk/vendor/datatables/jquery.dataTables.js' %}"></script>
-    <script src="{% static 'helpdesk/vendor/datatables/dataTables.bootstrap4.js' %}"></script>
+    <script src="{% static 'helpdesk/vendor/datatables/js/jquery.dataTables.js' %}"></script>
+    <script src="{% static 'helpdesk/vendor/datatables/js/dataTables.bootstrap4.js' %}"></script>
 
     <!-- jQuery UI DatePicker -->
     <script src='{% static "helpdesk/vendor/jquery-ui/jquery-ui.min.js" %}' type='text/javascript' language='javascript'></script>
diff --git a/helpdesk/templates/helpdesk/public_base.html b/helpdesk/templates/helpdesk/public_base.html
index 09b9b8c4..24a2157f 100644
--- a/helpdesk/templates/helpdesk/public_base.html
+++ b/helpdesk/templates/helpdesk/public_base.html
@@ -17,13 +17,16 @@
 
     <!-- Bootstrap Core CSS -->
     {% if helpdesk_settings.HELPDESK_USE_CDN %}
-    <link href="https://maxcdn.bootstrapcdn.com/bootstrap/3.3.7/css/bootstrap.min.css" rel="stylesheet">
+    <link href="https://stackpath.bootstrapcdn.com/bootstrap/4.2.1/css/bootstrap.min.css" rel="stylesheet">
     {% else %}
     <link href="{% static 'helpdesk/vendor/bootstrap/css/bootstrap.min.css' %}" rel="stylesheet">
     {% endif %}
     
     <!-- Font Awesome -->
     <link href="{% static 'helpdesk/vendor/fontawesome-free/css/all.min.css' %}" rel="stylesheet" type="text/css">
+    
+    <!-- DataTables CSS-->
+    <link href="{% static 'helpdesk/vendor/datatables/css/dataTables.bootstrap4.css' %}" rel="stylesheet">
 
     <!-- MetisMenu CSS -->
     <link href="{% static 'helpdesk/vendor/metisMenu/metisMenu.min.css' %}" rel="stylesheet">
@@ -76,7 +79,7 @@
     <!-- jQuery and Bootstrap Core -->
     {% if helpdesk_settings.HELPDESK_USE_CDN %}
     <script src="//ajax.googleapis.com/ajax/libs/jquery/1.9.0/jquery.min.js"></script>
-    <script src="https://maxcdn.bootstrapcdn.com/bootstrap/3.3.7/js/bootstrap.min.js"></script>
+    <script src="https://stackpath.bootstrapcdn.com/bootstrap/4.2.1/js/bootstrap.min.js"></script>
     {% else %}
     <script src="{% static 'helpdesk/vendor/jquery/jquery.min.js' %}"></script>
     <script src="{% static 'helpdesk/vendor/bootstrap/js/bootstrap.bundle.min.js' %}"></script>
@@ -87,8 +90,8 @@
     
     <!-- Page level plugin JavaScript-->
     <script src="{% static 'helpdesk/vendor/chart.js/Chart.min.js' %}"></script>
-    <script src="{% static 'helpdesk/vendor/datatables/jquery.dataTables.js' %}"></script>
-    <script src="{% static 'helpdesk/vendor/datatables/dataTables.bootstrap4.js' %}"></script>
+    <script src="{% static 'helpdesk/vendor/datatables/js/jquery.dataTables.js' %}"></script>
+    <script src="{% static 'helpdesk/vendor/datatables/js/dataTables.bootstrap4.js' %}"></script>
 
     <!-- jQuery UI DatePicker -->
     <script src='{% static "helpdesk/vendor/jquery-ui/jquery-ui.min.js" %}' type='text/javascript' language='javascript'></script>