diff options
| author | Étienne Loks <etienne.loks@peacefrogs.net> | 2013-03-14 18:48:00 +0100 |
|---|---|---|
| committer | Étienne Loks <etienne.loks@peacefrogs.net> | 2013-03-14 18:48:00 +0100 |
| commit | 054fdbdf7a1e5106725b8b5a36db99242cfa65c1 (patch) | |
| tree | 1633b26e884feb1f29afedbb80cef7a6ecbdba2d /chimere/widgets.py | |
| parent | 8a5ba2650678ec22107a1a0a10650b6e0cc14683 (diff) | |
| parent | d02ec4246813eb0787bf3ab54af1af9ce32bd376 (diff) | |
| download | Chimère-054fdbdf7a1e5106725b8b5a36db99242cfa65c1.tar.bz2 Chimère-054fdbdf7a1e5106725b8b5a36db99242cfa65c1.zip | |
Merge branch 'master' into saclay
Conflicts:
chimere/locale/fr/LC_MESSAGES/django.po
chimere/static/chimere/css/styles.css
chimere/static/chimere/js/jquery.chimere.js
chimere/templates/chimere/detail.html
chimere/templatetags/chimere_tags.py
chimere/utils.py
chimere/views.py
example_project/settings.py
Diffstat (limited to 'chimere/widgets.py')
| -rw-r--r-- | chimere/widgets.py | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/chimere/widgets.py b/chimere/widgets.py index 481a5c9..45161e1 100644 --- a/chimere/widgets.py +++ b/chimere/widgets.py @@ -675,13 +675,13 @@ class AreaField(forms.MultiValueField): class MultiSelectWidget(forms.SelectMultiple): class Media: css = {'all': list(settings.JQUERY_CSS_URLS) + [ - settings.STATIC_URL + 'chimere/js/jquery/bsmSelect/css/jquery.bsmselect.css', - settings.STATIC_URL + 'chimere/js/jquery/bsmSelect/css/jquery.bsmselect.custom.css', + settings.STATIC_URL + 'bsmSelect/css/jquery.bsmselect.css', + settings.STATIC_URL + 'bsmSelect/css/jquery.bsmselect.custom.css', ] } js = list(settings.JQUERY_JS_URLS) + [ - settings.STATIC_URL + 'chimere/js/jquery/bsmSelect/js/jquery.bsmselect.js', - settings.STATIC_URL + 'chimere/js/jquery/bsmSelect/js/jquery.bsmselect.compatibility.js', + settings.STATIC_URL + 'bsmSelect/js/jquery.bsmselect.js', + settings.STATIC_URL + 'bsmSelect/js/jquery.bsmselect.compatibility.js', ] def render(self, name, value, attrs=None): |