more changes for olimpiada

[edumed.git] / edumed / urls.py

diff --git a/edumed/urls.py b/edumed/urls.py
index 43ed0a8..26646bb 100644 (file)
--- a/edumed/urls.py
+++ b/edumed/urls.py
@@ -1,22 +1,31 @@
 # -*- 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<url>.*)$', 'django.contrib.flatpages.views.flatpage',
-        name="info"),
+    # url(r'^$', HomeView.as_view(), name="home"),
+    # url(r'^lekcje/', include('catalogue.urls')),
+    # url(r'^info/turniej/(?P<url>.*)$', lambda request, url: redirect('olimpiada', url)),
+    # url(r'^info/(?P<url>.*)$', flatpage, name="info"),
+    # url(r'^olimpiada/$', lambda request: flatpage(request, 'turniej/'), name='olimpiada'),
+    # url(r'^olimpiada/(?P<url>.*)$', lambda request, url: flatpage(request, 'turniej/' + url), name='olimpiada'),
     url(r'^szukaj/', include('haystack.urls')),
+
+    # url(r'^olimpiada-teaser/(?P<url>.*)$',
+    #     lambda request, url: flatpage_with_template(request, 'turniej/' + url, 'olimpiada_teaser.html'),
+    #     name='olimpiada_teaser'),
+
     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'^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'^zadania/', include('wtem.urls')),
 )
 
 
@@ -44,18 +53,10 @@ if 'django_cas' in settings.INSTALLED_APPS:
         url(r'^accounts/logout/$', 'django_cas.views.logout', name='logout'),
     )
 
-
-if settings.DEBUG:
-    from fnpdjango.utils.urls import i18n_patterns
-    from .views import mil_home_view, mil_contact_view, mil_knowledge_base_view
-    urlpatterns += i18n_patterns(
-        '',
-        url(r'^katalog/$', mil_home_view, name="mil_home"),
-        url(r'^wez-udzial/', include('comment.urls')),
-        url(r'^kontakt/$', mil_contact_view, name='mil_contact'),
-        url(r'^bazawiedzy/(?P<url>.*)$', mil_knowledge_base_view, name="knowledge_base"),
-    )
-
+urlpatterns += (
+    url(r'^(?P<url>[^/]*/|)$',
+        lambda request, url: flatpage(request, 'turniej/' + url)),
+)
 
 if settings.DEBUG:
     urlpatterns += patterns(