diff options
| author | Étienne Loks <etienne.loks@peacefrogs.net> | 2010-11-20 12:43:50 +0100 |
|---|---|---|
| committer | Étienne Loks <etienne.loks@peacefrogs.net> | 2010-11-20 12:43:50 +0100 |
| commit | bbc1a2dbed58a42c83672279d55567dad3faaea9 (patch) | |
| tree | 3e093fb44d6762831bc4a377dacfdefa12b90ab0 | |
| parent | cee23430ae5aca14d5dcd7cf2c52b62b392afcdf (diff) | |
| parent | 9dbe3e1f8a64f680233bf985f5a0a99905d88e0a (diff) | |
| download | Chimère-bbc1a2dbed58a42c83672279d55567dad3faaea9.tar.bz2 Chimère-bbc1a2dbed58a42c83672279d55567dad3faaea9.zip | |
Merge branch 'master' into carte-ouverte
Conflicts:
chimere/urls.py
| -rw-r--r-- | chimere/templates/edit.html | 6 | ||||
| -rw-r--r-- | chimere/templates/edit_route.html | 6 | ||||
| -rw-r--r-- | chimere/urls.py | 7 |
3 files changed, 13 insertions, 6 deletions
diff --git a/chimere/templates/edit.html b/chimere/templates/edit.html index 46982fd..d37efa7 100644 --- a/chimere/templates/edit.html +++ b/chimere/templates/edit.html @@ -1,8 +1,12 @@ {% extends "base_user.html" %} {% load i18n %} +{% load adminmedia %} {% block extra_head %} -{% if dated %}<script type="text/javascript" src="{{extra_url}}jsi18n"></script> +{% if dated %}<script type="text/javascript" src="{{extra_url}}admin/jsi18n"></script> <script type="text/javascript" src="{{extra_url}}media/js/core.js"></script> +<script type="text/javascript"> +window.__admin_media_prefix__ = "{% filter escapejs %}{% admin_media_prefix %}{% endfilter %}"; +</script> <link rel="stylesheet" type="text/css" href="{{extra_url}}media/css/base.css"/> <link rel="stylesheet" type="text/css" href="{{extra_url}}media/css/widgets.css"/> {% endif %}{{ block.super }} diff --git a/chimere/templates/edit_route.html b/chimere/templates/edit_route.html index 2fb6fc8..f7aa7e8 100644 --- a/chimere/templates/edit_route.html +++ b/chimere/templates/edit_route.html @@ -1,8 +1,12 @@ {% extends "base_user.html" %} {% load i18n %} +{% load adminmedia %} {% block extra_head %} -{% if dated %}<script type="text/javascript" src="{{extra_url}}jsi18n"></script> +{% if dated %}<script type="text/javascript" src="{{extra_url}}admin/jsi18n"></script> <script type="text/javascript" src="{{extra_url}}media/js/core.js"></script> +<script type="text/javascript"> +window.__admin_media_prefix__ = "{% filter escapejs %}{% admin_media_prefix %}{% endfilter %}"; +</script> <link rel="stylesheet" type="text/css" href="{{extra_url}}media/css/base.css"/> <link rel="stylesheet" type="text/css" href="{{extra_url}}media/css/widgets.css"/> {% endif %}{{ block.super }} diff --git a/chimere/urls.py b/chimere/urls.py index 331dbbe..8740f85 100644 --- a/chimere/urls.py +++ b/chimere/urls.py @@ -27,19 +27,18 @@ from settings import ROOT_PATH, EXTRA_URL, INSTALLED_APPS from main.models import Area -js_info_dict = { - 'packages': 'chimere', -} +def i18n_javascript(request): + return admin.site.i18n_javascript(request) BASE = '^' + EXTRA_URL urlpatterns = patterns('', + (BASE + r'admin/jsi18n/$', i18n_javascript), (BASE + r'admin/(.*)', admin.site.root), (BASE + r'static/(?P<path>.*)$', 'django.views.static.serve', {'document_root': ROOT_PATH + 'static/'}), (BASE + r'media/(?P<path>.*)$', 'django.views.static.serve', {'document_root': ROOT_PATH + 'media/'}), - (BASE + r'jsi18n/$', 'django.views.i18n.javascript_catalog', js_info_dict), (BASE + r'charte/$', 'chimere.main.views.charte'), ) |