Move to Django 1.5, reorg settings.

[fnp-django-template.git] / project_name / urls.py

diff --git a/project_name/urls.py b/project_name/urls.py
index 4471526..c579b39 100644 (file)
--- a/project_name/urls.py
+++ b/project_name/urls.py
@@ -1,7 +1,7 @@
 from django.conf.urls import patterns, include, url
 from django.conf import settings
 
 from django.conf.urls import patterns, include, url
 from django.conf import settings
 

-urlpatterns += patterns('',
+urlpatterns = patterns('',

     # Examples:
     # url(r'^$', '{{ project_name }}.views.home', name='home'),
     # url(r'^{{ project_name }}/', include('foo.urls')),
     # Examples:
     # url(r'^$', '{{ project_name }}.views.home', name='home'),
     # url(r'^{{ project_name }}/', include('foo.urls')),


@@ -24,3 +24,11 @@ if 'django_cas' in settings.INSTALLED_APPS:
         (r'^accounts/login/$', 'django_cas.views.login'),
         (r'^accounts/logout/$', 'django_cas.views.logout'),
     )
         (r'^accounts/login/$', 'django_cas.views.login'),
         (r'^accounts/logout/$', 'django_cas.views.logout'),
     )

+
+# Media in DEBUG mode
+if settings.DEBUG:
+    urlpatterns += patterns('',
+        url(r'^media/(?P<path>.*)$', 'django.views.static.serve', {
+            'document_root': settings.MEDIA_ROOT,
+        }),
+   )