X-Git-Url: https://git.mdrn.pl/wolnelektury.git/blobdiff_plain/ae60b2a3949e96357477cc04f90fd0873cee8a92..6a41571eecb01fc448e4d5d6a9d3059523988f18:/src/wolnelektury/urls.py diff --git a/src/wolnelektury/urls.py b/src/wolnelektury/urls.py index f5dddafd3..26224610d 100644 --- a/src/wolnelektury/urls.py +++ b/src/wolnelektury/urls.py @@ -1,37 +1,37 @@ -# -*- 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. # -from django.conf.urls import include, patterns, url +from django.conf.urls import include, url from django.conf import settings from django.contrib import admin from django.views.generic import RedirectView -import wolnelektury.views +import django.views.static +from machina.app import board +import catalogue.views +import picture.views +from . import views -urlpatterns = patterns( - 'wolnelektury.views', - url(r'^$', 'main_page', name='main_page'), - url(r'^planowane/$', 'publish_plan', name='publish_plan'), - url(r'^widget\.html$', 'widget', name='widget'), +urlpatterns = [ + url(r'^$', views.main_page, name='main_page'), + url(r'^planowane/$', views.publish_plan, name='publish_plan'), + url(r'^widget\.html$', views.widget, name='widget'), - url(r'^zegar/$', 'clock', name='clock'), + url(r'^zegar/$', views.clock, name='clock'), # Authentication - url(r'^uzytkownik/$', 'user_settings', name='user_settings'), - url(r'^uzytkownik/login/$', wolnelektury.views.LoginFormView(), name='login'), - url(r'^uzytkownik/signup/$', wolnelektury.views.RegisterFormView(), name='register'), - url(r'^uzytkownik/logout/$', 'logout_then_redirect', name='logout'), - url(r'^uzytkownik/zaloguj-utworz/$', wolnelektury.views.LoginRegisterFormView(), name='login_register'), + url(r'^uzytkownik/$', views.user_settings, name='user_settings'), + url(r'^uzytkownik/login/$', views.LoginFormView(), name='login'), + url(r'^uzytkownik/signup/$', views.RegisterFormView(), name='register'), + 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$', - wolnelektury.views.latest_blog_posts, - name='latest_blog_posts'), -) + url(r'^latests_blog_posts.html$', views.latest_blog_posts, name='latest_blog_posts'), +] -urlpatterns += patterns( - '', +urlpatterns += [ url(r'^katalog/', include('catalogue.urls')), url(r'^opds/', include('opds.urls')), url(r'^sugestia/', include('suggest.urls')), @@ -45,32 +45,38 @@ urlpatterns += patterns( 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='/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'), - url(r'^admin/catalogue/picture/import$', 'picture.views.import_picture', name='import_picture'), + 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)), # API - (r'^api/', include('api.urls')), + url(r'^api/', include('api.urls')), # OAIPMH - (r'^oaipmh/', include('oai.urls')), + url(r'^oaipmh/', include('oai.urls')), 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')), -) + url(r'^forum/', include(board.urls)), +] -urlpatterns += patterns( - '', +urlpatterns += [ # old static pages - redirected url(r'^1procent/$', RedirectView.as_view( url='http://nowoczesnapolska.org.pl/wesprzyj_nas/', permanent=True)), @@ -84,4 +90,25 @@ urlpatterns += patterns( url='/info/widget/', permanent=True)), url(r'^wolontariat/$', RedirectView.as_view( url='/info/wlacz-sie-w-prace/', permanent=False)), -) +] + +urlpatterns += [ + url(r'^error-test/$', views.exception_test), + # url(r'^post-test/$', views.post_test), +] + + +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.*)$' % 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}), + ]