From 9e4d5ae38fe310ea4748b7b3e94b8967b995269e Mon Sep 17 00:00:00 2001
From: Étienne Loks <etienne.loks@iggdrasil.net>
Date: Tue, 12 Sep 2017 11:41:24 +0200
Subject: Remove all JQUERY_* parameters - remove jquery ui

---
 chimere/forms.py                                  |  9 ++++++---
 chimere/templates/chimere/base.html               |  3 ++-
 chimere/templates/chimere/blocks/head_jquery.html |  8 +++-----
 chimere/templatetags/chimere_tags.py              |  2 --
 chimere/views.py                                  |  2 --
 chimere/widgets.py                                | 10 +++++-----
 6 files changed, 16 insertions(+), 18 deletions(-)

(limited to 'chimere')

diff --git a/chimere/forms.py b/chimere/forms.py
index 352a7b1..fe0dc9c 100644
--- a/chimere/forms.py
+++ b/chimere/forms.py
@@ -251,7 +251,8 @@ class CategoryAdminForm(forms.ModelForm):
     description = forms.CharField(widget=TextareaAdminWidget, required=False)
 
     class Media:
-        js = list(settings.JQUERY_JS_URLS) + [
+        js = [
+            '%sjquery/jquery.min.js' % settings.STATIC_URL,
             '%schimere/js/menu-sort.js' % settings.STATIC_URL,
         ]
         css = {
@@ -667,7 +668,8 @@ class MultimediaFileAdminForm(forms.ModelForm):
         exclude = []
 
     class Media:
-        js = list(settings.JQUERY_JS_URLS) + [
+        js = [
+            '%sjquery/jquery.min.js' % settings.STATIC_URL,
             '%schimere/js/menu-sort.js' % settings.STATIC_URL,
         ]
 
@@ -703,7 +705,8 @@ class PictureFileAdminForm(forms.ModelForm):
         exclude = []
 
     class Media:
-        js = list(settings.JQUERY_JS_URLS) + [
+        js = [
+            '%sjquery/jquery.min.js' % settings.STATIC_URL,
             '%schimere/js/menu-sort.js' % settings.STATIC_URL,
         ]
 
diff --git a/chimere/templates/chimere/base.html b/chimere/templates/chimere/base.html
index 0b7eae3..2f62a2e 100644
--- a/chimere/templates/chimere/base.html
+++ b/chimere/templates/chimere/base.html
@@ -11,7 +11,8 @@
 <link rel="stylesheet" href="{{ STATIC_URL }}chimere/css/mobile.css?ver={{VERSION}}" />
 <script src="{{ STATIC_URL }}chimere/js/mobile.chimere.js?ver={{VERSION}}" type="text/javascript"></script>{%endif%}
 <link rel="stylesheet" href="{{ STATIC_URL }}chimere/css/form-compat.css?ver={{VERSION}}" />
-<script src="{{ STATIC_URL }}bootstrap/bootstrap.min.js?ver=3.0.0" type="text/javascript"></script>
+<script src="{{ STATIC_URL }}bootstrap/popper.min.js?ver=4.0.0-beta" type="text/javascript"></script>
+<script src="{{ STATIC_URL }}bootstrap/bootstrap.min.js?ver=4.0.0-beta" type="text/javascript"></script>
     <script type='text/javascript'>
     var has_search = {% if has_search %}true{% else %}false{% endif %};
     var default_map_lbl = "{% trans 'Default map' %}";
diff --git a/chimere/templates/chimere/blocks/head_jquery.html b/chimere/templates/chimere/blocks/head_jquery.html
index 76c0910..f70af95 100644
--- a/chimere/templates/chimere/blocks/head_jquery.html
+++ b/chimere/templates/chimere/blocks/head_jquery.html
@@ -1,5 +1,3 @@
-{% for css_url in JQUERY_CSS_URLS %}
-<link rel="stylesheet" href="{{ css_url }}?ver={{VERSION}}" />{% endfor %}
-
-{% for js_url in JQUERY_JS_URLS %}
-<script type="text/javascript" src="{{ js_url }}?ver={{VERSION}}"></script>{% endfor %}
+{% load static %}
+<script type="text/javascript"
+        src="{% static 'jquery/jquery.min.js'%}?ver={{VERSION}}"></script>
diff --git a/chimere/templatetags/chimere_tags.py b/chimere/templatetags/chimere_tags.py
index 1d15997..ef25945 100644
--- a/chimere/templatetags/chimere_tags.py
+++ b/chimere/templatetags/chimere_tags.py
@@ -126,8 +126,6 @@ def head_jquery(context):
     Create context and display head elements (js, css, etc.) for jquery.
     """
     context_data = {
-        "JQUERY_JS_URLS": settings.JQUERY_JS_URLS,
-        "JQUERY_CSS_URLS": settings.JQUERY_CSS_URLS,
         "VERSION": get_version()
     }
     return context_data
diff --git a/chimere/views.py b/chimere/views.py
index 8c41a7f..163da08 100644
--- a/chimere/views.py
+++ b/chimere/views.py
@@ -123,8 +123,6 @@ def get_base_response(request, area_name=""):
         base_response_dct['css_area'] = area.external_css
     base_response_dct['dynamic_categories'] = \
         True if area and area.dynamic_categories else False
-    base_response_dct['JQUERY_JS_URLS'] = settings.JQUERY_JS_URLS
-    base_response_dct['JQUERY_CSS_URLS'] = settings.JQUERY_CSS_URLS
     base_response_dct['PROJECT_NAME'] = settings.PROJECT_NAME
     if hasattr(settings, 'EXTRA_CSS'):
         base_response_dct['EXTRA_CSS'] = settings.EXTRA_CSS
diff --git a/chimere/widgets.py b/chimere/widgets.py
index ce333ff..2852ae0 100644
--- a/chimere/widgets.py
+++ b/chimere/widgets.py
@@ -45,9 +45,9 @@ BASE_CSS = {
 }
 
 BASE_JS = tuple(
-    ["{}ol3/ol.js".format(settings.STATIC_URL)] +
-    list(settings.JQUERY_JS_URLS) +
-    ["{}chimere/js/jquery.chimere.js".format(settings.STATIC_URL),
+    ["{}ol3/ol.js".format(settings.STATIC_URL),
+     '{}jquery/jquery.min.js'.format(settings.STATIC_URL),
+     "{}chimere/js/jquery.chimere.js".format(settings.STATIC_URL),
      "{}ol3-layerswitcher/ol3-layerswitcher.js".format(settings.STATIC_URL)])
 
 AREA_JS = tuple(
@@ -791,14 +791,14 @@ class MultiSelectWidget(forms.SelectMultiple):
             settings.STATIC_URL + 'bsmSelect/css/jquery.bsmselect.css',
             settings.STATIC_URL + 'bsmSelect/css/jquery.bsmselect.custom.css',
         ]
-        css = {'all': list(settings.JQUERY_CSS_URLS) + EXTRA_CSS}
+        css = {'all': EXTRA_CSS}
 
         EXTRA_JS = [
             settings.STATIC_URL + 'bsmSelect/js/jquery.bsmselect.js',
             settings.STATIC_URL +
             'bsmSelect/js/jquery.bsmselect.compatibility.js',
         ]
-        js = list(settings.JQUERY_JS_URLS) + EXTRA_JS
+        js = ['%sjquery/jquery.min.js' % settings.STATIC_URL] + EXTRA_JS
 
     def render(self, name, value, attrs=None):
         rendered = super(MultiSelectWidget, self).render(name, value, attrs)
-- 
cgit v1.2.3