summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--debian/control1
-rw-r--r--setup.py2
-rw-r--r--welco/settings.py2
-rw-r--r--welco/templates/welco/base.html5
4 files changed, 6 insertions, 4 deletions
diff --git a/debian/control b/debian/control
index 026167b..7127632 100644
--- a/debian/control
+++ b/debian/control
@@ -26,6 +26,7 @@ Depends: ${misc:Depends},
python-django-tenant-schemas,
python-psycopg2,
python-django-mellon,
+ python-xstatic-select2,
gunicorn,
graphicsmagick
Recommends: nginx, postgresql
diff --git a/setup.py b/setup.py
index 940e08b..976ffc9 100644
--- a/setup.py
+++ b/setup.py
@@ -99,13 +99,13 @@ setup(
],
install_requires=['django>=1.7, <1.9',
'gadjo',
- 'django-select2',
'django-ckeditor<4.5.3',
'django-haystack',
'django-reversion==1.8.7',
'django-taggit',
'requests',
'whoosh',
+ 'XStatic-Select2',
],
zip_safe=False,
cmdclass={
diff --git a/welco/settings.py b/welco/settings.py
index fdd35b5..033f32a 100644
--- a/welco/settings.py
+++ b/welco/settings.py
@@ -41,7 +41,6 @@ INSTALLED_APPS = (
'django.contrib.sessions',
'django.contrib.messages',
'django.contrib.staticfiles',
- 'django_select2',
'ckeditor',
'haystack',
'reversion',
@@ -53,6 +52,7 @@ INSTALLED_APPS = (
'welco.kb',
'welco.contacts',
'gadjo',
+ 'xstatic.pkg.select2',
)
MIDDLEWARE_CLASSES = (
diff --git a/welco/templates/welco/base.html b/welco/templates/welco/base.html
index 52eab82..c4fce02 100644
--- a/welco/templates/welco/base.html
+++ b/welco/templates/welco/base.html
@@ -1,5 +1,5 @@
{% extends "gadjo/base.html" %}
-{% load i18n static django_select2_tags %}
+{% load i18n static gadjo %}
{% block page-title %}{% firstof site_title "Welco" %}{% endblock %}
{% block site-title %}{% firstof site_title "Welco" %}{% endblock %}
@@ -19,5 +19,6 @@
{{ block.super }}
<script src="{% static "js/datepicker-fr.js" %}"></script>
<script src="{% static "js/welco.js" %}"></script>
-{% import_django_select2_js_css %}
+<script src="{% xstatic "select2.js" "select2.min.js" %}"></script>
+<link rel="stylesheet" href="{% xstatic "select2.css" "select2.min.css" %}"/>
{% endblock %}