From: Tom Hughes <tom@compton.nu>
Date: Fri, 3 Jul 2020 21:30:17 +0000 (+0100)
Subject: Load jQuery from cdnjs
X-Git-Tag: live~4
X-Git-Url: https://git.openstreetmap.org/osqa.git/commitdiff_plain/577d5301bc90f71afdcd82ca62bd711351dbfa73?hp=98a02b22ef42fe3a91b15baabb25889725b13a9e

Load jQuery from cdnjs
---

diff --git a/forum/skins/default/templates/base_content.html b/forum/skins/default/templates/base_content.html
index e1e5065..78e276d 100644
--- a/forum/skins/default/templates/base_content.html
+++ b/forum/skins/default/templates/base_content.html
@@ -16,7 +16,7 @@
         {% if settings.USE_CUSTOM_CSS|or_preview:request %}
         <link href="{% url "custom_css" %}" rel="stylesheet" type="text/css" />
         {% endif %}
-        <link rel="stylesheet" type="text/css" href="https://ajax.googleapis.com/ajax/libs/jqueryui/1/themes/base/jquery-ui.css" />
+        <link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/jqueryui/1.8.24/themes/base/jquery-ui.min.css" integrity="sha512-Lzjd1ELD6YCIwIU5uaJldvbibV5Fi7HThNZjrwJHALBJRT6q2a6ndgi8TNgcKcUqGsH6bpT7xyTEi8qRzN1ASg==" crossorigin="anonymous" />
         <!--[if IE 6]>
         <style type="text/css">
         img, div, a { behavior: url({% media "/media/iepngfix/iepngfix.htc" %}) }
@@ -24,12 +24,10 @@
         <![endif]-->
         {% block forestyle %}{% endblock %}
 
-        <script src="https://www.google.com/jsapi" type="text/javascript"></script>
+        <script src="https://cdnjs.cloudflare.com/ajax/libs/jquery/1.4.4/jquery.min.js" integrity="sha512-tcexmm0PBc+jOn9UwbgHVpjZIleEKXif1MCkzgNfVjhXKDxwYumrCOxhZ5tIaXHz2DpEE14hfjFn5J+tpaFSCg==" crossorigin="anonymous"></script>
+        <script src="https://cdnjs.cloudflare.com/ajax/libs/jqueryui/1.8.24/jquery-ui.min.js" integrity="sha512-leN1LJ2B5s9cBINeKL5bbT3cQvOebXsezoYGyuMq9oaytpFJgJ1uBOU86lJZObKTFLbMHqP0zFXR/1N6Nnlskw==" crossorigin="anonymous"></script>
         <script type="text/javascript">
         /*<![CDATA[*/
-            google.load("jquery", "1");
-            google.load("jqueryui", "1", {autoload:true});
-
             var i18nLang = '{{ settings.LANGUAGE_CODE }}';
             var appUrl = '{{ settings.APP_URL }}'
             var scriptUrl = '{{ settings.FORCE_SCRIPT_NAME }}/'
diff --git a/forum/skins/default/templates/osqaadmin/djstyle_base.html b/forum/skins/default/templates/osqaadmin/djstyle_base.html
index 658c273..15f20a4 100644
--- a/forum/skins/default/templates/osqaadmin/djstyle_base.html
+++ b/forum/skins/default/templates/osqaadmin/djstyle_base.html
@@ -11,12 +11,7 @@
     <link rel="stylesheet" href="{% static 'admin/css/changelists.css' %}" type="text/css"/>
     <!--[if lte IE 7]><link rel="stylesheet" type="text/css" href="{% static 'admin/css/ie.css' %}" /><![endif]-->
     <link rel="stylesheet" type="text/css" media="screen" href="{% media "/media/style/djstyle_admin.css" %}"/>
-    <script src="https://www.google.com/jsapi" type="text/javascript"></script>
-    <script type="text/javascript">
-    //<!--
-        google.load("jquery", "1.3");
-    //-->
-    </script>
+    <script src="https://cdnjs.cloudflare.com/ajax/libs/jquery/1.4.4/jquery.min.js" integrity="sha512-tcexmm0PBc+jOn9UwbgHVpjZIleEKXif1MCkzgNfVjhXKDxwYumrCOxhZ5tIaXHz2DpEE14hfjFn5J+tpaFSCg==" crossorigin="anonymous"></script>
     <script type="text/javascript" src="{% media "/media/js/osqa.admin.js" %}"></script>
     {% block adminjs %}{% endblock %}
     <title>{% trans "OSQA administration area" %} - {% block subtitle %}{% endblock %}</title>
diff --git a/forum/skins/default/templates/user.html b/forum/skins/default/templates/user.html
index 2393afe..4bb2c66 100644
--- a/forum/skins/default/templates/user.html
+++ b/forum/skins/default/templates/user.html
@@ -14,7 +14,8 @@
 {% endblock %}
 {% block forejs %}
     {% if request.user.is_superuser or request.user == view_user %}
