More annoying.

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

diff --git a/src/wolnelektury/urls.py b/src/wolnelektury/urls.py
index 2622461..c328c83 100644 (file)
--- a/src/wolnelektury/urls.py
+++ b/src/wolnelektury/urls.py
@@ -6,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 machina.app import board

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


@@ -26,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,8 +42,9 @@ urlpatterns += [
     url(r'^ankieta/', include('polls.urls')),
     url(r'^biblioteki/', include('libraries.urls')),
     url(r'^newsletter/', include('newsletter.urls')),
     url(r'^ankieta/', include('polls.urls')),
     url(r'^biblioteki/', include('libraries.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'^paypal/app-form/$', RedirectView.as_view(
         url='/towarzystwo/?app=1', permanent=False)),


@@ -63,7 +60,7 @@ urlpatterns += [
     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/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')),


@@ -73,7 +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)),
+    url(r'^forum/', include('machina.urls')),

 ]
 
 urlpatterns += [
 ]
 
 urlpatterns += [