X-Git-Url: https://git.mdrn.pl/edumed.git/blobdiff_plain/6c9978c5bf8b1ef20871557c22b8b02df647d700..003a3fab503e3c8362b14f8f8c7306f305d9cc39:/edumed/urls.py diff --git a/edumed/urls.py b/edumed/urls.py index 43ed0a8..32eb97e 100644 --- a/edumed/urls.py +++ b/edumed/urls.py @@ -1,6 +1,9 @@ # -*- coding: utf-8 -*- from django.conf.urls import patterns, include, url from django.conf import settings +from django.contrib.flatpages.views import flatpage +from django.shortcuts import redirect + from .views import HomeView, AvatarlessProfileEditView @@ -8,8 +11,10 @@ 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'^szukaj/', include('haystack.urls')), url(r'^zglos/', include('contact.urls')), url(r'^forum/profile/edit/$', AvatarlessProfileEditView.as_view(), name='edit_profile'),