-        <script type="text/javascript">google.load("jquery", "1.4.2");google.load("jqueryui", "1.8.1");</script>
+        <script src="https://cdnjs.cloudflare.com/ajax/libs/jquery/1.4.4/jquery.min.js" integrity="sha512-tcexmm0PBc+jOn9UwbgHVpjZIleEKXif1MCkzgNfVjhXKDxwYumrCOxhZ5tIaXHz2DpEE14hfjFn5J+tpaFSCg==" crossorigin="anonymous"></script>
+        <script src="https://cdnjs.cloudflare.com/ajax/libs/jqueryui/1.8.24/jquery-ui.min.js" integrity="sha512-leN1LJ2B5s9cBINeKL5bbT3cQvOebXsezoYGyuMq9oaytpFJgJ1uBOU86lJZObKTFLbMHqP0zFXR/1N6Nnlskw==" crossorigin="anonymous"></script>
         <script type="text/javascript">
             response_commands['update_profile_karma'] = function(new_karma) {
                 $('#user-reputation').css('background', 'yellow');
@@ -22,8 +23,8 @@
                 $('#user-reputation').animate({ backgroundColor: "transparent" }, 1000);
             }
         </script>
-        <link rel="stylesheet" href="https://jquery-ui.googlecode.com/svn/tags/latest/themes/base/jquery-ui.css" type="text/css" media="all" />
-        <link rel="stylesheet" href="http://static.jquery.com/ui/css/demo-docs-theme/ui.theme.css" type="text/css" media="all" />
+        <link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/jqueryui/1.8.24/themes/base/jquery-ui.min.css" integrity="sha512-Lzjd1ELD6YCIwIU5uaJldvbibV5Fi7HThNZjrwJHALBJRT6q2a6ndgi8TNgcKcUqGsH6bpT7xyTEi8qRzN1ASg==" crossorigin="anonymous" />
+        <link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/jqueryui/1.8.24/themes/base/jquery.ui.theme.min.css" integrity="sha512-BLVMxLmRDKZgx5GBHNkXJuKBi6D6YOdXN2wUF61yEyF29JIwzU6Z82ZlfpgR+he6XHDh7PspMNNcurw4uk3ZcA==" crossorigin="anonymous" />
         <link rel="stylesheet" type="text/css" media="screen" href="{% media "/media/style/user.css" %}"/>
     {% endif %}
     <style type="text/css">
diff --git a/forum/skins/default/templates/users/edit.html b/forum/skins/default/templates/users/edit.html
index 950c90a..b86e247 100644
--- a/forum/skins/default/templates/users/edit.html
+++ b/forum/skins/default/templates/users/edit.html
@@ -5,10 +5,10 @@
 {% load i18n %}
 {% block title %}{% spaceless %}{% trans "Edit user profile" %}{% endspaceless %}{% endblock %}
 {% block forejs %}
-        <script type="text/javascript">google.load("jquery", "1.4.2");google.load("jqueryui", "1.8.1");</script>
-
-        <link rel="stylesheet" href="https://jquery-ui.googlecode.com/svn/tags/latest/themes/base/jquery-ui.css" type="text/css" media="all" />
-        <link rel="stylesheet" href="http://static.jquery.com/ui/css/demo-docs-theme/ui.theme.css" type="text/css" media="all" />
+        <script src="https://cdnjs.cloudflare.com/ajax/libs/jquery/1.4.4/jquery.min.js" integrity="sha512-tcexmm0PBc+jOn9UwbgHVpjZIleEKXif1MCkzgNfVjhXKDxwYumrCOxhZ5tIaXHz2DpEE14hfjFn5J+tpaFSCg==" crossorigin="anonymous"></script>
+        <script src="https://cdnjs.cloudflare.com/ajax/libs/jqueryui/1.8.24/jquery-ui.min.js" integrity="sha512-leN1LJ2B5s9cBINeKL5bbT3cQvOebXsezoYGyuMq9oaytpFJgJ1uBOU86lJZObKTFLbMHqP0zFXR/1N6Nnlskw==" crossorigin="anonymous"></script>
+        <link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/jqueryui/1.8.24/themes/base/jquery-ui.min.css" integrity="sha512-Lzjd1ELD6YCIwIU5uaJldvbibV5Fi7HThNZjrwJHALBJRT6q2a6ndgi8TNgcKcUqGsH6bpT7xyTEi8qRzN1ASg==" crossorigin="anonymous" />
+        <link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/jqueryui/1.8.24/themes/base/jquery.ui.theme.min.css" integrity="sha512-BLVMxLmRDKZgx5GBHNkXJuKBi6D6YOdXN2wUF61yEyF29JIwzU6Z82ZlfpgR+he6XHDh7PspMNNcurw4uk3ZcA==" crossorigin="anonymous" />
 
         <script type="text/javascript">
             $().ready(function(){