Merge branch 'master' of git+ssh://github.com/fnp/wolnelektury

[wolnelektury.git] / wolnelektury / urls.py

diff --git a/wolnelektury/urls.py b/wolnelektury/urls.py
index 1994414..3a0b2ac 100644 (file)
--- a/wolnelektury/urls.py
+++ b/wolnelektury/urls.py
@@ -13,6 +13,7 @@ admin.autodiscover()
 
 urlpatterns = patterns('',
     url(r'^katalog/', include('catalogue.urls')),
+    url(r'^materialy/', include('lessons.urls')),
     
     # Static pages
     url(r'^wolontariat/$', 'django.views.generic.simple.direct_to_template', 
@@ -24,6 +25,9 @@ urlpatterns = patterns('',
     url(r'^o-projekcie/$', 'django.views.generic.simple.direct_to_template', 
         {'template': 'info/about_us.html', 'extra_context': {'form': SearchForm()}},
         name='about_us'),
+    url(r'^1procent/$', 'django.views.generic.simple.direct_to_template', {
+        'template': '1percent.html'
+    }, name='1percent'),
     
     # Admin panel
     url(r'^admin/catalogue/book/import$', 'catalogue.views.import_book', name='import_book'),
@@ -35,10 +39,14 @@ urlpatterns = patterns('',
     url(r'^uzytkownicy/wyloguj/$', 'catalogue.views.logout_then_redirect', name='logout'),
     url(r'^uzytkownicy/utworz/$', 'catalogue.views.register', name='register'),
     
+    # API
+    (r'^api/', include('api.urls')),
+    
     # Static files
     url(r'^%s(?P<path>.*)$' % settings.MEDIA_URL[1:], 'django.views.static.serve', 
         {'document_root': settings.MEDIA_ROOT, 'show_indexes': True}),
     url(r'^%s(?P<path>.*)$' % settings.STATIC_URL[1:], 'django.views.static.serve',
         {'document_root': settings.STATIC_ROOT, 'show_indexes': True}),
     url(r'^$', 'django.views.generic.simple.redirect_to', {'url': 'katalog/'}),
+    url(r'^i18n/', include('django.conf.urls.i18n')),    
 )