diff options
| author | Étienne Loks <etienne.loks@iggdrasil.net> | 2017-09-12 10:24:04 +0200 |
|---|---|---|
| committer | Étienne Loks <etienne.loks@iggdrasil.net> | 2017-09-12 10:24:04 +0200 |
| commit | 6aac3378c5a08770a48a06aec36f9a3d2cadede0 (patch) | |
| tree | 446df9248eed8c7390ba7464caff6e8e56244055 | |
| parent | 733763c12850445e53e7d6b805b2e49739659a84 (diff) | |
| download | Chimère-6aac3378c5a08770a48a06aec36f9a3d2cadede0.tar.bz2 Chimère-6aac3378c5a08770a48a06aec36f9a3d2cadede0.zip | |
Distingo between classic media (jquery/openlayers) and specific (bsmselect)
| -rw-r--r-- | chimere/templates/base.html | 4 | ||||
| -rw-r--r-- | chimere/widgets.py | 8 |
2 files changed, 6 insertions, 6 deletions
diff --git a/chimere/templates/base.html b/chimere/templates/base.html index 4e87e44..f1f4d5b 100644 --- a/chimere/templates/base.html +++ b/chimere/templates/base.html @@ -1,6 +1,4 @@ -{% load i18n %}<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" - "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> -<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en"> +{% load i18n %}<html lang="en"> <head> <title>{% block title %}{{PROJECT_NAME}}{% endblock %}</title> {% if MOBILE %}<meta name="apple-mobile-web-app-capable" content="yes"> diff --git a/chimere/widgets.py b/chimere/widgets.py index 810ae69..ce333ff 100644 --- a/chimere/widgets.py +++ b/chimere/widgets.py @@ -787,16 +787,18 @@ class AreaField(forms.MultiValueField): class MultiSelectWidget(forms.SelectMultiple): class Media: - css = {'all': list(settings.JQUERY_CSS_URLS) + [ + EXTRA_CSS = [ settings.STATIC_URL + 'bsmSelect/css/jquery.bsmselect.css', settings.STATIC_URL + 'bsmSelect/css/jquery.bsmselect.custom.css', ] - } - js = list(settings.JQUERY_JS_URLS) + [ + css = {'all': list(settings.JQUERY_CSS_URLS) + 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 def render(self, name, value, attrs=None): rendered = super(MultiSelectWidget, self).render(name, value, attrs) |