Remove obsolete jsonfield dependency.

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

diff --git a/src/wolnelektury/urls.py b/src/wolnelektury/urls.py
index 8b02fda..6af8093 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,6 +6,7 @@ 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 machina.app import board

 import catalogue.views
 import picture.views
 from . import views
 import catalogue.views
 import picture.views
 from . import views


@@ -26,9 +26,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 += [


@@ -45,14 +42,15 @@ 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'^formularz/', include('contact.urls')),
     url(r'^isbn/', include('isbn.urls')),
 
     url(r'^paypal/app-form/$', RedirectView.as_view(
     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/dolacz/?app=1', permanent=True)),
+        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')),


@@ -72,6 +70,7 @@ urlpatterns += [
     url(r'^szukaj/', include('search.urls')),
 
     url(r'^i18n/', include('django.conf.urls.i18n')),
     url(r'^szukaj/', include('search.urls')),
 
     url(r'^i18n/', include('django.conf.urls.i18n')),

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

 ]
 
 urlpatterns += [
 ]
 
 urlpatterns += [


@@ -96,6 +95,12 @@ urlpatterns += [
 ]
 
 
 ]
 
 

+if settings.DEBUG:
+    import debug_toolbar
+    urlpatterns = [
+        url(r'^__debug__/', include(debug_toolbar.urls)),
+    ] + urlpatterns
+

 if settings.DEBUG:
     urlpatterns += [
         # Static files
 if settings.DEBUG:
     urlpatterns += [
         # Static files