diff options
Diffstat (limited to 'chimere_example_project/urls.py')
| -rw-r--r-- | chimere_example_project/urls.py | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/chimere_example_project/urls.py b/chimere_example_project/urls.py index fff1366..22d9111 100644 --- a/chimere_example_project/urls.py +++ b/chimere_example_project/urls.py @@ -1,6 +1,6 @@ #!/usr/bin/env python # -*- coding: utf-8 -*- -# Copyright (C) 2012-2013 Etienne Loks <etienne.loks_AT_peacefrogsDOTnet> +# Copyright (C) 2012-2016 Etienne Loks <etienne.loks_AT_peacefrogsDOTnet> # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU General Public License as @@ -24,21 +24,22 @@ from django.contrib import admin from django.contrib.staticfiles.urls import staticfiles_urlpatterns admin.autodiscover() -urlpatterns = patterns('django.views.static', +urlpatterns = patterns( + 'django.views.static', (r'^%s(?P<path>.*)' % settings.MEDIA_URL[1:], 'serve', {'document_root': settings.MEDIA_ROOT}), ) if "tinymce" in settings.INSTALLED_APPS: - urlpatterns += patterns('django.views.static', + urlpatterns += patterns( + 'django.views.static', (r'^tinymce/', include('tinymce.urls')),) urlpatterns += staticfiles_urlpatterns() -urlpatterns += patterns('', +urlpatterns += patterns( + '', (r'^admin/doc/', include('django.contrib.admindocs.urls')), (r'^admin/', include(admin.site.urls)), url(r'^', include('chimere.urls', namespace="chimere")), ) - - |