Django 1.8 / python 3 migration. Move static to a right path.

1 files changed, 10 insertions, 3 deletions

diff --git a/urls.py b/urls.py
index 11b54f6..fe91a99 100644
--- a/urls.py
+++ b/urls.py
@@ -1,6 +1,6 @@
 #!/usr/bin/env python
 # -*- coding: utf-8 -*-
-# Copyright (C) 2012 Étienne 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
@@ -18,7 +18,8 @@
 # See the file COPYING for details.
 
 from django.conf import settings
-from django.conf.urls.defaults import *
+from django.conf.urls import patterns, url, include
+from django.conf.urls.static import static
 
 from django.contrib import admin
 from django.contrib.staticfiles.urls import staticfiles_urlpatterns
@@ -29,6 +30,12 @@ urlpatterns = patterns(
     (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',
+        (r'^tinymce/', include('tinymce.urls')),)
+
 urlpatterns += staticfiles_urlpatterns()
 
 urlpatterns += patterns(
@@ -54,4 +61,4 @@ urlpatterns += patterns(
     url(r'^(saclay/)?$', 'chimere_saclay.views.index_saclay',
         name="index-saclay"),
     url(r'^', include('chimere.urls', namespace="chimere")),
-)
+) + static(settings.STATIC_URL, document_root=settings.STATIC_ROOT)