X-Git-Url: https://git.mdrn.pl/edumed.git/blobdiff_plain/e76fdcf2a2488b1787c74fe8dccfa38d7ac04c84..f7c70cc1d06530544ec7ca45c330357babf1e093:/edumed/urls.py?ds=sidebyside diff --git a/edumed/urls.py b/edumed/urls.py index 77b9872..d988610 100644 --- a/edumed/urls.py +++ b/edumed/urls.py @@ -10,8 +10,9 @@ urlpatterns = patterns('', url(r'^kompetencje/', include('curriculum.urls')), url(r'^lekcje/', include('catalogue.urls')), # url(r'^i/', include('django.contrib.flatpages.urls')), - url(r'^i/(?P.*)$', 'django.contrib.flatpages.views.flatpage', + url(r'^info/(?P.*)$', 'django.contrib.flatpages.views.flatpage', name="info"), + url(r'^szukaj/', include('haystack.urls')), ) @@ -31,3 +32,11 @@ if 'django_cas' in settings.INSTALLED_APPS: (r'^accounts/login/$', 'django_cas.views.login'), (r'^accounts/logout/$', 'django_cas.views.logout'), ) + + +if settings.DEBUG: + urlpatterns += patterns('', + url(r'^media/(?P.*)$', 'django.views.static.serve', { + 'document_root': settings.MEDIA_ROOT, + }), + )