X-Git-Url: https://git.mdrn.pl/edumed.git/blobdiff_plain/6c9978c5bf8b1ef20871557c22b8b02df647d700..c13952acc4bd9baede3ac65350cccb1de9a20eea:/edumed/urls.py diff --git a/edumed/urls.py b/edumed/urls.py index 43ed0a8..262c433 100644 --- a/edumed/urls.py +++ b/edumed/urls.py @@ -1,22 +1,30 @@ # -*- coding: utf-8 -*- from django.conf.urls import patterns, include, url from django.conf import settings -from .views import HomeView, AvatarlessProfileEditView +from django.contrib.flatpages.views import flatpage +from django.shortcuts import redirect +from .views import HomeView, AvatarlessProfileEditView, flatpage_with_template urlpatterns = patterns( '', url(r'^$', HomeView.as_view(), name="home"), url(r'^lekcje/', include('catalogue.urls')), - url(r'^info/(?P.*)$', 'django.contrib.flatpages.views.flatpage', - name="info"), + url(r'^info/turniej/(?P.*)$', lambda request, url: redirect('olimpiada', url)), + url(r'^info/(?P.*)$', flatpage, name="info"), + url(r'^olimpiada/$', lambda request: flatpage(request, 'turniej/'), name='olimpiada'), + url(r'^olimpiada/(?P.*)$', lambda request, url: flatpage(request, 'turniej/' + url), name='olimpiada'), + url(r'^olimpiada-teaser/(?P.*)$', + lambda request, url: flatpage_with_template(request, 'turniej/' + url, 'olimpiada_teaser.html'), + name='olimpiada_teaser'), url(r'^szukaj/', include('haystack.urls')), url(r'^zglos/', include('contact.urls')), url(r'^forum/profile/edit/$', AvatarlessProfileEditView.as_view(), name='edit_profile'), url(r'^forum/', include('forum.urls')), url(r'^forum/', include('pybb.urls', namespace='pybb')), url(r'^kompetencje/', include('curriculum.urls')), - url(r'^wtem/', include('wtem.urls')), + url(r'^wlem/', include('wtem.urls')), + url(r'^api/', include('api.urls')), )