X-Git-Url: https://git.mdrn.pl/edumed.git/blobdiff_plain/f7c70cc1d06530544ec7ca45c330357babf1e093..2d5e46793f9b1f3f87f972114a4448da8efe740e:/edumed/urls.py diff --git a/edumed/urls.py b/edumed/urls.py index d988610..38005aa 100644 --- a/edumed/urls.py +++ b/edumed/urls.py @@ -1,19 +1,15 @@ -from django.conf.urls import patterns, include, url +# -*- coding: utf-8 -*- +from django.conf.urls import include, url from django.conf import settings -from django.views.generic import TemplateView - - -urlpatterns = patterns('', - # Examples: - # url(r'^$', 'edumed.views.home', name='home'), - url(r'^$', TemplateView.as_view(template_name="home.html"), name="home"), - url(r'^kompetencje/', include('curriculum.urls')), - url(r'^lekcje/', include('catalogue.urls')), -# url(r'^i/', include('django.contrib.flatpages.urls')), - url(r'^info/(?P.*)$', 'django.contrib.flatpages.views.flatpage', - name="info"), +from django.contrib.flatpages.views import flatpage + +urlpatterns = [ url(r'^szukaj/', include('haystack.urls')), -) + + url(r'^zglos/', include('contact.urls')), + url(r'^zadania/', include('wtem.urls')), + url(r'^drugi-etap/', include('stage2.urls')), +] # Admin stuff, if necessary. @@ -21,22 +17,34 @@ if 'django.contrib.admin' in settings.INSTALLED_APPS: from django.contrib import admin admin.autodiscover() - urlpatterns += patterns('', + if 'django_cas' in settings.INSTALLED_APPS: + urlpatterns += [ + url(r'^admin/logout/$', 'django_cas.views.logout'), + ] + urlpatterns += [ url(r'^admin/doc/', include('django.contrib.admindocs.urls')), url(r'^admin/', include(admin.site.urls)), - ) + ] # Auth stuff, if necessary if 'django_cas' in settings.INSTALLED_APPS: - urlpatterns += patterns('', - (r'^accounts/login/$', 'django_cas.views.login'), - (r'^accounts/logout/$', 'django_cas.views.logout'), - ) - + urlpatterns += [ + url(r'^accounts/login/$', 'django_cas.views.login', name='login'), + url(r'^accounts/logout/$', 'django_cas.views.logout', name='logout'), + ] +else: + from django.contrib.auth.views import login, logout + urlpatterns += [ + url(r'^accounts/login/$', login, name='login'), + url(r'^accounts/logout/$', logout, name='logout'), + ] + +urlpatterns += ( + url(r'^(?P[^/]*/|)$', + lambda request, url: flatpage(request, 'turniej/' + url)), +) if settings.DEBUG: - urlpatterns += patterns('', - url(r'^media/(?P.*)$', 'django.views.static.serve', { - 'document_root': settings.MEDIA_ROOT, - }), - ) + urlpatterns += ( + url(r'^media/(?P.*)$', 'django.views.static.serve', {'document_root': settings.MEDIA_ROOT}), + )