X-Git-Url: https://git.mdrn.pl/wolnelektury.git/blobdiff_plain/94bfc24e8c353a678b72f37c86adf9a4a7a78ffd..e66808bc9a56116a8b13dc7445c3b5a4fa76148e:/wolnelektury/urls.py?ds=inline

diff --git a/wolnelektury/urls.py b/wolnelektury/urls.py
index a142c739b..199441424 100644
--- a/wolnelektury/urls.py
+++ b/wolnelektury/urls.py
@@ -2,11 +2,14 @@
 import os
 
 from django.conf.urls.defaults import *
+from django.conf import settings
 from django.contrib import admin
 
+from catalogue.forms import SearchForm
+
+
 admin.autodiscover()
 
-from catalogue.forms import SearchForm
 
 urlpatterns = patterns('',
     url(r'^katalog/', include('catalogue.urls')),
@@ -33,7 +36,9 @@ urlpatterns = patterns('',
     url(r'^uzytkownicy/utworz/$', 'catalogue.views.register', name='register'),
     
     # Static files
-    url(r'^media/(?P<path>.*)$', 'django.views.static.serve', 
-        {'document_root': os.path.join(os.path.dirname(__file__), 'media'), 'show_indexes': True}),
+    url(r'^%s(?P<path>.*)$' % settings.MEDIA_URL[1:], 'django.views.static.serve', 
+        {'document_root': settings.MEDIA_ROOT, 'show_indexes': True}),
+    url(r'^%s(?P<path>.*)$' % settings.STATIC_URL[1:], 'django.views.static.serve',
+        {'document_root': settings.STATIC_ROOT, 'show_indexes': True}),
     url(r'^$', 'django.views.generic.simple.redirect_to', {'url': 'katalog/'}),
 )