X-Git-Url: https://git.mdrn.pl/edumed.git/blobdiff_plain/543746a467e90915f7eaf60b7b09f5fa498056e0..d83b04cb2d40247e0c61ad7d01369207c6de96e1:/edumed/urls.py

diff --git a/edumed/urls.py b/edumed/urls.py
index fb09204..1764f61 100644
--- a/edumed/urls.py
+++ b/edumed/urls.py
@@ -1,21 +1,32 @@
+# -*- 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"),
+urlpatterns = patterns(
+    '',
+    # 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')),
+    url(r'^drugi-etap/', include('stage2.urls')),
 )
 
 
@@ -25,25 +36,38 @@ if 'django.contrib.admin' in settings.INSTALLED_APPS:
     admin.autodiscover()
 
     if 'django_cas' in settings.INSTALLED_APPS:
-        urlpatterns += patterns('',
+        urlpatterns += patterns(
+            '',
             (r'^admin/logout/$', 'django_cas.views.logout'),
         )
-    urlpatterns += patterns('',
+    urlpatterns += patterns(
+        '',
         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('',
+    urlpatterns += patterns(
+        '',
         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<url>[^/]*/|)$',
+        lambda request, url: flatpage(request, 'turniej/' + url)),
+)
 
 if settings.DEBUG:
-    urlpatterns += patterns('',
-        url(r'^media/(?P<path>.*)$', 'django.views.static.serve', {
-            'document_root': settings.MEDIA_ROOT,
-        }),
-   )
+    urlpatterns += (
+        # url(r'^media/(?P<path>.*)$', 'django.views.static.serve', {
+        #     'document_root': settings.MEDIA_ROOT,
+        # }),
+    )