Payment overhaul.

[wolnelektury.git] / src / wolnelektury / urls.py

diff --git a/src/wolnelektury/urls.py b/src/wolnelektury/urls.py
index 403cc1f..c328c83 100644 (file)
--- a/src/wolnelektury/urls.py
+++ b/src/wolnelektury/urls.py
@@ -1,4 +1,3 @@
-# -*- coding: utf-8 -*-

 # This file is part of Wolnelektury, licensed under GNU Affero GPLv3 or later.
 # Copyright © Fundacja Nowoczesna Polska. See NOTICE for more information.
 #
 # This file is part of Wolnelektury, licensed under GNU Affero GPLv3 or later.
 # Copyright © Fundacja Nowoczesna Polska. See NOTICE for more information.
 #


@@ -7,7 +6,6 @@ from django.conf import settings
 from django.contrib import admin
 from django.views.generic import RedirectView
 import django.views.static
 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
 import catalogue.views
 import picture.views
 from . import views


@@ -27,9 +25,6 @@ urlpatterns = [
     url(r'^uzytkownik/logout/$', views.logout_then_redirect, name='logout'),
     url(r'^uzytkownik/zaloguj-utworz/$', views.LoginRegisterFormView(), name='login_register'),
     url(r'^uzytkownik/social/signup/$', views.SocialSignupView.as_view(), name='socialaccount_signup'),
     url(r'^uzytkownik/logout/$', views.logout_then_redirect, name='logout'),
     url(r'^uzytkownik/zaloguj-utworz/$', views.LoginRegisterFormView(), name='login_register'),
     url(r'^uzytkownik/social/signup/$', views.SocialSignupView.as_view(), name='socialaccount_signup'),

-
-    # Includes.
-    url(r'^latests_blog_posts.html$', views.latest_blog_posts, name='latest_blog_posts'),

 ]
 
 urlpatterns += [
 ]
 
 urlpatterns += [


@@ -46,19 +41,26 @@ urlpatterns += [
     url(r'^wesprzyj/', include('funding.urls')),
     url(r'^ankieta/', include('polls.urls')),
     url(r'^biblioteki/', include('libraries.urls')),
     url(r'^wesprzyj/', include('funding.urls')),
     url(r'^ankieta/', include('polls.urls')),
     url(r'^biblioteki/', include('libraries.urls')),

-    url(r'^chunks/', include('chunks.urls')),
-    url(r'^sponsors/', include('sponsors.urls')),

     url(r'^newsletter/', include('newsletter.urls')),
     url(r'^newsletter/', include('newsletter.urls')),

-    url(r'^formularz/', include('contact.urls')),
+    url(r'^formularz/', include('forms_builder.forms.urls')),

     url(r'^isbn/', include('isbn.urls')),
     url(r'^isbn/', include('isbn.urls')),

+    url(r'^messaging/', include('messaging.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'^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'),
     url(r'^admin/catalogue/picture/import$', picture.views.import_picture, name='import_picture'),
     url(r'^admin/doc/', include('django.contrib.admindocs.urls')),
 
     # Admin panel
     url(r'^admin/catalogue/book/import$', catalogue.views.import_book, name='import_book'),
     url(r'^admin/catalogue/picture/import$', picture.views.import_picture, name='import_picture'),
     url(r'^admin/doc/', include('django.contrib.admindocs.urls')),

-    url(r'^admin/', include(admin.site.urls)),
+    url(r'^admin/', admin.site.urls),

 
     # API
     url(r'^api/', include('api.urls')),
 
     # API
     url(r'^api/', include('api.urls')),


@@ -67,12 +69,8 @@ urlpatterns += [
 
     url(r'^szukaj/', include('search.urls')),
 
 
     url(r'^szukaj/', include('search.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'^i18n/', include('django.conf.urls.i18n')),
     url(r'^i18n/', include('django.conf.urls.i18n')),

+    url(r'^forum/', include('machina.urls')),

 ]
 
 urlpatterns += [
 ]
 
 urlpatterns += [


@@ -96,4 +94,18 @@ urlpatterns += [
     # url(r'^post-test/$', views.post_test),
 ]
 
     # url(r'^post-test/$', views.post_test),
 ]
 

-urlpatterns += migdal_urlpatterns
+
+if settings.DEBUG:
+    import debug_toolbar
+    urlpatterns = [
+        url(r'^__debug__/', include(debug_toolbar.urls)),
+    ] + urlpatterns
+
+if settings.DEBUG:
+    urlpatterns += [
+        # 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}),
+    ]