X-Git-Url: https://git.mdrn.pl/wolnelektury.git/blobdiff_plain/8559c95597de98e8f6c580e97224ed3ecc9dc5c0..e390e737951ea78e783070b9729a877945daaa42:/urls.py?ds=sidebyside diff --git a/urls.py b/urls.py index 0804ca8a3..c4185d6e2 100644 --- a/urls.py +++ b/urls.py @@ -4,23 +4,22 @@ import os from django.conf.urls.defaults import * from django.contrib import admin - admin.autodiscover() urlpatterns = patterns('', - (r'^katalog/', include('catalogue.urls')), + url(r'^katalog/', include('catalogue.urls')), # Panel administracyjny - (r'^admin/doc/', include('django.contrib.admindocs.urls')), - (r'^admin/(.*)$', admin.site.root), + url(r'^admin/doc/', include('django.contrib.admindocs.urls')), + url(r'^admin/(.*)$', admin.site.root), # Użytkownicy url(r'^uzytkownicy/zaloguj/$', 'django.contrib.auth.views.login', {'template_name': 'auth/login.html'}, name='login'), url(r'^uzytkownicy/wyloguj/$', 'django.contrib.auth.views.logout_then_login', name='logout'), # Pliki statyczne - (r'^pliki/(?P.*)$', 'django.views.static.serve', + url(r'^media/(?P.*)$', 'django.views.static.serve', {'document_root': os.path.join(os.path.dirname(__file__), 'media'), 'show_indexes': True}), - (r'^$', 'django.views.generic.simple.redirect_to', {'url': 'katalog/'}), + url(r'^$', 'django.views.generic.simple.redirect_to', {'url': 'katalog/'}), )