AdBlock dodge (#622)

[wolnelektury.git] / wolnelektury / urls.py

diff --git a/wolnelektury/urls.py b/wolnelektury/urls.py
index a142c73..a7cd45f 100644 (file)
--- a/wolnelektury/urls.py
+++ b/wolnelektury/urls.py
@@ -2,14 +2,18 @@
 import os
 
 from django.conf.urls.defaults import *
 import os
 
 from django.conf.urls.defaults import *

+from django.conf import settings

 from django.contrib import admin
 
 from django.contrib import admin
 

+from catalogue.forms import SearchForm
+
+

 admin.autodiscover()
 
 admin.autodiscover()
 

-from catalogue.forms import SearchForm

 
 urlpatterns = patterns('',
     url(r'^katalog/', include('catalogue.urls')),
 
 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', 
     
     # Static pages
     url(r'^wolontariat/$', 'django.views.generic.simple.direct_to_template', 


@@ -21,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'^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'),
     
     # Admin panel
     url(r'^admin/catalogue/book/import$', 'catalogue.views.import_book', name='import_book'),


@@ -32,8 +39,19 @@ urlpatterns = patterns('',
     url(r'^uzytkownicy/wyloguj/$', 'catalogue.views.logout_then_redirect', name='logout'),
     url(r'^uzytkownicy/utworz/$', 'catalogue.views.register', name='register'),
     
     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
     # Static files

-    url(r'^media/(?P<path>.*)$', 'django.views.static.serve', 
-        {'document_root': os.path.join(os.path.dirname(__file__), 'media'), 'show_indexes': True}),
+    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'^$', 'django.views.generic.simple.redirect_to', {'url': 'katalog/'}),

+    url(r'^i18n/', include('django.conf.urls.i18n')),    

 )
 )

+
+if 'rosetta' in settings.INSTALLED_APPS:
+    urlpatterns += patterns('',
+        url(r'^rosetta/', include('rosetta.urls')),
+    )