fix in import

[edumed.git] / edumed / urls.py

diff --git a/edumed/urls.py b/edumed/urls.py
index 32eb97e..262c433 100644 (file)
--- a/edumed/urls.py
+++ b/edumed/urls.py
@@ -4,8 +4,7 @@ from django.conf import settings
 from django.contrib.flatpages.views import flatpage
 from django.shortcuts import redirect
 
 from django.contrib.flatpages.views import flatpage
 from django.shortcuts import redirect
 

-from .views import HomeView, AvatarlessProfileEditView
-
+from .views import HomeView, AvatarlessProfileEditView, flatpage_with_template

 
 urlpatterns = patterns(
     '',
 
 urlpatterns = patterns(
     '',


@@ -15,13 +14,17 @@ 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'^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'^olimpiada-teaser/(?P<url>.*)$',
+        lambda request, url: flatpage_with_template(request, 'turniej/' + url, 'olimpiada_teaser.html'),
+        name='olimpiada_teaser'),

     url(r'^szukaj/', include('haystack.urls')),
     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'^szukaj/', include('haystack.urls')),
     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'^wlem/', include('wtem.urls')),
+    url(r'^api/', include('api.urls')),

 )
 
 
 )