X-Git-Url: https://git.mdrn.pl/wolnelektury.git/blobdiff_plain/f99929a3fa250a4d39388013b990334ae1f7c779..ad5acb886787871a70eee6385cddbb4238d3adb2:/src/wolnelektury/urls.py?ds=sidebyside diff --git a/src/wolnelektury/urls.py b/src/wolnelektury/urls.py index 97002d193..0ebc4891d 100644 --- a/src/wolnelektury/urls.py +++ b/src/wolnelektury/urls.py @@ -7,7 +7,6 @@ from django.conf import settings from django.contrib import admin from django.views.generic import RedirectView import django.views.static -from migdal.urls import urlpatterns as migdal_urlpatterns import catalogue.views import picture.views from . import views @@ -51,7 +50,16 @@ urlpatterns += [ url(r'^newsletter/', include('newsletter.urls')), url(r'^formularz/', include('contact.urls')), url(r'^isbn/', include('isbn.urls')), + + url(r'^paypal/app-form/$', RedirectView.as_view( + url='/towarzystwo/?app=1', permanent=False)), + url(r'^towarzystwo/dolacz/$', RedirectView.as_view( + url='/towarzystwo/', permanent=False)), + + url(r'^paypal/', include('paypal.urls')), + url(r'^powiadomienie/', include('push.urls')), + url(r'^towarzystwo/', include('club.urls')), # Admin panel url(r'^admin/catalogue/book/import$', catalogue.views.import_book, name='import_book'), @@ -66,11 +74,6 @@ urlpatterns += [ url(r'^szukaj/', include('search.urls')), - # Static files - url(r'^%s(?P.*)$' % settings.MEDIA_URL[1:], django.views.static.serve, - {'document_root': settings.MEDIA_ROOT, 'show_indexes': True}), - url(r'^%s(?P.*)$' % settings.STATIC_URL[1:], django.views.static.serve, - {'document_root': settings.STATIC_ROOT, 'show_indexes': True}), url(r'^i18n/', include('django.conf.urls.i18n')), ] @@ -95,4 +98,12 @@ urlpatterns += [ # url(r'^post-test/$', views.post_test), ] -urlpatterns += migdal_urlpatterns + +if settings.DEBUG: + urlpatterns += [ + # Static files + url(r'^%s(?P.*)$' % settings.MEDIA_URL[1:], django.views.static.serve, + {'document_root': settings.MEDIA_ROOT, 'show_indexes': True}), + url(r'^%s(?P.*)$' % settings.STATIC_URL[1:], django.views.static.serve, + {'document_root': settings.STATIC_ROOT, 'show_indexes': True}), + ]