transaction.atomic in importbooks

[wolnelektury.git] / wolnelektury / urls.py

diff --git a/wolnelektury/urls.py b/wolnelektury/urls.py
index e99b081..a77a3d1 100644 (file)
--- a/wolnelektury/urls.py
+++ b/wolnelektury/urls.py
@@ -1,18 +1,18 @@
 # -*- coding: utf-8 -*-
 # -*- coding: utf-8 -*-

-import os
-
-from django.conf.urls.defaults import *
+# 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 import settings
 from django.contrib import admin
 from django.views.generic import RedirectView
 import wolnelektury_core.views
 
 
 from django.conf import settings
 from django.contrib import admin
 from django.views.generic import RedirectView
 import wolnelektury_core.views
 
 

-admin.autodiscover()
-

 urlpatterns = patterns('wolnelektury_core.views',
     url(r'^$', 'main_page', name='main_page'),
     url(r'^planowane/$', 'publish_plan', name='publish_plan'),
 urlpatterns = patterns('wolnelektury_core.views',
     url(r'^$', 'main_page', name='main_page'),
     url(r'^planowane/$', 'publish_plan', name='publish_plan'),

+    url(r'^widget\.html$', 'widget', name='widget'),

 
     url(r'^zegar/$', 'clock', name='clock'),
 
 
     url(r'^zegar/$', 'clock', name='clock'),
 


@@ -22,6 +22,11 @@ urlpatterns = patterns('wolnelektury_core.views',
     url(r'^uzytkownik/signup/$', wolnelektury_core.views.RegisterFormView(), name='register'),
     url(r'^uzytkownik/logout/$', 'logout_then_redirect', name='logout'),
     url(r'^uzytkownik/zaloguj-utworz/$', wolnelektury_core.views.LoginRegisterFormView(), name='login_register'),
     url(r'^uzytkownik/signup/$', wolnelektury_core.views.RegisterFormView(), name='register'),
     url(r'^uzytkownik/logout/$', 'logout_then_redirect', name='logout'),
     url(r'^uzytkownik/zaloguj-utworz/$', wolnelektury_core.views.LoginRegisterFormView(), name='login_register'),

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

 )
 
 urlpatterns += patterns('',
 )
 
 urlpatterns += patterns('',


@@ -35,7 +40,11 @@ urlpatterns += patterns('',
     url(r'^ludzie/', include('social.urls')),
     url(r'^uzytkownik/', include('allauth.urls')),
     url(r'^czekaj/', include('waiter.urls')),
     url(r'^ludzie/', include('social.urls')),
     url(r'^uzytkownik/', include('allauth.urls')),
     url(r'^czekaj/', include('waiter.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')),

 
     # Admin panel
     url(r'^admin/catalogue/book/import$', 'catalogue.views.import_book', name='import_book'),
 
     # Admin panel
     url(r'^admin/catalogue/book/import$', 'catalogue.views.import_book', name='import_book'),


@@ -61,21 +70,15 @@ urlpatterns += patterns('',
 urlpatterns += patterns('',
     # old static pages - redirected
     url(r'^1procent/$', RedirectView.as_view(
 urlpatterns += patterns('',
     # old static pages - redirected
     url(r'^1procent/$', RedirectView.as_view(

-        url='http://nowoczesnapolska.org.pl/wesprzyj_nas/')),
+        url='http://nowoczesnapolska.org.pl/wesprzyj_nas/', permanent=True)),

     url(r'^epub/$', RedirectView.as_view(
     url(r'^epub/$', RedirectView.as_view(

-        url='/katalog/lektury/')),
+        url='/katalog/lektury/', permanent=False)),

     url(r'^mozesz-nam-pomoc/$', RedirectView.as_view(
     url(r'^mozesz-nam-pomoc/$', RedirectView.as_view(

-        url='/info/mozesz-nam-pomoc')),
+        url='/info/mozesz-nam-pomoc', permanent=True)),

     url(r'^o-projekcie/$', RedirectView.as_view(
     url(r'^o-projekcie/$', RedirectView.as_view(

-        url='/info/o-projekcie')),
+        url='/info/o-projekcie', permanent=True)),

     url(r'^widget/$', RedirectView.as_view(
     url(r'^widget/$', RedirectView.as_view(

-        url='/info/widget')),
+        url='/info/widget', permanent=True)),

     url(r'^wolontariat/$', RedirectView.as_view(
     url(r'^wolontariat/$', RedirectView.as_view(

-        url='/info/mozesz-nam-pomoc/')),
+        url='/info/mozesz-nam-pomoc/', permanent=False)),

 )
 )

-    
-
-if 'rosetta' in settings.INSTALLED_APPS:
-    urlpatterns += patterns('',
-        url(r'^rosetta/', include('rosetta.urls')),
-    )