update email with key + small fix

[edumed.git] / edumed / urls.py

diff --git a/edumed/urls.py b/edumed/urls.py
index b2dc8c1..1764f61 100644 (file)
--- a/edumed/urls.py
+++ b/edumed/urls.py
@@ -2,9 +2,9 @@
 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 django.shortcuts import redirect
 
-from .views import HomeView, AvatarlessProfileEditView, flatpage_with_template
+# from .views import HomeView, AvatarlessProfileEditView, flatpage_with_template
 
 urlpatterns = patterns(
     '',
@@ -14,7 +14,7 @@ urlpatterns = patterns(
     # 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'^szukaj/', include('haystack.urls')),
 
     # url(r'^olimpiada-teaser/(?P<url>.*)$',
     #     lambda request, url: flatpage_with_template(request, 'turniej/' + url, 'olimpiada_teaser.html'),
@@ -26,6 +26,7 @@ urlpatterns = patterns(
     # 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')),
 )
 
 
@@ -52,16 +53,21 @@ if 'django_cas' in settings.INSTALLED_APPS:
         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_with_template(request, 'turniej/' + url, 'olimpiada_teaser.html')),
+        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,
+        # }),
     )