X-Git-Url: https://git.mdrn.pl/edumed.git/blobdiff_plain/d12ee4e0ec425e7f508c93ad1295a21a67ae1a30..cfd5cf641dd5a2b7a59acaab14b31e349a854de8:/edumed/urls.py?ds=inline

diff --git a/edumed/urls.py b/edumed/urls.py
index 3e99b30..47055d9 100644
--- a/edumed/urls.py
+++ b/edumed/urls.py
@@ -1,18 +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 .views import HomeView
+from django.contrib.flatpages.views import flatpage
 
-
-urlpatterns = patterns('',
-    url(r'^$', HomeView.as_view(), 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<url>.*)$', 'django.contrib.flatpages.views.flatpage',
-        name="info"),
+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.
@@ -20,22 +17,29 @@ 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'),
-    )
-
-
-if settings.DEBUG:
-    urlpatterns += patterns('',
-        url(r'^media/(?P<path>.*)$', 'django.views.static.serve', {
-            'document_root': settings.MEDIA_ROOT,
-        }),
-   )
+    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<url>[^/]*/|)$',
+        lambda request, url: flatpage(request, 'turniej/' + url)),
+)